diff -Nru source-highlight-3.1.6/aclocal.m4 source-highlight-3.1.7/aclocal.m4 --- source-highlight-3.1.6/aclocal.m4 2011-12-23 09:28:25.000000000 +0000 +++ source-highlight-3.1.7/aclocal.m4 2012-05-09 17:49:54.000000000 +0000 @@ -1,7 +1,8 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, +# Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,12 +20,15 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_AUTOMAKE_VERSION(VERSION) # ---------------------------- # Automake X.Y traces this macro to ensure aclocal.m4 has been @@ -34,7 +38,7 @@ [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.11.3], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,19 +54,21 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.11.3])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to # `$srcdir', `$srcdir/..', or `$srcdir/../..'. @@ -144,14 +150,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009, +# 2010, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 +# serial 12 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -191,6 +197,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -255,7 +262,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -320,10 +327,13 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- @@ -557,12 +567,15 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_SH # ------------------ # Define $install_sh. @@ -623,8 +636,8 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008, +# 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -644,7 +657,7 @@ [disable], [m4_define([am_maintainer_other], [enable])], [m4_define([am_maintainer_other], [enable]) m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) dnl maintainer-mode's default is 'disable' unless 'enable' is passed AC_ARG_ENABLE([maintainer-mode], [ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful @@ -755,12 +768,15 @@ fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation, +# Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_MKDIR_P # --------------- # Check for `mkdir -p'. @@ -783,13 +799,14 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software +# Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # _AM_MANGLE_OPTION(NAME) # ----------------------- @@ -797,13 +814,13 @@ [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], [m4_define(_AM_MANGLE_OPTION([$1]), 1)]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -879,12 +896,14 @@ fi AC_MSG_RESULT(yes)]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 1 + # AM_PROG_INSTALL_STRIP # --------------------- # One issue with vendor `install' (even GNU) is that you can't @@ -907,13 +926,13 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 +# serial 3 # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- @@ -922,13 +941,13 @@ AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -950,10 +969,11 @@ # a tarball read from stdin. # $(am__untar) < result.tar AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], [m4_case([$1], [ustar],, [pax],, [m4_fatal([Unknown tar format])]) AC_MSG_CHECKING([how to create a $1 tar archive]) diff -Nru source-highlight-3.1.6/build-aux/ltmain.sh source-highlight-3.1.7/build-aux/ltmain.sh --- source-highlight-3.1.6/build-aux/ltmain.sh 2011-12-16 17:10:09.000000000 +0000 +++ source-highlight-3.1.7/build-aux/ltmain.sh 2012-05-09 17:49:52.000000000 +0000 @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 Debian-2.4-2ubuntu1 +# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu1 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4 Debian-2.4-2ubuntu1" +VERSION="2.4.2 Debian-2.4.2-1ubuntu1" TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="/bin/grep -E"} -: ${FGREP="/bin/grep -F"} -: ${GREP="/bin/grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="/bin/sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6150,7 +6163,8 @@ lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6834,7 +6848,7 @@ test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7319,6 +7333,7 @@ # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7438,7 +7453,7 @@ versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8026,6 +8041,11 @@ # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8056,7 +8076,7 @@ elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8064,11 +8084,7 @@ if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9158,6 +9174,8 @@ esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9267,7 +9285,8 @@ *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff -Nru source-highlight-3.1.6/completion/source-highlight source-highlight-3.1.7/completion/source-highlight --- source-highlight-3.1.6/completion/source-highlight 2011-12-16 17:10:09.000000000 +0000 +++ source-highlight-3.1.7/completion/source-highlight 2012-04-14 17:16:51.000000000 +0000 @@ -30,8 +30,8 @@ ;; -s|--src-lang) COMPREPLY=($(compgen -W "C H ac ada am applescript asm autoconf awk bat bib bison c caml cc changelog clipper cls cobol conf cpp cs csh csharp css \ - d diff docbook dtx el eps erlang fixed-fortran flex fortran free-fortran glsl h haskell haxe hh hpp htm html hx in ini java javalog javascript js kcfg kdevelop kidl ksh l lang \ - langdef latex ldap ldif lex lgt lisp ll log logtalk lsm lua m4 manifest ml mli moc opa outlang oz pas pascal patch pc perl php php3 php4 php5 \ + d diff docbook dtx el eps erlang fixed-fortran flex fortran free-fortran glsl h haskell haxe hh hpp htm html hx in ini islisp java javalog javascript js kcfg kdevelop kidl ksh l lang \ + langdef latex ldap ldif lex lgt lilypond lisp ll log logtalk lsm lua m4 manifest ml mli moc opa outlang oz pas pascal patch pc perl php php3 php4 php5 \ pl pm po pot postscript prolog properties proto ps py python rb rc ruby scala scheme sh shell sig sl slang slsh sml spec sql sty style syslog tcl tcsh texinfo \ tex tk tml txt ui upc vala vbscript xhtml xml xorg y yacc yy" -- "${cur}")) ;; diff -Nru source-highlight-3.1.6/configure source-highlight-3.1.7/configure --- source-highlight-3.1.6/configure 2011-12-23 09:28:29.000000000 +0000 +++ source-highlight-3.1.7/configure 2012-05-09 17:49:55.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for source-highlight 3.1.6. +# Generated by GNU Autoconf 2.68 for source-highlight 3.1.7. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ # Identity of this package. PACKAGE_NAME='source-highlight' PACKAGE_TARNAME='source-highlight' -PACKAGE_VERSION='3.1.6' -PACKAGE_STRING='source-highlight 3.1.6' +PACKAGE_VERSION='3.1.7' +PACKAGE_STRING='source-highlight 3.1.7' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1065,6 +1065,7 @@ am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -1723,7 +1724,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures source-highlight 3.1.6 to adapt to many kinds of systems. +\`configure' configures source-highlight 3.1.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1794,7 +1795,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of source-highlight 3.1.6:";; + short | recursive ) echo "Configuration of source-highlight 3.1.7:";; esac cat <<\_ACEOF @@ -1928,7 +1929,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -source-highlight configure 3.1.6 +source-highlight configure 3.1.7 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2795,7 +2796,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by source-highlight $as_me 3.1.6, which was +It was created by source-highlight $as_me 3.1.7, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3656,11 +3657,11 @@ # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' -AMTAR=${AMTAR-"${am_missing_run}tar"} - -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -4548,6 +4549,7 @@ if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -4572,6 +4574,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -4631,7 +4634,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -5894,6 +5897,7 @@ # instance it was reported that on HP-UX the gcc test will end up # making a dummy file named `D' -- because `-MD' means `put the output # in D'. + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5953,7 +5957,7 @@ break fi ;; - msvisualcpp | msvcmsys) + msvc7 | msvc7msys | msvisualcpp | msvcmsys) # This compiler won't grok `-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. @@ -6067,8 +6071,8 @@ -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -21036,7 +21040,7 @@ fi -ac_config_files="$ac_config_files Makefile source-highlight.pc m4/Makefile gl/Makefile src/Makefile src/java2html src/cpp2html src/src-hilite-lesspipe.sh doc/Makefile lib/Makefile lib/srchilite/Makefile lib/srchilite/srchilite.doxyfile lib/tests/Makefile lib/examples/Makefile lib/compat/Makefile tests/Makefile tests/output_dir/Makefile source-highlight.spec" +ac_config_files="$ac_config_files Makefile source-highlight.pc m4/Makefile gl/Makefile src/Makefile src/java2html src/cpp2html src/src-hilite-lesspipe.sh src/source-highlight-esc.sh doc/Makefile lib/Makefile lib/srchilite/Makefile lib/srchilite/srchilite.doxyfile lib/tests/Makefile lib/examples/Makefile lib/compat/Makefile tests/Makefile tests/output_dir/Makefile source-highlight.spec" ac_config_files="$ac_config_files tests/valgrind_tests.sh" @@ -21667,7 +21671,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by source-highlight $as_me 3.1.6, which was +This file was extended by source-highlight $as_me 3.1.7, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21737,7 +21741,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -source-highlight config.status 3.1.6 +source-highlight config.status 3.1.7 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -22255,6 +22259,7 @@ "src/java2html") CONFIG_FILES="$CONFIG_FILES src/java2html" ;; "src/cpp2html") CONFIG_FILES="$CONFIG_FILES src/cpp2html" ;; "src/src-hilite-lesspipe.sh") CONFIG_FILES="$CONFIG_FILES src/src-hilite-lesspipe.sh" ;; + "src/source-highlight-esc.sh") CONFIG_FILES="$CONFIG_FILES src/source-highlight-esc.sh" ;; "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "lib/srchilite/Makefile") CONFIG_FILES="$CONFIG_FILES lib/srchilite/Makefile" ;; diff -Nru source-highlight-3.1.6/configure.ac source-highlight-3.1.7/configure.ac --- source-highlight-3.1.6/configure.ac 2011-12-16 17:10:09.000000000 +0000 +++ source-highlight-3.1.7/configure.ac 2012-04-14 16:40:07.000000000 +0000 @@ -9,7 +9,7 @@ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. dnl Process this file with autoconf to produce a configure script. -AC_INIT(source-highlight,3.1.6) +AC_INIT(source-highlight,3.1.7) # this is requested for the install-data-local of doxygen documentation AC_PREREQ([2.62]) @@ -264,6 +264,7 @@ src/java2html src/cpp2html src/src-hilite-lesspipe.sh +src/source-highlight-esc.sh doc/Makefile lib/Makefile lib/srchilite/Makefile diff -Nru source-highlight-3.1.6/debian/changelog source-highlight-3.1.7/debian/changelog --- source-highlight-3.1.6/debian/changelog 2014-04-29 09:12:24.000000000 +0000 +++ source-highlight-3.1.7/debian/changelog 2014-05-22 01:37:26.000000000 +0000 @@ -1,3 +1,18 @@ +source-highlight (3.1.7-1ubuntu1) utopic; urgency=medium + + * Merge from Debian unstable. Remaining changes: + - Use dh-autoreconf for newer arches. + * Remove automake patch. + + -- Logan Rosen Wed, 21 May 2014 21:34:31 -0400 + +source-highlight (3.1.7-1) unstable; urgency=medium + + * New upstream release + * Updated standards version + + -- Peter Eisentraut Tue, 11 Mar 2014 21:16:17 -0400 + source-highlight (3.1.6-2ubuntu2) utopic; urgency=high * No change rebuild against boost1.55. diff -Nru source-highlight-3.1.6/debian/control source-highlight-3.1.7/debian/control --- source-highlight-3.1.6/debian/control 2014-01-30 17:50:57.000000000 +0000 +++ source-highlight-3.1.7/debian/control 2014-05-22 01:37:12.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Peter Eisentraut Build-Depends: dh-autoreconf, debhelper (>= 7.0.50~), exuberant-ctags, help2man, texi2html, texinfo, gawk, libboost-regex-dev -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Homepage: http://www.gnu.org/software/src-highlite/ Package: source-highlight diff -Nru source-highlight-3.1.6/debian/patches/695793_GFDL_doc.patch source-highlight-3.1.7/debian/patches/695793_GFDL_doc.patch --- source-highlight-3.1.6/debian/patches/695793_GFDL_doc.patch 2013-10-22 12:58:26.000000000 +0000 +++ source-highlight-3.1.7/debian/patches/695793_GFDL_doc.patch 2014-05-22 01:33:04.000000000 +0000 @@ -6,12 +6,12 @@ Forwarded: not-needed Applied-Upstream: d505c0a6cdf96787e0db6c5501f4bb366010dc09 Reviewed-by: David Prévot -Last-Update: 2012-12-31 +Last-Update: 2014-03-11 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ --- a/doc/source-highlight-lib.texinfo +++ b/doc/source-highlight-lib.texinfo -@@ -64,14 +64,9 @@ +@@ -64,14 +64,9 @@ Copyright @copyright{} 2005-2008 Lorenzo Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no @@ -31,7 +31,7 @@ --- a/doc/source-highlight.texinfo +++ b/doc/source-highlight.texinfo -@@ -25,14 +25,9 @@ +@@ -25,14 +25,9 @@ Copyright @copyright{} 2005-2008 Lorenzo Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with no @@ -56,14 +56,14 @@ -@set UPDATED-MONTH December 2011 +@set UPDATED 31 December 2012 +@set UPDATED-MONTH December 2012 - @set EDITION 3.1.6 - @set VERSION 3.1.6 + @set EDITION 3.1.7 + @set VERSION 3.1.7 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ --@set UPDATED 24 December 2011 --@set UPDATED-MONTH December 2011 +-@set UPDATED 14 April 2012 +-@set UPDATED-MONTH April 2012 +@set UPDATED 31 December 2012 +@set UPDATED-MONTH December 2012 - @set EDITION 3.1.6 - @set VERSION 3.1.6 + @set EDITION 3.1.7 + @set VERSION 3.1.7 diff -Nru source-highlight-3.1.6/debian/patches/automake_cppflags.patch source-highlight-3.1.7/debian/patches/automake_cppflags.patch --- source-highlight-3.1.6/debian/patches/automake_cppflags.patch 2014-01-30 18:11:03.000000000 +0000 +++ source-highlight-3.1.7/debian/patches/automake_cppflags.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -From a9beab9522b7f542f2a1fd624c3acfa244520ce1 Mon Sep 17 00:00:00 2001 -From: Lorenzo Bettini -Date: Sat, 14 Apr 2012 13:44:10 +0000 -Subject: Use AM_CPPFLAGS instead the obsolete INCLUDES - ---- -Index: source-highlight-3.1.6/lib/examples/Makefile.am -=================================================================== ---- source-highlight-3.1.6.orig/lib/examples/Makefile.am 2011-12-16 12:10:10.000000000 -0500 -+++ source-highlight-3.1.6/lib/examples/Makefile.am 2014-01-30 13:10:37.746798419 -0500 -@@ -8,7 +8,12 @@ - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - --AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) \ -+AM_CPPFLAGS = \ -+ -I$(top_srcdir)/gl \ -+ -I$(top_builddir)/gl \ -+ -I$(top_srcdir)/src \ -+ -I$(srcdir)/.. \ -+ $(BOOST_CPPFLAGS) \ - -D DATADIR="\"$(top_srcdir)/src/\"" - AM_LDFLAGS = $(BOOST_LDFLAGS) -no-install - -@@ -17,8 +22,6 @@ - #LIBDIR = $(top_builddir)/lib/srchilite/ - LIBDIR = ../srchilite/ - --INCLUDES = -I@top_srcdir@/src -I@srcdir@/.. -- - check_PROGRAMS = source-highlight-console infoformatter styleformatter - - source_highlight_console_SOURCES = source-highlight-console-main.cpp -Index: source-highlight-3.1.6/lib/srchilite/Makefile.am -=================================================================== ---- source-highlight-3.1.6.orig/lib/srchilite/Makefile.am 2011-12-16 12:10:10.000000000 -0500 -+++ source-highlight-3.1.6/lib/srchilite/Makefile.am 2014-01-30 13:10:37.746798419 -0500 -@@ -51,7 +51,7 @@ - rm -f $(builddir)/html/* - endif - --AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) -+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl -I$(top_srcdir)/src $(BOOST_CPPFLAGS) - AM_LDFLAGS = $(BOOST_LDFLAGS) - - LDADD = $(top_builddir)/gl/libgnu.la -@@ -140,8 +140,6 @@ - sourcehighlightutils.h utils.h \ - instances.h - --INCLUDES = -I@top_srcdir@/src -- - EXTRA_DIST = $(h_sources) \ - langelemsprinter_dbtab.cc \ - highlightstatebuilder_dbtab.cc \ -Index: source-highlight-3.1.6/lib/tests/Makefile.am -=================================================================== ---- source-highlight-3.1.6.orig/lib/tests/Makefile.am 2011-12-16 12:10:12.000000000 -0500 -+++ source-highlight-3.1.6/lib/tests/Makefile.am 2014-01-30 13:10:37.746798419 -0500 -@@ -8,7 +8,11 @@ - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - --AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) -+AM_CPPFLAGS = \ -+ -I$(top_srcdir)/gl \ -+ -I$(top_builddir)/gl \ -+ -I$(top_srcdir)/src -I$(srcdir)/.. -+ $(BOOST_CPPFLAGS) - AM_LDFLAGS = $(BOOST_LDFLAGS) -no-install - - LDADD = $(top_builddir)/gl/libgnu.la $(LIBDIR)/libsource-highlight.la $(BOOST_REGEX_LIB) -@@ -16,8 +20,6 @@ - #LIBDIR = $(top_builddir)/lib/srchilite/ - LIBDIR = ../srchilite/ - --INCLUDES = -I@top_srcdir@/src -I@srcdir@/.. -- - VALGRIND_TESTS = test_regexrules test_formatter_manager test_highlighter \ - test_exception test_highlightbuilder test_buffered_output \ - test_textstyle test_textgenerator test_textstyleformatter test_wordtokenizer test_linenum \ -Index: source-highlight-3.1.6/src/Makefile.am -=================================================================== ---- source-highlight-3.1.6.orig/src/Makefile.am 2011-12-26 05:41:56.000000000 -0500 -+++ source-highlight-3.1.6/src/Makefile.am 2014-01-30 13:10:37.746798419 -0500 -@@ -34,9 +34,7 @@ - - SRCHILITE = $(top_builddir)/src/source-highlight$(EXEEXT) - --INCLUDES = -I@top_srcdir@/lib -- --AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) -+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl -I$(top_srcdir)/lib $(BOOST_CPPFLAGS) - AM_LDFLAGS = $(BOOST_LDFLAGS) - - LDADD = $(top_builddir)/gl/libgnu.la diff -Nru source-highlight-3.1.6/debian/patches/series source-highlight-3.1.7/debian/patches/series --- source-highlight-3.1.6/debian/patches/series 2014-01-30 18:11:01.000000000 +0000 +++ source-highlight-3.1.7/debian/patches/series 2014-05-22 01:34:29.000000000 +0000 @@ -1,4 +1,3 @@ 695793_GFDL_doc.patch 0001-New-texinfo-doesn-t-seem-to-allow-nested-examples-sm.patch fix-testcase-boost1.54.patch -automake_cppflags.patch diff -Nru source-highlight-3.1.6/debian/rules source-highlight-3.1.7/debian/rules --- source-highlight-3.1.6/debian/rules 2014-01-30 17:52:58.000000000 +0000 +++ source-highlight-3.1.7/debian/rules 2014-05-22 01:44:32.000000000 +0000 @@ -5,7 +5,7 @@ config.status: configure.ac dh_testdir - dh_autoreconf &&\ + dh_autoreconf dh_auto_configure -- \ --enable-warnings \ --with-boost-regex=boost_regex diff -Nru source-highlight-3.1.6/debian/source.lintian-overrides source-highlight-3.1.7/debian/source.lintian-overrides --- source-highlight-3.1.6/debian/source.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ source-highlight-3.1.7/debian/source.lintian-overrides 2014-05-22 01:33:04.000000000 +0000 @@ -0,0 +1,6 @@ +# False positive; the patch fixes the issue. +source-highlight source: license-problem-gfdl-invariants doc/source-highlight-lib.html +source-highlight source: license-problem-gfdl-invariants doc/source-highlight-lib.info +source-highlight source: license-problem-gfdl-invariants doc/source-highlight.html +source-highlight source: license-problem-gfdl-invariants doc/source-highlight.info +source-highlight source: license-problem-gfdl-invariants debian/patches/695793_GFDL_doc.patch diff -Nru source-highlight-3.1.6/defines.pri source-highlight-3.1.7/defines.pri --- source-highlight-3.1.6/defines.pri 2011-12-16 17:10:09.000000000 +0000 +++ source-highlight-3.1.7/defines.pri 2012-06-30 11:54:30.000000000 +0000 @@ -1,5 +1,5 @@ MAJOR_VERSION = 3 -VERSION = $${MAJOR_VERSION}.0.1 +VERSION = $${MAJOR_VERSION}.1.7 # better to avoid both builds (especially on windows) CONFIG-=debug_and_release @@ -16,7 +16,7 @@ linux-g++: COMPILER = gcc DEFINES += ABSOLUTEDATADIR=\\\"/usr/local/share/source-highlight/\\\" \ - VERSION=\\\"3.1.6\\\" \ + VERSION=\\\"3.1.7\\\" \ LIBRARY_VERSION=\\\"4.0.0\\\" \ PACKAGE=\\\"source-highlight\\\" \ RELATIVEDATADIR=\\\"../share/source-highlight\\\" diff -Nru source-highlight-3.1.6/doc/index.html source-highlight-3.1.7/doc/index.html --- source-highlight-3.1.6/doc/index.html 2011-12-26 10:41:28.000000000 +0000 +++ source-highlight-3.1.7/doc/index.html 2012-04-14 17:16:05.000000000 +0000 @@ -4,7 +4,7 @@ GNU Source-highlight - GNU Project - Free Software Foundation (FSF)

-GNU Source-highlight 3.1.6

+GNU Source-highlight 3.1.7

by Lorenzo Bettini

This program, given a source file, produces a @@ -82,12 +82,14 @@

  • Haxe
  • Html
  • ini files
    • +
  • IsLisp     (new)
  • Java
  • Javalog
  • Javascript
  • KDE desktop files
  • Latex
  • Ldap files
    • +
  • Lilypond     (new)
  • Lisp
  • Logtalk
  • Log files
    • @@ -109,6 +111,7 @@
  • Properties files
  • Protobuf (Google's Protocol Buffers)
  • Python
    • +
  • R statistics programming language     (new)
  • RPM Spec files
  • Ruby
  • Scala
    • @@ -116,7 +119,7 @@
  • Shell
  • S-Lang
  • Sql
    • -
  • T/Foswiki TML markup     (new)
    • +
  • T/Foswiki TML markup
  • Tcl
  • Texinfo
  • UPC (unified parallel C)
    • diff -Nru source-highlight-3.1.6/doc/infoformatter-main.cpp.texinfo source-highlight-3.1.7/doc/infoformatter-main.cpp.texinfo --- source-highlight-3.1.6/doc/infoformatter-main.cpp.texinfo 2011-12-23 09:30:27.000000000 +0000 +++ source-highlight-3.1.7/doc/infoformatter-main.cpp.texinfo 2012-04-14 14:00:13.000000000 +0000 @@ -1,5 +1,10 @@ @c Generator: GNU source-highlight, by Lorenzo Bettini, http://www.gnu.org/software/src-highlite @example + +@b{#ifdef} HAVE_CONFIG_H +@b{#include} @t{"config.h"} +@b{#endif} + @b{#include} @t{} @b{#include} @t{"srchilite/langdefmanager.h"} @b{#include} @t{"srchilite/regexrulefactory.h"} diff -Nru source-highlight-3.1.6/doc/lang-list.texinfo source-highlight-3.1.7/doc/lang-list.texinfo --- source-highlight-3.1.6/doc/lang-list.texinfo 2011-12-23 09:30:22.000000000 +0000 +++ source-highlight-3.1.7/doc/lang-list.texinfo 2012-04-14 17:14:09.000000000 +0000 @@ -55,6 +55,7 @@ hx = haxe.lang in = makefile.lang ini = desktop.lang +islisp = islisp.lang java = java.lang javalog = javalog.lang javascript = javascript.lang @@ -72,12 +73,14 @@ lex = flex.lang lgt = logtalk.lang lhs = haskell_literate.lang +lilypond = lilypond.lang lisp = lisp.lang ll = flex.lang log = log.lang logtalk = logtalk.lang lsm = lsm.lang lua = lua.lang +ly = lilypond.lang m4 = m4.lang makefile = makefile.lang manifest = manifest.lang @@ -111,6 +114,7 @@ ps = postscript.lang py = python.lang python = python.lang +r = asm.lang rb = ruby.lang rc = xml.lang ruby = ruby.lang diff -Nru source-highlight-3.1.6/doc/Makefile.in source-highlight-3.1.7/doc/Makefile.in --- source-highlight-3.1.6/doc/Makefile.in 2011-12-23 09:28:30.000000000 +0000 +++ source-highlight-3.1.7/doc/Makefile.in 2012-05-09 17:49:56.000000000 +0000 @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.3 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -121,6 +121,12 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -1052,9 +1058,7 @@ sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) install-source_highlightdataDATA: $(source_highlightdata_DATA) @$(NORMAL_INSTALL) test -z "$(source_highlightdatadir)" || $(MKDIR_P) "$(DESTDIR)$(source_highlightdatadir)" @@ -1072,9 +1076,7 @@ @$(NORMAL_UNINSTALL) @list='$(source_highlightdata_DATA)'; test -n "$(source_highlightdatadir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(source_highlightdatadir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(source_highlightdatadir)" && rm -f $$files + dir='$(DESTDIR)$(source_highlightdatadir)'; $(am__uninstall_files_from_dir) install-source_highlightdocDATA: $(source_highlightdoc_DATA) @$(NORMAL_INSTALL) test -z "$(source_highlightdocdir)" || $(MKDIR_P) "$(DESTDIR)$(source_highlightdocdir)" @@ -1092,9 +1094,7 @@ @$(NORMAL_UNINSTALL) @list='$(source_highlightdoc_DATA)'; test -n "$(source_highlightdocdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(source_highlightdocdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(source_highlightdocdir)" && rm -f $$files + dir='$(DESTDIR)$(source_highlightdocdir)'; $(am__uninstall_files_from_dir) tags: TAGS TAGS: @@ -1165,10 +1165,15 @@ installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1231,13 +1236,14 @@ for p in $$list; do \ if test -f "$$p" || test -d "$$p"; then d=; else d="$(srcdir)/"; fi; \ $(am__strip_dir) \ - if test -d "$$d$$p"; then \ + d2=$$d$$p; \ + if test -d "$$d2"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(htmldir)/$$f'"; \ $(MKDIR_P) "$(DESTDIR)$(htmldir)/$$f" || exit 1; \ - echo " $(INSTALL_DATA) '$$d$$p'/* '$(DESTDIR)$(htmldir)/$$f'"; \ - $(INSTALL_DATA) "$$d$$p"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ + echo " $(INSTALL_DATA) '$$d2'/* '$(DESTDIR)$(htmldir)/$$f'"; \ + $(INSTALL_DATA) "$$d2"/* "$(DESTDIR)$(htmldir)/$$f" || exit $$?; \ else \ - list2="$$list2 $$d$$p"; \ + list2="$$list2 $$d2"; \ fi; \ done; \ test -z "$$list2" || { echo "$$list2" | $(am__base_list) | \ @@ -1269,8 +1275,13 @@ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(infodir)'"; \ $(INSTALL_DATA) $$files "$(DESTDIR)$(infodir)" || exit $$?; done @$(POST_INSTALL) - @if (install-info --version && \ - install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \ + @am__run_installinfo=yes; \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) am__run_installinfo=no;; \ + *) (install-info --version) >/dev/null 2>&1 \ + || am__run_installinfo=no;; \ + esac; \ + if test $$am__run_installinfo = yes; then \ list='$(INFO_DEPS)'; test -n "$(infodir)" || list=; \ for file in $$list; do \ relfile=`echo "$$file" | sed 's|^.*/||'`; \ diff -Nru source-highlight-3.1.6/doc/outlang-list.texinfo source-highlight-3.1.7/doc/outlang-list.texinfo --- source-highlight-3.1.6/doc/outlang-list.texinfo 2011-12-26 10:49:37.000000000 +0000 +++ source-highlight-3.1.7/doc/outlang-list.texinfo 2012-04-14 16:23:48.000000000 +0000 @@ -1,5 +1,6 @@ docbook = docbook.outlang esc = esc.outlang +esc256 = esc256.outlang html = html.outlang html-css = htmlcss.outlang htmltable = htmltable.outlang diff -Nru source-highlight-3.1.6/doc/source-highlight.1 source-highlight-3.1.7/doc/source-highlight.1 --- source-highlight-3.1.6/doc/source-highlight.1 2011-12-23 09:30:28.000000000 +0000 +++ source-highlight-3.1.7/doc/source-highlight.1 2012-05-09 17:59:28.000000000 +0000 @@ -1,12 +1,12 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4. -.TH SOURCE-HIGHLIGHT "1" "December 2011" "Source-highlight 3.1.6 (library: 4:0:0)" "User Commands" +.TH SOURCE-HIGHLIGHT "1" "May 2012" "Source-highlight 3.1.7 (library: 4:0:0)" "User Commands" .SH NAME Source-highlight \- convert source code to syntax highlighted document .SH SYNOPSIS .B source-highlight [\fIOPTIONS\fR]... \fI< input_file > output_file\fR .SH DESCRIPTION -GNU source\-highlight 3.1.6 +GNU source\-highlight 3.1.7 .PP Highlight the syntax of a source file (e.g. Java) into a specific format (e.g. HTML) diff -Nru source-highlight-3.1.6/doc/source-highlight-console-main.cpp.texinfo source-highlight-3.1.7/doc/source-highlight-console-main.cpp.texinfo --- source-highlight-3.1.6/doc/source-highlight-console-main.cpp.texinfo 2011-12-23 09:30:27.000000000 +0000 +++ source-highlight-3.1.7/doc/source-highlight-console-main.cpp.texinfo 2012-04-14 14:00:13.000000000 +0000 @@ -1,5 +1,10 @@ @c Generator: GNU source-highlight, by Lorenzo Bettini, http://www.gnu.org/software/src-highlite @example + +@b{#ifdef} HAVE_CONFIG_H +@b{#include} @t{"config.h"} +@b{#endif} + @b{#include} @t{} @b{#include} @t{"srchilite/sourcehighlight.h"} @b{#include} @t{"srchilite/langmap.h"} diff -Nru source-highlight-3.1.6/doc/source-highlight.html source-highlight-3.1.7/doc/source-highlight.html --- source-highlight-3.1.6/doc/source-highlight.html 2011-12-26 10:49:37.000000000 +0000 +++ source-highlight-3.1.7/doc/source-highlight.html 2012-05-09 17:59:28.000000000 +0000 @@ -1,14 +1,14 @@ -GNU Source-highlight 3.1.6 +GNU Source-highlight 3.1.7 - + -

    GNU Source-highlight 3.1.6

    +

    GNU Source-highlight 3.1.7

    Table of Contents

      @@ -163,12 +163,12 @@

      GNU Source-highlight, given a source file, produces a document with syntax highlighting. -

      This is Edition 3.1.6 of the Source-highlight manual. +

      This is Edition 3.1.7 of the Source-highlight manual. -

      This file documents GNU Source-highlight version 3.1.6. +

      This file documents GNU Source-highlight version 3.1.7.

      This manual is for GNU Source-highlight -(version 3.1.6, 24 December 2011), +(version 3.1.7, 14 April 2012), which given a source file, produces a document with syntax highlighting.

      Copyright © 2005-2008 Lorenzo Bettini, http://www.lorenzobettini.it. @@ -262,7 +262,7 @@

      1.1 Supported languages

      The complete list of languages (indeed, file extensions) natively -supported by this version of Source-highlight (3.1.6), as +supported by this version of Source-highlight (3.1.7), as reported by --lang-list, is the following: 

           C = cpp.lang
@@ -322,6 +322,7 @@
      hx = haxe.lang
      in = makefile.lang
      ini = desktop.lang
+     islisp = islisp.lang
      java = java.lang
      javalog = javalog.lang
      javascript = javascript.lang
@@ -339,12 +340,14 @@
      lex = flex.lang
      lgt = logtalk.lang
      lhs = haskell_literate.lang
+     lilypond = lilypond.lang
      lisp = lisp.lang
      ll = flex.lang
      log = log.lang
      logtalk = logtalk.lang
      lsm = lsm.lang
      lua = lua.lang
+     ly = lilypond.lang
      m4 = m4.lang
      makefile = makefile.lang
      manifest = manifest.lang
@@ -378,6 +381,7 @@
      ps = postscript.lang
      py = python.lang
      python = python.lang
+     r = asm.lang
      rb = ruby.lang
      rc = xml.lang
      ruby = ruby.lang
@@ -419,11 +423,12 @@
      yy = bison.lang

      The complete list of output formats natively supported by this version -of Source-highlight (3.1.6), as reported by +of Source-highlight (3.1.7), as reported by --outlang-list, is the following: 

           docbook = docbook.outlang
      esc = esc.outlang
+     esc256 = esc256.outlang
      html = html.outlang
      html-css = htmlcss.outlang
      htmltable = htmltable.outlang
@@ -1212,7 +1217,7 @@
 
 
      2.7 Using source-highlight with less
      
 
-
      This was suggested by Konstantine Serebriany.   The script
+
      This was suggested by Konstantine Serebriany.   The script
 src-hilite-lesspipe.sh will be installed together with
 source-highlight.  You can use the following environment variables:
 
@@ -1222,6 +1227,13 @@
    
      This way, when you use less to browse a file, if it is a source file
 handled by source-highlight, it will be automatically highlighted.
 
+   
      Xavier-Emmanuel Vincent recently provided an alternative version of
+ANSI color scheme, esc256.style: some terminals can handle 256
+colors.  Xavier also provided a script which checks how many colors
+your terminal can handle, and in case, uses the 256 variant.  The
+script is called source-highlight-esc.sh and it will be
+installed together with the other binaries.
+
 
      
 
 
@@ -1234,7 +1246,7 @@
 
 
      2.8 Using source-highlight as a CGI
      
 
-
      CGI support was enabled thanks to Robert Wetzel; I haven't tested it
+
      CGI support was enabled thanks to Robert Wetzel; I haven't tested it
 personally.  If you want to use source-highlight as a CGI program, you
 have to use the executable source-highlight-cgi.  You can build such
 executable by issuing
@@ -1254,15 +1266,15 @@
 
 
      2.9 Building .rpm
      
 
-
      
+
      
 Christian W. Zuckschwerdt added support for building an .rpm and an
 .rpm.src.  You can issue the following command
 
-
           rpmbuild -tb source-highlight-3.1.6.tar.gz
+
           rpmbuild -tb source-highlight-3.1.7.tar.gz
 
      
    
      for building an .rpm with binaries and
 
-
           rpmbuild -ts source-highlight-3.1.6.tar.gz
+
           rpmbuild -ts source-highlight-3.1.7.tar.gz
 
      
    
      for building an .rpm.src with sources.
 
@@ -1277,7 +1289,7 @@
 
 
      3 Copying Conditions
      
 
-
      
+
      
 GNU Source-highlight is free software; you are free to use, share and modify it
 under the terms of the GNU General Public License that accompanies this software
 (see COPYING).
@@ -1296,7 +1308,7 @@
 
 
      4 Simple Usage
      
 
-
      
+
      
 Here are some realistic examples of running
 source-highlight10.
 
@@ -1370,7 +1382,7 @@
 
 
      4.1 HTML and XHTML output
      
 
-
      
+
      
 The default output format for HTML and XHTML uses fixed width fonts by
 inserting all the formatted output between <tt> and </tt>. 
 Thus, for instance, specification for fixed width and not fixed width
@@ -1397,7 +1409,7 @@
 
 
      4.2 LaTeX output
      
 
-
      
+
      
 When using LaTeX output format you can choose between monochromatic
 output (by using -f latex) or colored output (by using -f
 latexcolor).  When using colored output, you need the
@@ -1416,7 +1428,7 @@
 
 
      4.3 Texinfo output
      
 
-
      
+
      
 When using the Texinfo output format, you may want to use a dedicated
 style file, texinfo.style, which comes with the source-highlight
 distribution, with the option --style-file.  For instance, the
@@ -1433,7 +1445,7 @@
 
 
      4.4 DocBook output
      
 
-
      
+
      
 DocBook output is generated using the <programlisting> tag.  If
 the --doc command line option is given, an <article>
 document is generated.
@@ -1449,12 +1461,13 @@
 
 
      4.5 ANSI color escape sequences
      
 
-
      
+
      
 If you're using this output format, for instance together with
-less (see Using source-highlight with less), you may
-want to use the esc.style, which comes with the source-highlight
-distribution, with the option --style-file.  This should
-result in a more pleasant coloring output.
+less (see Using source-highlight with less), you may want
+to use the esc.style (or esc256.style if your terminal
+can handle 256 colors), which comes with the source-highlight
+distribution, with the option --style-file.  This should result
+in a more pleasant coloring output.
 
 
      
 
@@ -1483,7 +1496,7 @@
 
 
      5 Configuration files
      
 
-
      
+
      
 During execution, source-highlight needs some files where it finds
 directives on how to recognize the source language (if not  specified
 explicitly with --src-lang or --lang-def), on which output
@@ -1492,7 +1505,7 @@
 keywords, comments, etc.), and source and output language definitions. 
 These files will be explained in the next sections.
 
-   
      If the directory for such files is not explicitly specified with the
+   
      If the directory for such files is not explicitly specified with the
 command line option --data-dir, these files are searched for in
 the following order:
 
@@ -1508,7 +1521,7 @@
 
    
      In particular, the user can set the value also with the environment
 variable
-SOURCE_HIGHLIGHT_DATADIR (see also The program source-highlight-settings).
+SOURCE_HIGHLIGHT_DATADIR (see also The program source-highlight-settings).
 
    
      If you want to be sure about which file is used during the
 execution, you can use the command line option --verbose.
@@ -1535,14 +1548,14 @@
 
 
      5.1 Output format style
      
 
-
      
+
      
 You must specify your options for syntax highlighting in the file
 default.style11. 
 You can specify formatting options for each element defined
 by a language definition file (you can get the list of such elements,
-by using --show-lang-elements, see Listing Language Elements).
+by using --show-lang-elements, see Listing Language Elements).
 
-   
      Since version 2.6, you can also specify the background color for the
+   
      Since version 2.6, you can also specify the background color for the
 output document, using the keyword bgcolor (this might be visible
 only when the --doc command line option is used).
 
@@ -1631,7 +1644,7 @@
 language definition files that comes with Source-highlight
 distribution.
 
-   
      You can specify your own file (it doesn't have to be named
+   
      You can specify your own file (it doesn't have to be named
 default.style) with the command line option
 --style-file13, see
 Invoking source-highlight.
@@ -1640,7 +1653,7 @@
 
 
           normal darkblue ;
 
      
-   
      As you might see the syntax of this file is quite straightforward: after
+   
      As you might see the syntax of this file is quite straightforward: after
 the element (or elements, separated by commas) you can specify the
 color, and the background color14 by using
 the prefix bg: (for instance, in the default.style above
@@ -1650,7 +1663,7 @@
 formats: it is available for XHTML and LaTeX but not for
 HTML15.
 
-   
      Then, you can specify further formatting options such as bold, italics,
+   
      Then, you can specify further formatting options such as bold, italics,
 etc.; these are the keywords that can be used:
 
 
           b = bold
@@ -1660,7 +1673,7 @@
      nf = not fixed
      noref = no reference information is generated for these elements
 
      
-   
      Since version 2.2, the color specification is not required.  For
+   
      Since version 2.2, the color specification is not required.  For
 instance, the texinfo.style is as follows (we avoid colors for
 Texinfo outputs):
 
@@ -1699,7 +1712,7 @@
 the case of HTML, the sequence u, b will lead to the following
 formatting: <u><b>...</b></u>.
 
-   
      The noref option specifies that for this element reference
+   
      The noref option specifies that for this element reference
 information are not generated (see Generating References).  For
 instance, this is used for the comment element, since we do not
 want that elements in a comment are searched for cross-references.
@@ -1726,7 +1739,7 @@
      darkblue
      white
 
      
-   
      You can also use the direct color scheme for the specific output format,
+   
      You can also use the direct color scheme for the specific output format,
 by using double quotes, such as, e.g., "#00FF00" in
 HTML17 or even string colors in double quotes18, such as "lightblue".  Of course, the double quotes will be
 discarded during the generation.
@@ -1779,11 +1792,11 @@
 
 
      5.2 Output format style using CSS
      
 
-
      Since version 2.6 you can specify the output format style also using
+
      Since version 2.6 you can specify the output format style also using
 a limited CSS syntax.  Please, note that this has nothing to do
 with output produced by source-highlight using the --css option.
 
-   
      By using a CSS file as the style file (i.e., passing it to the
+   
      By using a CSS file as the style file (i.e., passing it to the
 --style-css-file command line option) you will only specify the
 output format style using the same syntax of CSS.  This means that you
 can use a css syntax for specifying the output format style
@@ -1913,7 +1926,7 @@
    
      tells that, if the style for an element, say elem1, is not specified in
 the style file, then elem1 will have the same style of elem2.
 
-   
      For instance, this is the style.defaults that comes with
+   
      For instance, this is the style.defaults that comes with
 Source-highlight:
 
 
@@ -1961,7 +1974,7 @@
 
 
      5.4 Language map
      
 
-
      
+
      
 This configuration file associates a file extension to a specific
 language definition file.  You can also use such file extension to
 specify the --src-lang option (see Simple Usage). 
@@ -2005,7 +2018,7 @@
 
 
      5.6 Output Language map
      
 
-
      
+
      
 This configuration file associates an output format to a specific output
 language definition file.  You can use the name of that output format to
 specify the --out-format option (see Simple Usage). 
@@ -2082,7 +2095,7 @@
 
 
      6 Invoking source-highlight
      
 
-
      
+
      
 The format for running the source-highlight program is:
 
 
           source-highlight option ...
@@ -2243,7 +2256,7 @@
 
 
      
      
-
      --data-dir
      Source-highlight, during the execution, will need some files, such as,
+
      --data-dir
      Source-highlight, during the execution, will need some files, such as,
 e.g., language definition files, output format definition files, etc. 
 These files are installed in prefix/share/source-highlight where
 prefix is chosen at compilation time (see See Installation). 
@@ -2290,7 +2303,7 @@
 output files to be generated into a different directory you can use this
 option.
 
-     
      --infer-lang
      Force the inference mechanism for detecting the input language.  This is
+     
      --infer-lang
      Force the inference mechanism for detecting the input language.  This is
 detailed in How the input language is discovered.
 
      
      --line-number
      Line numbers will be generated in the output, using the (optional)
@@ -2305,7 +2318,7 @@
 case).  See Anchors and References for defining how to generate an
 anchor in a specific output language.
 
-     

      --line-range
      --range-context
      --range-separator
      Since version 2.11, you can specify multiple line ranges: only the lines
+     

      --line-range
      --range-context
      --range-separator
      Since version 2.11, you can specify multiple line ranges: only the lines
 in the source that are in these ranges will be output.  For instance, by
 specifying
 
@@ -2333,7 +2346,7 @@
 is preformatted automatically, so, e.g., you don't have to escape
 special output characters, such as the { } in texinfo output.
 
-     

      --regex-range
      
+     

      --regex-range
      
 Ranges can be expressed also using regular expressions, with the command
 line option --regex-range.  In this case the beginning of the
 range will be detected by a line containing (in any point) a string
@@ -2352,7 +2365,7 @@
      
      Furthermore, --line-range and --regex-range cannot coexist
 in the same command line.
 
-     
      --failsafe
      If no language specification is found, an error will be printed and the
+     
      --failsafe
      If no language specification is found, an error will be printed and the
 program exits.  With this option, instead, in such situations, the input
 is simply formatted in the output format.  This is useful when
 source-highlight is used with many input files, and it is also
@@ -2362,7 +2375,7 @@
 indeed, in the future, this option might become the default one).  See
 also Using source-highlight with less, Using source-highlight as a simple formatter.
 
-     
      When using --failsafe, if no input language can be established,
+     
      When using --failsafe, if no input language can be established,
 source-highlight will use the input language definition file
 default.lang, which is an empty file.  You might want to
 customize such file, though.
@@ -2426,7 +2439,7 @@
 all, but, for instance, a ChangeLog input file will be
 highlighted using changelog.lang).
 
-   
      Furthermore, this mechanism can be given priority with the command line
+   
      Furthermore, this mechanism can be given priority with the command line
 option --infer-lang.  For instance, this is used in the script
 src-hilite-lesspipe.sh (Using source-highlight with less)
 when running source-highlight, in order to avoid the problem of
@@ -2445,7 +2458,7 @@
 
 
      7 Language Definitions
      
 
-
      
+
      
 Since version 2.0 source-highlight uses a specific syntax
 to specify source language elements (e.g., keywords, strings,
 comments, etc.).  Before version 2.0, language elements were scanned
@@ -2540,7 +2553,7 @@
 cannot accomplish the required goal.
 
      
-
+
 
      "expression"
      
 If you use double quotes (note, " and not `` or
 '') to specify a regular expression, then basically all the
@@ -2560,7 +2573,7 @@
 character \, e.g., \|.  Also the character \,
 if it is intended literally, must be escaped, e.g., \\.
 
-     

      'expression'
      
+     

      'expression'
      
 If you want to enjoy (almost) the full power of regular expressions, you
 need to use single quoted strings ('), instead of double quoted
 strings.  This way, you can specify special characters with their
@@ -2585,8 +2598,8 @@
 backreferences (see Notes on regular expressions) are not
 allowed.
 
-     

      `expression`
      
-This syntax26 (note the difference, this
+     

      `expression`
      
+This syntax26 (note the difference, this
 one uses the backtick ` while the previous one uses
 ') for specifying a regular expression was introduced to overcome
 the limitations of the other two syntaxes.  With this syntax, the marked
@@ -2664,7 +2677,7 @@
 
 
      7.2 Simple definitions
      
 
-
      
+
      
 The simplest way to specify language elements is to list the possible
 alternatives.  This is the case, for instance, for keywords.  For
 instance, in java.lang you have:
@@ -2736,7 +2749,7 @@
 
           preproc = "#define"
      preproc = '^[[:blank:]]*#([[:blank:]]*[[:word:]]*)'
 
      
-   
      Finally, at the end of a list of definitions, one can specify the
+   
      Finally, at the end of a list of definitions, one can specify the
 keyword nonsensitive; in that case, the specified strings will be
 interpreted in a non case sensitive way.  For instance, we use this
 feature in Pascal language definition, pascal.lang where keywords
@@ -2760,7 +2773,7 @@
 
 
      7.3 Line wide definitions
      
 
-
      
+
      
 It is often useful to define a language element that affects all the
 remaining characters up to the end of the line.   For such definitions,
 instead of the = you must use the keyword start.   For
@@ -2784,7 +2797,7 @@
 
 
      7.4 Order of definitions
      
 
-
      
+
      
 It is important to observe that the order of language definitions is
 important since it will be used during regular expression matching (this
 will be detailed in How source-highlight works).  You then have to
@@ -2812,7 +2825,7 @@
 
 
      7.5 Delimited definitions
      
 
-
      
+
      
 Many elements are delimited by specific character sequences. 
 For instance, strings and multiline comments.  The syntax for
 such an element definition is
@@ -2881,7 +2894,7 @@
 
 
      7.6 Variable definitions
      
 
-
      
+
      
 It is possible to define variables to be re-used in
 many parts in a language definition file. 
 A variable is defined by using
@@ -2913,7 +2926,7 @@
 
 
      7.7 Dynamic Backreferences
      
 
-
      
+
      
 With dynamic backreferences you can refer to a string matched by
 the regular expression of the first element of a delim
 specification29.  I called these
@@ -2988,7 +3001,7 @@
 
 
      7.8 File inclusion
      
 
-
      
+
      
 It is possible to include other language definition files into another
 file.  This is inclusion actually physically includes the contents of
 the included file into the current file during parsing, at the exact
@@ -3025,7 +3038,7 @@
 
 
      7.9 State/Environment Definitions
      
 
-
      
+
      
 Sometimes you want some source element to be highlighted only if they
 are surrounded by other elements.  Source-highlight language definitions
 provides also this feature.
@@ -3256,7 +3269,7 @@
 language definition file and you redefine/substitute some
 elements.
 
-   
      When you use redef you erase all the previous
+   
      When you use redef you erase all the previous
 definitions of that language elements with the new one. 
 The new language element definition will be placed exactly
 in the point of the new definition. 
@@ -3289,7 +3302,7 @@
 
           type = "int"
      keyword = "myfoo"
 
      
-   
      If this is not what you want, you can use subst,
+   
      If this is not what you want, you can use subst,
 which is similar to redef apart from that it
 replaces the previous first definition of that language
 element in the exact point of that first definition
@@ -3351,7 +3364,7 @@
 Now, everything basically reduces to the semantics of that better
 match.
 
-   
      The strategy used by source-highlight is to select the first matching rule
+   
      The strategy used by source-highlight is to select the first matching rule
 
      
        
 
      • with empty prefix (or prefix containing only space characters, i.e.,
@@ -3361,13 +3374,13 @@
 
    
      
 
-   
      where the prefix of a matched rule is the part of the examined
+   
      where the prefix of a matched rule is the part of the examined
 string that did not match33.  Thus, for instance, if we try to match
 the simple regular expression = against the string
 
 
           i = 10;
 
      
-   
      then the prefix is i , including the space.  Following the
+   
      then the prefix is i , including the space.  Following the
 terminology of regular expression, the remaining part that did not
 match, i.e.,  10;, is the suffix.  When source-highlight
 finds a matching rule, according to the above strategy, it formats the
@@ -3447,28 +3460,28 @@
 
 
      7.13 Notes on regular expressions
      
 
-
      
+
      
 Although we refer to Boost documentation for such
 syntax34,
 we want to provide here some explanations of some forms of regular
 expressions that might be unknown but that are pretty useful in language
 definitions.
 
-   
      Typically, when you need to group sub-expressions with parenthesis,  but
+   
      Typically, when you need to group sub-expressions with parenthesis,  but
 you don't want the parenthesis to spit out another marked
 sub-expression,  you can use a non-marking parenthesis
 (?:expression).  This is not necessary in the language definition
 syntax: even though you use standard parenthesis, source-highlight will
 transform it into a non-marking parenthesis.
 
-   
      Source-highlight translates possible marked subexpressions, i.e.,
+   
      Source-highlight translates possible marked subexpressions, i.e.,
 those enclosed in ( and ), into non-marked subexpressions
 (i.e., those explained above).  Since version 2.7, if you specify the
 expression inside ` the marked subexpressions are left as such
 (see also Ways of specifying regular expressions).  This is useful
 for backreferences and conditionals.
 
-   
      An escape character followed by a digit n, where n is in the range 1-9,
+   
      An escape character followed by a digit n, where n is in the range 1-9,
 is a backreference matches the same string that was matched by
 sub-expression n.  For example the expression ^(a*).*\1$ will
 match the string: aaabbaaa but not the string aaabba. 
@@ -3484,7 +3497,7 @@
      s#foo#bar#g
      s@foo@bar@g
 
      
-   
      A useful regular expression form is the Forward Lookahead Asserts
+   
      A useful regular expression form is the Forward Lookahead Asserts
 that come in two forms, one for positive forward lookahead asserts, and
 one for negative lookahead asserts:
 
@@ -3534,7 +3547,7 @@
 
      
    
      but a cut-and-paste error had its way ;-)
 
-   
      You can also use Lookbehind Asserts:
+   
      You can also use Lookbehind Asserts:
 
      
      
 
      (?<=pattern)
       consumes zero characters, only if pattern could be matched against the
@@ -3545,7 +3558,7 @@
  length). 
 
      
 
-   
      Another advanced regular expression mechanism is the one of
+   
      Another advanced regular expression mechanism is the one of
 conditional expressions
 
      
      
@@ -3589,7 +3602,7 @@
 
 
      7.14 The program check-regexp
      
 
-
      Since version 2.7, the source-highlight package comes with a
+
      Since version 2.7, the source-highlight package comes with a
 small additional program, check-regexp, that permits
 testing regular expressions on the command line.
 
@@ -3671,7 +3684,7 @@
 be aware of each language element defined by a language definition file. 
 Instead of having to look inside the language definition file itself
 (and recursively in each included file) you can use the command line
-option --show-lang-elements37, that
+option --show-lang-elements37, that
 simply prints to the standard output all the language elements that
 can be highlighted with a specific language definition file.
 
@@ -3754,7 +3767,7 @@
 
 
      7.17 Debugging
      
 
-
      
+
      
 When writing a language definition file, it is quite useful to be able
 to debug it (by using complex regular expressions one may experience
 unwanted behaviors).  Since version 2.1 the command line option
@@ -4743,7 +4756,7 @@
 
 
      8 Output Language Definitions
      
 
-
      
+
      
 Since version 2.1 source-highlight uses a specific syntax to specify
 output formats (e.g., how to format in HTML, LaTeX, etc.).  Before
 version 2.1, in order to add a new output format, many C++ classes had
@@ -4831,7 +4844,7 @@
 
 
      8.2 Text styles
      
 
-
      
+
      
 These are the text styles that one can define:
 
 
           bold
@@ -4849,7 +4862,7 @@
      italics "<i>$text</i>"
      underline "<u>$text</u>"
 
      
-   
      Inside a definition you use the special variable $text to specify
+   
      Inside a definition you use the special variable $text to specify
 where the actual text to be formatted has to be inserted.  For instance,
 the definition of bold above says that if you need to format the
 keyword class in bold in HTML, the following text will be
@@ -4874,13 +4887,13 @@
 
 
      8.3 Colors
      
 
-
      
+
      
 The definition for using colors during formatting requires
 the definition for the color style
 
 
           color "..."
 
      
-   
      and for the bgcolor style44:
+   
      and for the bgcolor style44:
 
 
           bgcolor "..."
 
      
@@ -4981,7 +4994,7 @@
 
 
      8.4 Anchors and References
      
 
-
      
+
      
 When using the command line option --line-number-ref
 (Invoking source-highlight) an anchor is generated in the output
 file for each line numbering.  The style of the anchor is defined by the
@@ -4994,7 +5007,7 @@
 
 
           anchor "<a name=\"$linenum\">$text</a>"
 
      
-   
      Since version 2.2 source-highlight can also generate references to
+   
      Since version 2.2 source-highlight can also generate references to
 several elements (e.g., variables, class definitions, etc.),
 Generating References.  Also in this case the definition
 anchor is used; furthermore, the definition of reference
@@ -5052,7 +5065,7 @@
 examples of outputs with references in Texinfo are shown in
 Examples.
 
-   
      Indeed, one can use three more definitions for reference that
+   
      Indeed, one can use three more definitions for reference that
 corresponds to the three arguments that can be passed to
 --gen-references command line option (Generating References): inline_reference, postline_reference and
 postdoc_reference.  If one of this not defined, then the same
@@ -5076,7 +5089,7 @@
 
 
      8.5 One style
      
 
-
      
+
      
 If the output format you are defining does not have a specific style
 for bold, italics, ... and for colors you can simply use the definition
 onestyle, where you can use both $style and $text. 
@@ -5113,7 +5126,7 @@
 
 
      8.6 Style template
      
 
-
      
+
      
 Some output formats are based on a unique template that where the other
 styles are composed; during composition the styles can be separated with
 a specific separator:
@@ -5247,13 +5260,13 @@
 
 
      You can define the beginning and the end of an output file, with
 
-   
      
+   
      
 
           doctemplate
      "...beginning..."
      "...end..."
      end
 
      
-   
      
+   
      
 
           nodoctemplate
      "...beginning..."
      "...end..."
@@ -5466,7 +5479,7 @@
 
 
      9 Generating References
      
 
-
      
+
      
 Since version 2.2 Source-highlight also produces references to fields,
 variables, etc.  In order to do this it relies on the program
 Exuberant Ctags, by Darren Hiebert, available at
@@ -5834,7 +5847,7 @@
 
 
      10.3 Line ranges
      
 
-
      This is an example that uses --line-range command line
+
      This is an example that uses --line-range command line
 option on the input file shown in See Simple example:
 
 
           source-highlight -f texinfo -i test.java -n \
@@ -5875,7 +5888,7 @@
 
 
      10.4 Line ranges (with context)
      
 
-
      This is an example that uses the command line option --line-range
+
      This is an example that uses the command line option --line-range
 together with the --range-context and --range-separator:
 
 
           source-highlight -f texinfo -i test.java -n \
@@ -5930,7 +5943,7 @@
 
 
      10.5 Regex ranges
      
 
-
      Ranges can be expressed also using regular expressions, with the command
+
      Ranges can be expressed also using regular expressions, with the command
 line option --regex-range.  In this case the beginning of the
 range will be detected by a line containing (in any point) a string
 matching the specified regular expression; the end will be detected by a
@@ -6041,7 +6054,7 @@
 
 
      11 Reporting Bugs
      
 
-
      
+
      
 If you find a bug in source-highlight, please send electronic
 mail to
 
@@ -6071,7 +6084,7 @@
 
 
      12 Mailing Lists
      
 
-
      
+
      
 The following mailing lists are available:
 
    
      help-source-highlight at gnu dot org
@@ -6104,188 +6117,190 @@
 
 
      Concept Index
      
 
-
      
+
      
 
 
      
 
      
 
      Short Contents
      
diff -Nru source-highlight-3.1.6/doc/source-highlight.info source-highlight-3.1.7/doc/source-highlight.info
--- source-highlight-3.1.6/doc/source-highlight.info	2011-12-26 10:49:37.000000000 +0000
+++ source-highlight-3.1.7/doc/source-highlight.info	2012-04-14 17:14:09.000000000 +0000
@@ -1,9 +1,8 @@
 This is ../../doc/source-highlight.info, produced by makeinfo version
 4.13 from ../../doc/source-highlight.texinfo.
 
-This manual is for GNU Source-highlight (version 3.1.6, 24 December
-2011), which given a source file, produces a document with syntax
-highlighting.
+This manual is for GNU Source-highlight (version 3.1.7, 14 April 2012),
+which given a source file, produces a document with syntax highlighting.
 
    Copyright (C) 2005-2008 Lorenzo Bettini,
 `http://www.lorenzobettini.it'.
@@ -34,12 +33,12 @@
 GNU Source-highlight, given a source file, produces a document with
 syntax highlighting.
 
-   This is Edition 3.1.6 of the Source-highlight manual.
+   This is Edition 3.1.7 of the Source-highlight manual.
 
-   This file documents GNU Source-highlight version 3.1.6.
+   This file documents GNU Source-highlight version 3.1.7.
 
-   This manual is for GNU Source-highlight (version 3.1.6, 24 December
-2011), which given a source file, produces a document with syntax
+   This manual is for GNU Source-highlight (version 3.1.7, 14 April
+2012), which given a source file, produces a document with syntax
 highlighting.
 
    Copyright (C) 2005-2008 Lorenzo Bettini,
@@ -116,7 +115,7 @@
 =======================
 
 The complete list of languages (indeed, file extensions) natively
-supported by this version of Source-highlight (3.1.6), as reported by
+supported by this version of Source-highlight (3.1.7), as reported by
 `--lang-list', is the following:
 
      C = cpp.lang
@@ -176,6 +175,7 @@
      hx = haxe.lang
      in = makefile.lang
      ini = desktop.lang
+     islisp = islisp.lang
      java = java.lang
      javalog = javalog.lang
      javascript = javascript.lang
@@ -193,12 +193,14 @@
      lex = flex.lang
      lgt = logtalk.lang
      lhs = haskell_literate.lang
+     lilypond = lilypond.lang
      lisp = lisp.lang
      ll = flex.lang
      log = log.lang
      logtalk = logtalk.lang
      lsm = lsm.lang
      lua = lua.lang
+     ly = lilypond.lang
      m4 = m4.lang
      makefile = makefile.lang
      manifest = manifest.lang
@@ -232,6 +234,7 @@
      ps = postscript.lang
      py = python.lang
      python = python.lang
+     r = asm.lang
      rb = ruby.lang
      rc = xml.lang
      ruby = ruby.lang
@@ -273,11 +276,12 @@
      yy = bison.lang
 
    The complete list of output formats natively supported by this
-version of Source-highlight (3.1.6), as reported by `--outlang-list',
+version of Source-highlight (3.1.7), as reported by `--outlang-list',
 is the following:
 
      docbook = docbook.outlang
      esc = esc.outlang
+     esc256 = esc256.outlang
      html = html.outlang
      html-css = htmlcss.outlang
      htmltable = htmltable.outlang
@@ -1029,6 +1033,13 @@
    This way, when you use less to browse a file, if it is a source file
 handled by source-highlight, it will be automatically highlighted.
 
+   Xavier-Emmanuel Vincent recently provided an alternative version of
+ANSI color scheme, `esc256.style': some terminals can handle 256
+colors.  Xavier also provided a script which checks how many colors
+your terminal can handle, and in case, uses the 256 variant.  The
+script is called `source-highlight-esc.sh' and it will be installed
+together with the other binaries.
+
 
 File: source-highlight.info,  Node: Using source-highlight as a CGI,  Next: Building .rpm,  Prev: Using source-highlight with less,  Up: Installation
 
@@ -1053,11 +1064,11 @@
 Christian W. Zuckschwerdt added support for building an .rpm and an
 .rpm.src.  You can issue the following command
 
-     rpmbuild -tb source-highlight-3.1.6.tar.gz
+     rpmbuild -tb source-highlight-3.1.7.tar.gz
 
    for building an .rpm with binaries and
 
-     rpmbuild -ts source-highlight-3.1.6.tar.gz
+     rpmbuild -ts source-highlight-3.1.7.tar.gz
 
    for building an .rpm.src with sources.
 
@@ -1210,9 +1221,9 @@
 
 If you're using this output format, for instance together with `less'
 (see *note Using source-highlight with less::), you may want to use the
-`esc.style', which comes with the source-highlight distribution, with
-the option `--style-file'.  This should result in a more pleasant
-coloring output.
+`esc.style' (or `esc256.style' if your terminal can handle 256 colors),
+which comes with the source-highlight distribution, with the option
+`--style-file'.  This should result in a more pleasant coloring output.
 
 
 File: source-highlight.info,  Node: Odf output,  Prev: ANSI color escape sequences,  Up: Simple Usage
@@ -5876,6 +5887,8 @@
 * simple language definition:            Simple definitions.  (line   6)
 * SIP:                                   Related Software and Links.
                                                               (line  93)
+* source-highlight-esc.sh:               Using source-highlight with less.
+                                                              (line  16)
 * Source-Highlight-Qt:                   Related Software and Links.
                                                               (line  11)
 * source-highlight-settings:             The program source-highlight-settings.
@@ -5887,6 +5900,8 @@
                                                               (line  19)
 * SourceHighlightIDE:                    Related Software and Links.
                                                               (line  30)
+* src-hilite-lesspipe.sh:                Using source-highlight with less.
+                                                              (line   6)
 * states:                                State/Environment Definitions.
                                                               (line   6)
 * style separator:                       Style template.      (line   6)
@@ -5914,154 +5929,154 @@
 
 
 Tag Table:
-Node: Top1133
-Node: Introduction3056
-Node: Supported languages4630
-Ref: Supported languages-Footnote-19899
-Node: The program source-highlight-settings10072
-Node: Notes on some languages11029
-Node: Fortran11586
-Node: Perl12307
-Node: Using source-highlight as a simple formatter13379
-Ref: Using source-highlight as a simple formatter-Footnote-116675
-Node: Related Software and Links16800
-Node: Installation20854
-Node: Building with qmake24031
-Node: Download26374
-Node: Anonymous Git Checkout27837
-Ref: Anonymous Git Checkout-Footnote-129763
-Node: What you need to build source-highlight29885
-Ref: What you need to build source-highlight-Footnote-132139
-Ref: What you need to build source-highlight-Footnote-232186
-Ref: What you need to build source-highlight-Footnote-332233
-Ref: What you need to build source-highlight-Footnote-432279
-Node: Tips on installing Boost Regex library32324
-Ref: Tips on installing Boost Regex library-Footnote-137547
-Ref: Tips on installing Boost Regex library-Footnote-237694
-Node: Patching from a previous version37861
-Node: Using source-highlight with less38504
-Node: Using source-highlight as a CGI39161
-Node: Building .rpm39676
-Node: Copying40125
-Node: Simple Usage40551
-Ref: Simple Usage-Footnote-143152
-Node: HTML and XHTML output43319
-Node: LaTeX output44338
-Node: Texinfo output44851
-Node: DocBook output45273
-Node: ANSI color escape sequences45591
-Node: Odf output46080
-Node: Configuration files46539
-Node: Output format style48237
-Ref: Output format style-Footnote-155304
-Ref: Output format style-Footnote-255452
-Ref: Output format style-Footnote-355479
-Ref: Output format style-Footnote-455645
-Ref: Output format style-Footnote-555672
-Ref: Output format style-Footnote-655766
-Ref: Output format style-Footnote-755834
-Ref: Output format style-Footnote-855900
-Node: Output format style using CSS55927
-Node: Default Styles60443
-Ref: Default Styles-Footnote-162118
-Node: Language map62145
-Node: Language definition files63038
-Ref: Language definition files-Footnote-163606
-Node: Output Language map63703
-Node: Output Language definition files64825
-Ref: Output Language definition files-Footnote-165628
-Node: Developing your own definition files65729
-Node: Invoking source-highlight66561
-Ref: Invoking source-highlight-Footnote-183431
-Ref: Invoking source-highlight-Footnote-283588
-Node: How the input language is discovered83650
-Ref: How the input language is discovered-Footnote-185696
-Ref: How the input language is discovered-Footnote-285723
-Node: Language Definitions85752
-Node: Ways of specifying regular expressions89482
-Ref: Ways of specifying regular expressions-Footnote-194283
-Ref: Ways of specifying regular expressions-Footnote-294310
-Node: Simple definitions94675
-Node: Line wide definitions99016
-Node: Order of definitions99717
-Node: Delimited definitions100499
-Ref: Delimited definitions-Footnote-1102923
-Node: Variable definitions103254
-Node: Dynamic Backreferences104135
-Ref: Dynamic Backreferences-Footnote-1106841
-Ref: Dynamic Backreferences-Footnote-2106867
-Node: File inclusion106996
-Node: State/Environment Definitions108189
-Node: Explicit subexpressions with names113737
-Node: Redefinitions and Substitutions117436
-Ref: Redefinitions and Substitutions-Footnote-1120094
-Node: How source-highlight works120144
-Ref: How source-highlight works-Footnote-1124122
-Ref: How source-highlight works-Footnote-2124338
-Node: Notes on regular expressions124399
-Ref: Notes on regular expressions-Footnote-1129175
-Ref: Notes on regular expressions-Footnote-2129233
-Ref: Notes on regular expressions-Footnote-3129287
-Node: The program check-regexp129509
-Node: Listing Language Elements131837
-Ref: Listing Language Elements-Footnote-1133253
-Node: Concluding Remarks133280
-Node: Debugging134358
-Ref: Debugging-Footnote-1144385
-Ref: Debugging-Footnote-2144512
-Node: Tutorials on Language Definitions144617
-Node: Highlighting C/C++ and C#146982
-Ref: Highlighting C/C++ and C#-Footnote-1155804
-Ref: Highlighting C/C++ and C#-Footnote-2155994
-Ref: Highlighting C/C++ and C#-Footnote-3156082
-Ref: Highlighting C/C++ and C#-Footnote-4156207
-Node: Highlighting Diff files156504
-Node: Pseudo semantic analysis163102
-Node: Output Language Definitions168277
-Node: File extension170627
-Node: Text styles171248
-Node: Colors172565
-Ref: Colors-Footnote-1175806
-Node: Anchors and References175833
-Node: One style180030
-Node: Style template181318
-Node: Line prefix182100
-Ref: Line prefix-Footnote-1182820
-Node: String translation183086
-Ref: String translation-Footnote-1185400
-Ref: String translation-Footnote-2185427
-Node: Document template185476
-Ref: Document template-Footnote-1188586
-Ref: Document template-Footnote-2188768
-Node: Generating HTML output188795
-Ref: Generating HTML output-Footnote-1191415
-Node: Generating References191503
-Ref: Generating References-Footnote-1194938
-Node: Examples194996
-Node: Simple example195544
-Node: References197876
-Ref: test.h:16199066
-Ref: test.h:18199103
-Ref: test.h:20199144
-Ref: test.h:26199305
-Ref: test.h:28199367
-Ref: test.h:29199444
-Ref: test.h:35199689
-Ref: test.h:40200008
-Ref: test.h:46200668
-Ref: test.h:47200725
-Ref: test.h:48200780
-Ref: test.h:54201283
-Ref: test.h:63201815
-Ref: test.h:65201977
-Ref: test.h:68202103
-Ref: test.h:70202337
-Ref: test.h:76202836
-Node: Line ranges203615
-Node: Line ranges (with context)204616
-Node: Regex ranges206286
-Node: Problems210114
-Node: Mailing Lists210933
-Node: Concept Index211793
+Node: Top1130
+Node: Introduction3050
+Node: Supported languages4624
+Ref: Supported languages-Footnote-110020
+Node: The program source-highlight-settings10193
+Node: Notes on some languages11150
+Node: Fortran11707
+Node: Perl12428
+Node: Using source-highlight as a simple formatter13500
+Ref: Using source-highlight as a simple formatter-Footnote-116796
+Node: Related Software and Links16921
+Node: Installation20975
+Node: Building with qmake24152
+Node: Download26495
+Node: Anonymous Git Checkout27958
+Ref: Anonymous Git Checkout-Footnote-129884
+Node: What you need to build source-highlight30006
+Ref: What you need to build source-highlight-Footnote-132260
+Ref: What you need to build source-highlight-Footnote-232307
+Ref: What you need to build source-highlight-Footnote-332354
+Ref: What you need to build source-highlight-Footnote-432400
+Node: Tips on installing Boost Regex library32445
+Ref: Tips on installing Boost Regex library-Footnote-137668
+Ref: Tips on installing Boost Regex library-Footnote-237815
+Node: Patching from a previous version37982
+Node: Using source-highlight with less38625
+Node: Using source-highlight as a CGI39655
+Node: Building .rpm40170
+Node: Copying40619
+Node: Simple Usage41045
+Ref: Simple Usage-Footnote-143646
+Node: HTML and XHTML output43813
+Node: LaTeX output44832
+Node: Texinfo output45345
+Node: DocBook output45767
+Node: ANSI color escape sequences46085
+Node: Odf output46633
+Node: Configuration files47092
+Node: Output format style48790
+Ref: Output format style-Footnote-155857
+Ref: Output format style-Footnote-256005
+Ref: Output format style-Footnote-356032
+Ref: Output format style-Footnote-456198
+Ref: Output format style-Footnote-556225
+Ref: Output format style-Footnote-656319
+Ref: Output format style-Footnote-756387
+Ref: Output format style-Footnote-856453
+Node: Output format style using CSS56480
+Node: Default Styles60996
+Ref: Default Styles-Footnote-162671
+Node: Language map62698
+Node: Language definition files63591
+Ref: Language definition files-Footnote-164159
+Node: Output Language map64256
+Node: Output Language definition files65378
+Ref: Output Language definition files-Footnote-166181
+Node: Developing your own definition files66282
+Node: Invoking source-highlight67114
+Ref: Invoking source-highlight-Footnote-183984
+Ref: Invoking source-highlight-Footnote-284141
+Node: How the input language is discovered84203
+Ref: How the input language is discovered-Footnote-186249
+Ref: How the input language is discovered-Footnote-286276
+Node: Language Definitions86305
+Node: Ways of specifying regular expressions90035
+Ref: Ways of specifying regular expressions-Footnote-194836
+Ref: Ways of specifying regular expressions-Footnote-294863
+Node: Simple definitions95228
+Node: Line wide definitions99569
+Node: Order of definitions100270
+Node: Delimited definitions101052
+Ref: Delimited definitions-Footnote-1103476
+Node: Variable definitions103807
+Node: Dynamic Backreferences104688
+Ref: Dynamic Backreferences-Footnote-1107394
+Ref: Dynamic Backreferences-Footnote-2107420
+Node: File inclusion107549
+Node: State/Environment Definitions108742
+Node: Explicit subexpressions with names114290
+Node: Redefinitions and Substitutions117989
+Ref: Redefinitions and Substitutions-Footnote-1120647
+Node: How source-highlight works120697
+Ref: How source-highlight works-Footnote-1124675
+Ref: How source-highlight works-Footnote-2124891
+Node: Notes on regular expressions124952
+Ref: Notes on regular expressions-Footnote-1129728
+Ref: Notes on regular expressions-Footnote-2129786
+Ref: Notes on regular expressions-Footnote-3129840
+Node: The program check-regexp130062
+Node: Listing Language Elements132390
+Ref: Listing Language Elements-Footnote-1133806
+Node: Concluding Remarks133833
+Node: Debugging134911
+Ref: Debugging-Footnote-1144938
+Ref: Debugging-Footnote-2145065
+Node: Tutorials on Language Definitions145170
+Node: Highlighting C/C++ and C#147535
+Ref: Highlighting C/C++ and C#-Footnote-1156357
+Ref: Highlighting C/C++ and C#-Footnote-2156547
+Ref: Highlighting C/C++ and C#-Footnote-3156635
+Ref: Highlighting C/C++ and C#-Footnote-4156760
+Node: Highlighting Diff files157057
+Node: Pseudo semantic analysis163655
+Node: Output Language Definitions168830
+Node: File extension171180
+Node: Text styles171801
+Node: Colors173118
+Ref: Colors-Footnote-1176359
+Node: Anchors and References176386
+Node: One style180583
+Node: Style template181871
+Node: Line prefix182653
+Ref: Line prefix-Footnote-1183373
+Node: String translation183639
+Ref: String translation-Footnote-1185953
+Ref: String translation-Footnote-2185980
+Node: Document template186029
+Ref: Document template-Footnote-1189139
+Ref: Document template-Footnote-2189321
+Node: Generating HTML output189348
+Ref: Generating HTML output-Footnote-1191968
+Node: Generating References192056
+Ref: Generating References-Footnote-1195491
+Node: Examples195549
+Node: Simple example196097
+Node: References198429
+Ref: test.h:16199619
+Ref: test.h:18199656
+Ref: test.h:20199697
+Ref: test.h:26199858
+Ref: test.h:28199920
+Ref: test.h:29199997
+Ref: test.h:35200242
+Ref: test.h:40200561
+Ref: test.h:46201221
+Ref: test.h:47201278
+Ref: test.h:48201333
+Ref: test.h:54201836
+Ref: test.h:63202368
+Ref: test.h:65202530
+Ref: test.h:68202656
+Ref: test.h:70202890
+Ref: test.h:76203389
+Node: Line ranges204168
+Node: Line ranges (with context)205169
+Node: Regex ranges206839
+Node: Problems210667
+Node: Mailing Lists211486
+Node: Concept Index212346
 
 End Tag Table
diff -Nru source-highlight-3.1.6/doc/source-highlight-lib.html source-highlight-3.1.7/doc/source-highlight-lib.html
--- source-highlight-3.1.6/doc/source-highlight-lib.html	2011-12-24 16:33:52.000000000 +0000
+++ source-highlight-3.1.7/doc/source-highlight-lib.html	2012-06-29 19:07:15.000000000 +0000
@@ -1,14 +1,14 @@
 
 
-GNU Source-highlight Library 3.1.6
+GNU Source-highlight Library 3.1.7
 
-
+
 
 
 
 
 
 
-
      GNU Source-highlight Library 3.1.6
      
+
      GNU Source-highlight Library 3.1.7
      
    
      
 
      Table of Contents
      
 
        
@@ -85,12 +85,12 @@
 
        GNU Source-highlight, given a source file, produces a document with
 syntax highlighting.
 
-   
        This is Edition 3.1.6 of the Source-highlight Library manual.
+   
        This is Edition 3.1.7 of the Source-highlight Library manual.
 
-   
        This file documents GNU Source-highlight Library version 3.1.6.
+   
        This file documents GNU Source-highlight Library version 3.1.7.
 
    
        This manual is for GNU Source-highlight Library
-(version 3.1.6, 16 December 2011),
+(version 3.1.7, 16 December 2011),
 which given a source file, produces a document with syntax highlighting.
 
    
        Copyright © 2005-2008 Lorenzo Bettini, http://www.lorenzobettini.it.
@@ -328,7 +328,12 @@
 (so you need a console program that supports this):
 
 
-
             #include <iostream>
+
             
+     #ifdef HAVE_CONFIG_H
+     #include "config.h"
+     #endif
+     
+     #include <iostream>
      #include "srchilite/sourcehighlight.h"
      #include "srchilite/langmap.h"
      
@@ -502,7 +507,12 @@
 different language elements:
 
 
-
             #include <iostream>
+
             
+     #ifdef HAVE_CONFIG_H
+     #include "config.h"
+     #endif
+     
+     #include <iostream>
      #include "srchilite/langdefmanager.h"
      #include "srchilite/regexrulefactory.h"
      #include "srchilite/sourcehighlighter.h"
@@ -725,7 +735,12 @@
 (file styleformatter-main.cpp):
 
 
-
             #include <iostream>
+
             
+     #ifdef HAVE_CONFIG_H
+     #include "config.h"
+     #endif
+     
+     #include <iostream>
      #include "srchilite/langdefmanager.h"
      #include "srchilite/regexrulefactory.h"
      #include "srchilite/sourcehighlighter.h"
diff -Nru source-highlight-3.1.6/doc/source-highlight-lib.info source-highlight-3.1.7/doc/source-highlight-lib.info
--- source-highlight-3.1.6/doc/source-highlight-lib.info	2011-12-23 09:30:27.000000000 +0000
+++ source-highlight-3.1.7/doc/source-highlight-lib.info	2012-04-14 14:30:45.000000000 +0000
@@ -1,7 +1,7 @@
 This is ../../doc/source-highlight-lib.info, produced by makeinfo
 version 4.13 from ../../doc/source-highlight-lib.texinfo.
 
-This manual is for GNU Source-highlight Library (version 3.1.6, 16
+This manual is for GNU Source-highlight Library (version 3.1.7, 16
 December 2011), which given a source file, produces a document with
 syntax highlighting.
 
@@ -34,11 +34,11 @@
 GNU Source-highlight, given a source file, produces a document with
 syntax highlighting.
 
-   This is Edition 3.1.6 of the Source-highlight Library manual.
+   This is Edition 3.1.7 of the Source-highlight Library manual.
 
-   This file documents GNU Source-highlight Library version 3.1.6.
+   This file documents GNU Source-highlight Library version 3.1.7.
 
-   This manual is for GNU Source-highlight Library (version 3.1.6,
+   This manual is for GNU Source-highlight Library (version 3.1.7,
 16 December 2011), which given a source file, produces a document with
 syntax highlighting.
 
@@ -247,6 +247,11 @@
 console (the colors are obtained through ANSI color escape sequences
 (so you need a console program that supports this):
 
+
+     #ifdef HAVE_CONFIG_H
+     #include "config.h"
+     #endif
+
      #include 
      #include "srchilite/sourcehighlight.h"
      #include "srchilite/langmap.h"
@@ -403,6 +408,11 @@
 perform these steps; note that we can share the same formatter for
 different language elements:
 
+
+     #ifdef HAVE_CONFIG_H
+     #include "config.h"
+     #endif
+
      #include 
      #include "srchilite/langdefmanager.h"
      #include "srchilite/regexrulefactory.h"
@@ -612,6 +622,11 @@
    Now, we can use this customized formatter factory in our program
 (file `styleformatter-main.cpp'):
 
+
+     #ifdef HAVE_CONFIG_H
+     #include "config.h"
+     #endif
+
      #include 
      #include "srchilite/langdefmanager.h"
      #include "srchilite/regexrulefactory.h"
@@ -906,7 +921,7 @@
 * FormatterFactory class:                Style-based Customized Formatting.
                                                               (line  11)
 * FormatterManager class <1>:            Style-based Customized Formatting.
-                                                              (line 183)
+                                                              (line 188)
 * FormatterManager class <2>:            Completely Customized Formatting.
                                                               (line  59)
 * FormatterManager class:                Customizing Formatting.
@@ -920,7 +935,7 @@
 * headers:                               Use of GNU Source-highlight Library.
                                                               (line   9)
 * highlight method:                      SourceHighlight class.
-                                                              (line  63)
+                                                              (line  68)
 * HighlightEvent class:                  Events and Listeners.
                                                               (line   8)
 * HighlightEventListener class:          Events and Listeners.
@@ -942,7 +957,7 @@
                                                               (line  46)
 * LangMap class <1>:                     Global instances.    (line   9)
 * LangMap class:                         SourceHighlight class.
-                                                              (line  57)
+                                                              (line  62)
 * libsource-highlight:                   Use of GNU Source-highlight Library.
                                                               (line   6)
 * mailing list:                          Mailing Lists.       (line   6)
@@ -973,7 +988,7 @@
                                                               (line   7)
 * source-highlight-settings <1>:         Settings.            (line  13)
 * source-highlight-settings:             SourceHighlight class.
-                                                              (line  72)
+                                                              (line  77)
 * SOURCE_HIGHLIGHT_DATADIR:              Settings.            (line  12)
 * SourceHighlight class <1>:             Completely Customized Formatting.
                                                               (line  43)
@@ -1006,15 +1021,15 @@
 Ref: Using Automake and Autotools-Footnote-17195
 Node: Main Classes7240
 Node: SourceHighlight class8762
-Node: Customizing Formatting11823
-Node: Completely Customized Formatting13497
-Node: Style-based Customized Formatting19424
-Node: Events and Listeners27799
-Node: Settings30184
-Node: Utility functions32294
-Node: Global instances32727
-Node: Problems34118
-Node: Mailing Lists34831
-Node: Concept Index35693
+Node: Customizing Formatting11888
+Node: Completely Customized Formatting13562
+Node: Style-based Customized Formatting19554
+Node: Events and Listeners27994
+Node: Settings30379
+Node: Utility functions32489
+Node: Global instances32922
+Node: Problems34313
+Node: Mailing Lists35026
+Node: Concept Index35888
 
 End Tag Table
diff -Nru source-highlight-3.1.6/doc/source-highlight.texinfo source-highlight-3.1.7/doc/source-highlight.texinfo
--- source-highlight-3.1.6/doc/source-highlight.texinfo	2011-12-24 16:31:51.000000000 +0000
+++ source-highlight-3.1.7/doc/source-highlight.texinfo	2012-04-14 16:47:37.000000000 +0000
@@ -930,6 +930,7 @@
 @node Using source-highlight with less, Using source-highlight as a CGI, Patching from a previous version, Installation
 @section Using source-highlight with less
 
+@cindex src-hilite-lesspipe.sh
 This was suggested by Konstantine Serebriany.   The script
 @file{src-hilite-lesspipe.sh} will be installed together with
 source-highlight.  You can use the following environment variables:
@@ -942,6 +943,14 @@
 This way, when you use less to browse a file, if it is a source file
 handled by source-highlight, it will be automatically highlighted.
 
+@cindex source-highlight-esc.sh
+Xavier-Emmanuel Vincent recently provided an alternative version of
+ANSI color scheme, @file{esc256.style}: some terminals can handle 256
+colors.  Xavier also provided a script which checks how many colors
+your terminal can handle, and in case, uses the 256 variant.  The
+script is called @file{source-highlight-esc.sh} and it will be
+installed together with the other binaries.
+
 @node Using source-highlight as a CGI, Building .rpm, Using source-highlight with less, Installation
 @section Using source-highlight as a CGI
 
@@ -1117,10 +1126,11 @@
 @cindex ANSI color
 
 If you're using this output format, for instance together with
-@code{less} (see @ref{Using source-highlight with less}), you may
-want to use the @file{esc.style}, which comes with the source-highlight
-distribution, with the option @code{--style-file}.  This should
-result in a more pleasant coloring output.
+@code{less} (see @ref{Using source-highlight with less}), you may want
+to use the @file{esc.style} (or @file{esc256.style} if your terminal
+can handle 256 colors), which comes with the source-highlight
+distribution, with the option @code{--style-file}.  This should result
+in a more pleasant coloring output.
 
 @node Odf output,  , ANSI color escape sequences, Simple Usage
 @section Odf output
diff -Nru source-highlight-3.1.6/doc/stamp-1 source-highlight-3.1.7/doc/stamp-1
--- source-highlight-3.1.6/doc/stamp-1	2011-12-23 09:30:27.000000000 +0000
+++ source-highlight-3.1.7/doc/stamp-1	2012-05-09 17:59:27.000000000 +0000
@@ -1,4 +1,4 @@
 @set UPDATED 16 December 2011
 @set UPDATED-MONTH December 2011
-@set EDITION 3.1.6
-@set VERSION 3.1.6
+@set EDITION 3.1.7
+@set VERSION 3.1.7
diff -Nru source-highlight-3.1.6/doc/stamp-vti source-highlight-3.1.7/doc/stamp-vti
--- source-highlight-3.1.6/doc/stamp-vti	2011-12-24 16:32:05.000000000 +0000
+++ source-highlight-3.1.7/doc/stamp-vti	2012-05-09 17:59:27.000000000 +0000
@@ -1,4 +1,4 @@
-@set UPDATED 24 December 2011
-@set UPDATED-MONTH December 2011
-@set EDITION 3.1.6
-@set VERSION 3.1.6
+@set UPDATED 14 April 2012
+@set UPDATED-MONTH April 2012
+@set EDITION 3.1.7
+@set VERSION 3.1.7
diff -Nru source-highlight-3.1.6/doc/styleformatter-main.cpp.texinfo source-highlight-3.1.7/doc/styleformatter-main.cpp.texinfo
--- source-highlight-3.1.6/doc/styleformatter-main.cpp.texinfo	2011-12-23 09:30:27.000000000 +0000
+++ source-highlight-3.1.7/doc/styleformatter-main.cpp.texinfo	2012-04-14 14:00:14.000000000 +0000
@@ -1,5 +1,10 @@
 @c Generator: GNU source-highlight, by Lorenzo Bettini, http://www.gnu.org/software/src-highlite
 @example
+
+@b{#ifdef} HAVE_CONFIG_H
+@b{#include} @t{"config.h"}
+@b{#endif}
+
 @b{#include} @t{}
 @b{#include} @t{"srchilite/langdefmanager.h"}
 @b{#include} @t{"srchilite/regexrulefactory.h"}
diff -Nru source-highlight-3.1.6/doc/version-lib.texi source-highlight-3.1.7/doc/version-lib.texi
--- source-highlight-3.1.6/doc/version-lib.texi	2011-12-23 09:30:27.000000000 +0000
+++ source-highlight-3.1.7/doc/version-lib.texi	2012-04-14 14:13:29.000000000 +0000
@@ -1,4 +1,4 @@
 @set UPDATED 16 December 2011
 @set UPDATED-MONTH December 2011
-@set EDITION 3.1.6
-@set VERSION 3.1.6
+@set EDITION 3.1.7
+@set VERSION 3.1.7
diff -Nru source-highlight-3.1.6/doc/version.texi source-highlight-3.1.7/doc/version.texi
--- source-highlight-3.1.6/doc/version.texi	2011-12-24 16:32:05.000000000 +0000
+++ source-highlight-3.1.7/doc/version.texi	2012-04-14 16:41:25.000000000 +0000
@@ -1,4 +1,4 @@
-@set UPDATED 24 December 2011
-@set UPDATED-MONTH December 2011
-@set EDITION 3.1.6
-@set VERSION 3.1.6
+@set UPDATED 14 April 2012
+@set UPDATED-MONTH April 2012
+@set EDITION 3.1.7
+@set VERSION 3.1.7
diff -Nru source-highlight-3.1.6/gl/Makefile.in source-highlight-3.1.7/gl/Makefile.in
--- source-highlight-3.1.6/gl/Makefile.in	2011-12-23 09:28:30.000000000 +0000
+++ source-highlight-3.1.7/gl/Makefile.in	2012-05-09 17:49:56.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -772,7 +772,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) 
+libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES) $(EXTRA_libgnu_la_DEPENDENCIES) 
 	$(libgnu_la_LINK)  $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -1029,10 +1029,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
diff -Nru source-highlight-3.1.6/lib/compat/Makefile.in source-highlight-3.1.7/lib/compat/Makefile.in
--- source-highlight-3.1.6/lib/compat/Makefile.in	2011-12-23 09:28:31.000000000 +0000
+++ source-highlight-3.1.7/lib/compat/Makefile.in	2012-05-09 17:49:56.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -695,10 +695,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru source-highlight-3.1.6/lib/examples/infoformatter-main.cpp source-highlight-3.1.7/lib/examples/infoformatter-main.cpp
--- source-highlight-3.1.6/lib/examples/infoformatter-main.cpp	2011-12-16 17:10:10.000000000 +0000
+++ source-highlight-3.1.7/lib/examples/infoformatter-main.cpp	2012-04-14 13:48:00.000000000 +0000
@@ -9,6 +9,11 @@
  *      Author: Lorenzo Bettini , (C) 2008
  *  Copyright: See COPYING file that comes with this distribution
  *///> TEXINFO
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include "srchilite/langdefmanager.h"
 #include "srchilite/regexrulefactory.h"
diff -Nru source-highlight-3.1.6/lib/examples/Makefile.am source-highlight-3.1.7/lib/examples/Makefile.am
--- source-highlight-3.1.6/lib/examples/Makefile.am	2011-12-16 17:10:10.000000000 +0000
+++ source-highlight-3.1.7/lib/examples/Makefile.am	2012-04-14 13:40:16.000000000 +0000
@@ -8,7 +8,12 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) \
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/gl \
+	-I$(top_builddir)/gl \
+	-I$(top_srcdir)/src \
+	-I$(srcdir)/.. \
+	$(BOOST_CPPFLAGS) \
 	-D DATADIR="\"$(top_srcdir)/src/\""
 AM_LDFLAGS = $(BOOST_LDFLAGS) -no-install
 
@@ -17,8 +22,6 @@
 #LIBDIR = $(top_builddir)/lib/srchilite/
 LIBDIR = ../srchilite/
 
-INCLUDES = -I@top_srcdir@/src -I@srcdir@/..
-
 check_PROGRAMS = source-highlight-console infoformatter styleformatter
 
 source_highlight_console_SOURCES = source-highlight-console-main.cpp
diff -Nru source-highlight-3.1.6/lib/examples/Makefile.in source-highlight-3.1.7/lib/examples/Makefile.in
--- source-highlight-3.1.6/lib/examples/Makefile.in	2011-12-23 09:28:31.000000000 +0000
+++ source-highlight-3.1.7/lib/examples/Makefile.in	2012-05-09 17:49:57.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -143,6 +143,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(source_highlightlibexampledir)"
 DATA = $(source_highlightlibexample_DATA)
 ETAGS = etags
@@ -661,7 +667,12 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS) \
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/gl \
+	-I$(top_builddir)/gl \
+	-I$(top_srcdir)/src \
+	-I$(srcdir)/.. \
+	$(BOOST_CPPFLAGS) \
 	-D DATADIR="\"$(top_srcdir)/src/\""
 
 AM_LDFLAGS = $(BOOST_LDFLAGS) -no-install
@@ -669,7 +680,6 @@
 
 #LIBDIR = $(top_builddir)/lib/srchilite/
 LIBDIR = ../srchilite/
-INCLUDES = -I@top_srcdir@/src -I@srcdir@/..
 source_highlight_console_SOURCES = source-highlight-console-main.cpp
 infoformatter_SOURCES = infoformatter-main.cpp infoformatter.h
 styleformatter_SOURCES = styleformatter-main.cpp styleformatter.h styleformatterfactory.h
@@ -719,13 +729,13 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-infoformatter$(EXEEXT): $(infoformatter_OBJECTS) $(infoformatter_DEPENDENCIES) 
+infoformatter$(EXEEXT): $(infoformatter_OBJECTS) $(infoformatter_DEPENDENCIES) $(EXTRA_infoformatter_DEPENDENCIES) 
 	@rm -f infoformatter$(EXEEXT)
 	$(CXXLINK) $(infoformatter_OBJECTS) $(infoformatter_LDADD) $(LIBS)
-source-highlight-console$(EXEEXT): $(source_highlight_console_OBJECTS) $(source_highlight_console_DEPENDENCIES) 
+source-highlight-console$(EXEEXT): $(source_highlight_console_OBJECTS) $(source_highlight_console_DEPENDENCIES) $(EXTRA_source_highlight_console_DEPENDENCIES) 
 	@rm -f source-highlight-console$(EXEEXT)
 	$(CXXLINK) $(source_highlight_console_OBJECTS) $(source_highlight_console_LDADD) $(LIBS)
-styleformatter$(EXEEXT): $(styleformatter_OBJECTS) $(styleformatter_DEPENDENCIES) 
+styleformatter$(EXEEXT): $(styleformatter_OBJECTS) $(styleformatter_DEPENDENCIES) $(EXTRA_styleformatter_DEPENDENCIES) 
 	@rm -f styleformatter$(EXEEXT)
 	$(CXXLINK) $(styleformatter_OBJECTS) $(styleformatter_LDADD) $(LIBS)
 
@@ -782,9 +792,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(source_highlightlibexample_DATA)'; test -n "$(source_highlightlibexampledir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(source_highlightlibexampledir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(source_highlightlibexampledir)" && rm -f $$files
+	dir='$(DESTDIR)$(source_highlightlibexampledir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -886,10 +894,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru source-highlight-3.1.6/lib/examples/source-highlight-console-main.cpp source-highlight-3.1.7/lib/examples/source-highlight-console-main.cpp
--- source-highlight-3.1.6/lib/examples/source-highlight-console-main.cpp	2011-12-16 17:10:10.000000000 +0000
+++ source-highlight-3.1.7/lib/examples/source-highlight-console-main.cpp	2012-04-14 13:48:10.000000000 +0000
@@ -8,6 +8,11 @@
  *      Author: Lorenzo Bettini , (C) 2008
  *  Copyright: See COPYING file that comes with this distribution
  */ //> TEXINFO
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include "srchilite/sourcehighlight.h"
 #include "srchilite/langmap.h"
diff -Nru source-highlight-3.1.6/lib/examples/styleformatter-main.cpp source-highlight-3.1.7/lib/examples/styleformatter-main.cpp
--- source-highlight-3.1.6/lib/examples/styleformatter-main.cpp	2011-12-16 17:10:10.000000000 +0000
+++ source-highlight-3.1.7/lib/examples/styleformatter-main.cpp	2012-04-14 13:48:19.000000000 +0000
@@ -9,6 +9,11 @@
  *      Author: Lorenzo Bettini , (C) 2008
  *  Copyright: See COPYING file that comes with this distribution
  *///> TEXINFO
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include "srchilite/langdefmanager.h"
 #include "srchilite/regexrulefactory.h"
diff -Nru source-highlight-3.1.6/lib/Makefile.in source-highlight-3.1.7/lib/Makefile.in
--- source-highlight-3.1.6/lib/Makefile.in	2011-12-23 09:28:31.000000000 +0000
+++ source-highlight-3.1.7/lib/Makefile.in	2012-05-09 17:49:56.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -882,10 +882,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru source-highlight-3.1.6/lib/srchilite/bufferedoutput.cpp source-highlight-3.1.7/lib/srchilite/bufferedoutput.cpp
--- source-highlight-3.1.6/lib/srchilite/bufferedoutput.cpp	2011-12-16 17:10:10.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/bufferedoutput.cpp	2012-04-14 13:48:26.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "bufferedoutput.h"
 
 namespace srchilite {
diff -Nru source-highlight-3.1.6/lib/srchilite/chartranslator.cc source-highlight-3.1.7/lib/srchilite/chartranslator.cc
--- source-highlight-3.1.6/lib/srchilite/chartranslator.cc	2011-12-16 17:10:10.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/chartranslator.cc	2012-04-14 13:48:34.000000000 +0000
@@ -17,6 +17,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "chartranslator.h"
 #include 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/ctagscollector.cpp source-highlight-3.1.7/lib/srchilite/ctagscollector.cpp
--- source-highlight-3.1.6/lib/srchilite/ctagscollector.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/ctagscollector.cpp	2012-04-14 13:48:40.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ctagscollector.h"
 #include "formatterparams.h"
 #include 
diff -Nru source-highlight-3.1.6/lib/srchilite/ctagsformatter.cpp source-highlight-3.1.7/lib/srchilite/ctagsformatter.cpp
--- source-highlight-3.1.6/lib/srchilite/ctagsformatter.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/ctagsformatter.cpp	2012-04-14 13:48:45.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ctagsformatter.h"
 
 #include "preformatter.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/ctagsmanager.cpp source-highlight-3.1.7/lib/srchilite/ctagsmanager.cpp
--- source-highlight-3.1.6/lib/srchilite/ctagsmanager.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/ctagsmanager.cpp	2012-04-14 13:48:51.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "ctagsmanager.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/debuglistener.cpp source-highlight-3.1.7/lib/srchilite/debuglistener.cpp
--- source-highlight-3.1.6/lib/srchilite/debuglistener.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/debuglistener.cpp	2012-04-14 13:48:55.000000000 +0000
@@ -3,6 +3,9 @@
 //
 // Copyright: See COPYING file that comes with this distribution
 //
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "debuglistener.h"
 #include "highlightevent.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/delimitedlangelem.cpp source-highlight-3.1.7/lib/srchilite/delimitedlangelem.cpp
--- source-highlight-3.1.6/lib/srchilite/delimitedlangelem.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/delimitedlangelem.cpp	2012-04-14 13:49:01.000000000 +0000
@@ -9,6 +9,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "delimitedlangelem.h"
 
 #include "stringdef.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/doctemplate.cpp source-highlight-3.1.7/lib/srchilite/doctemplate.cpp
--- source-highlight-3.1.6/lib/srchilite/doctemplate.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/doctemplate.cpp	2012-04-14 13:49:10.000000000 +0000
@@ -8,6 +8,10 @@
  * Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "doctemplate.h"
 #include "substfun.h"
 
diff -Nru source-highlight-3.1.6/lib/srchilite/fileinfo.cpp source-highlight-3.1.7/lib/srchilite/fileinfo.cpp
--- source-highlight-3.1.6/lib/srchilite/fileinfo.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/fileinfo.cpp	2012-04-14 13:49:15.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "fileinfo.h"
 #include "fileutil.h"
 
diff -Nru source-highlight-3.1.6/lib/srchilite/formatter.cpp source-highlight-3.1.7/lib/srchilite/formatter.cpp
--- source-highlight-3.1.6/lib/srchilite/formatter.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/formatter.cpp	2012-04-14 13:49:24.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "formatter.h"
 
 namespace srchilite {
diff -Nru source-highlight-3.1.6/lib/srchilite/formattermanager.cpp source-highlight-3.1.7/lib/srchilite/formattermanager.cpp
--- source-highlight-3.1.6/lib/srchilite/formattermanager.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/formattermanager.cpp	2012-04-14 13:49:29.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "formattermanager.h"
 
 namespace srchilite {
diff -Nru source-highlight-3.1.6/lib/srchilite/highlightbuilderexception.cpp source-highlight-3.1.7/lib/srchilite/highlightbuilderexception.cpp
--- source-highlight-3.1.6/lib/srchilite/highlightbuilderexception.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/highlightbuilderexception.cpp	2012-04-14 13:49:35.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "highlightbuilderexception.h"
 
 #include "parserinfo.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/highlightrule.cpp source-highlight-3.1.7/lib/srchilite/highlightrule.cpp
--- source-highlight-3.1.6/lib/srchilite/highlightrule.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/highlightrule.cpp	2012-04-14 13:49:40.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "highlightrule.h"
 
 namespace srchilite {
diff -Nru source-highlight-3.1.6/lib/srchilite/highlightrulefactory.cpp source-highlight-3.1.7/lib/srchilite/highlightrulefactory.cpp
--- source-highlight-3.1.6/lib/srchilite/highlightrulefactory.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/highlightrulefactory.cpp	2012-04-14 13:49:48.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "highlightrulefactory.h"
 
 namespace srchilite {
diff -Nru source-highlight-3.1.6/lib/srchilite/highlightstatebuilder.cpp source-highlight-3.1.7/lib/srchilite/highlightstatebuilder.cpp
--- source-highlight-3.1.6/lib/srchilite/highlightstatebuilder.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/highlightstatebuilder.cpp	2012-04-14 13:51:07.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/highlightstate.cpp source-highlight-3.1.7/lib/srchilite/highlightstate.cpp
--- source-highlight-3.1.6/lib/srchilite/highlightstate.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/highlightstate.cpp	2012-04-14 13:49:53.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "highlightstate.h"
 #include "highlightrule.h"
 #include "tostringcollection.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/highlightstateprinter.cpp source-highlight-3.1.7/lib/srchilite/highlightstateprinter.cpp
--- source-highlight-3.1.6/lib/srchilite/highlightstateprinter.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/highlightstateprinter.cpp	2012-04-14 13:51:12.000000000 +0000
@@ -4,6 +4,9 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "highlightstateprinter.h"
 
diff -Nru source-highlight-3.1.6/lib/srchilite/highlighttoken.cpp source-highlight-3.1.7/lib/srchilite/highlighttoken.cpp
--- source-highlight-3.1.6/lib/srchilite/highlighttoken.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/highlighttoken.cpp	2012-04-14 13:51:17.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "highlighttoken.h"
 
 using namespace std;
diff -Nru source-highlight-3.1.6/lib/srchilite/instances.cpp source-highlight-3.1.7/lib/srchilite/instances.cpp
--- source-highlight-3.1.6/lib/srchilite/instances.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/instances.cpp	2012-04-14 13:51:23.000000000 +0000
@@ -6,6 +6,10 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "instances.h"
 
 #include "regexrulefactory.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/ioexception.cpp source-highlight-3.1.7/lib/srchilite/ioexception.cpp
--- source-highlight-3.1.6/lib/srchilite/ioexception.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/ioexception.cpp	2012-04-14 13:51:33.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "ioexception.h"
 
 namespace srchilite {
diff -Nru source-highlight-3.1.6/lib/srchilite/langdefmanager.cpp source-highlight-3.1.7/lib/srchilite/langdefmanager.cpp
--- source-highlight-3.1.6/lib/srchilite/langdefmanager.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langdefmanager.cpp	2012-04-14 13:51:38.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "langdefmanager.h"
 
 #include "fileutil.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/langdefparser.cc source-highlight-3.1.7/lib/srchilite/langdefparser.cc
--- source-highlight-3.1.6/lib/srchilite/langdefparser.cc	2011-12-23 09:29:01.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langdefparser.cc	2012-04-14 14:00:27.000000000 +0000
@@ -97,6 +97,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
@@ -168,7 +172,7 @@
 
 
 /* Line 189 of yacc.c  */
-#line 172 "../../../lib/srchilite/langdefparser.cc"
+#line 176 "../../../lib/srchilite/langdefparser.cc"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -255,7 +259,7 @@
 {
 
 /* Line 214 of yacc.c  */
-#line 91 "../../../lib/srchilite/langdefparser.yy"
+#line 95 "../../../lib/srchilite/langdefparser.yy"
 
   int tok ; /* command */
   bool booloption ;
@@ -275,7 +279,7 @@
 
 
 /* Line 214 of yacc.c  */
-#line 279 "../../../lib/srchilite/langdefparser.cc"
+#line 283 "../../../lib/srchilite/langdefparser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -300,7 +304,7 @@
 
 
 /* Line 264 of yacc.c  */
-#line 304 "../../../lib/srchilite/langdefparser.cc"
+#line 308 "../../../lib/srchilite/langdefparser.cc"
 
 #ifdef short
 # undef short
@@ -602,11 +606,11 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   134,   134,   143,   146,   150,   156,   165,   173,   177,
-     188,   195,   200,   206,   212,   219,   224,   231,   232,   235,
-     236,   237,   240,   241,   244,   245,   248,   249,   252,   253,
-     254,   257,   258,   261,   262,   265,   266,   271,   274,   277,
-     280,   287,   291,   296,   306,   309,   312,   315,   322,   327
+       0,   138,   138,   147,   150,   154,   160,   169,   177,   181,
+     192,   199,   204,   210,   216,   223,   228,   235,   236,   239,
+     240,   241,   244,   245,   248,   249,   252,   253,   256,   257,
+     258,   261,   262,   265,   266,   269,   270,   275,   278,   281,
+     284,   291,   295,   300,   310,   313,   316,   319,   326,   331
 };
 #endif
 
@@ -1267,74 +1271,74 @@
       case 34: /* "elemdefs" */
 
 /* Line 1000 of yacc.c  */
-#line 126 "../../../lib/srchilite/langdefparser.yy"
+#line 130 "../../../lib/srchilite/langdefparser.yy"
 	{
 	//std::cout << "freeing discarded symbol" << std::endl;
 	delete (yyvaluep->langelems);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1278 "../../../lib/srchilite/langdefparser.cc"
+#line 1282 "../../../lib/srchilite/langdefparser.cc"
 	break;
       case 35: /* "elemdef" */
 
 /* Line 1000 of yacc.c  */
-#line 126 "../../../lib/srchilite/langdefparser.yy"
+#line 130 "../../../lib/srchilite/langdefparser.yy"
 	{
 	//std::cout << "freeing discarded symbol" << std::endl;
 	delete (yyvaluep->langelem);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1290 "../../../lib/srchilite/langdefparser.cc"
+#line 1294 "../../../lib/srchilite/langdefparser.cc"
 	break;
       case 37: /* "key" */
 
 /* Line 1000 of yacc.c  */
-#line 126 "../../../lib/srchilite/langdefparser.yy"
+#line 130 "../../../lib/srchilite/langdefparser.yy"
 	{
 	//std::cout << "freeing discarded symbol" << std::endl;
 	delete (yyvaluep->key);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1302 "../../../lib/srchilite/langdefparser.cc"
+#line 1306 "../../../lib/srchilite/langdefparser.cc"
 	break;
       case 38: /* "keys" */
 
 /* Line 1000 of yacc.c  */
-#line 126 "../../../lib/srchilite/langdefparser.yy"
+#line 130 "../../../lib/srchilite/langdefparser.yy"
 	{
 	//std::cout << "freeing discarded symbol" << std::endl;
 	delete (yyvaluep->keys);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1314 "../../../lib/srchilite/langdefparser.cc"
+#line 1318 "../../../lib/srchilite/langdefparser.cc"
 	break;
       case 47: /* "stringdefs" */
 
 /* Line 1000 of yacc.c  */
-#line 126 "../../../lib/srchilite/langdefparser.yy"
+#line 130 "../../../lib/srchilite/langdefparser.yy"
 	{
 	//std::cout << "freeing discarded symbol" << std::endl;
 	delete (yyvaluep->stringdefs);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1326 "../../../lib/srchilite/langdefparser.cc"
+#line 1330 "../../../lib/srchilite/langdefparser.cc"
 	break;
       case 49: /* "stringdef" */
 
 /* Line 1000 of yacc.c  */
-#line 126 "../../../lib/srchilite/langdefparser.yy"
+#line 130 "../../../lib/srchilite/langdefparser.yy"
 	{
 	//std::cout << "freeing discarded symbol" << std::endl;
 	delete (yyvaluep->stringdef);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1338 "../../../lib/srchilite/langdefparser.cc"
+#line 1342 "../../../lib/srchilite/langdefparser.cc"
 	break;
 
       default:
@@ -1666,7 +1670,7 @@
         case 2:
 
 /* Line 1455 of yacc.c  */
-#line 134 "../../../lib/srchilite/langdefparser.yy"
+#line 138 "../../../lib/srchilite/langdefparser.yy"
     {
           /* no definitions (i.e., empty a .lang file with no definition) */
           /* such as, default.lang */
@@ -1681,14 +1685,14 @@
   case 3:
 
 /* Line 1455 of yacc.c  */
-#line 143 "../../../lib/srchilite/langdefparser.yy"
+#line 147 "../../../lib/srchilite/langdefparser.yy"
     { current_lang_elems = (yyvsp[(1) - (1)].langelems); }
     break;
 
   case 4:
 
 /* Line 1455 of yacc.c  */
-#line 146 "../../../lib/srchilite/langdefparser.yy"
+#line 150 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.langelems) = (yyvsp[(1) - (2)].langelems);
               ADD_ELEMENT((yyval.langelems), (yyvsp[(2) - (2)].langelem));
@@ -1698,7 +1702,7 @@
   case 5:
 
 /* Line 1455 of yacc.c  */
-#line 150 "../../../lib/srchilite/langdefparser.yy"
+#line 154 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.langelems) = new LangElems;
               ADD_ELEMENT((yyval.langelems), (yyvsp[(1) - (1)].langelem));
@@ -1708,7 +1712,7 @@
   case 6:
 
 /* Line 1455 of yacc.c  */
-#line 157 "../../../lib/srchilite/langdefparser.yy"
+#line 161 "../../../lib/srchilite/langdefparser.yy"
     {
             (yyval.langelem) = (yyvsp[(2) - (3)].statestartlangelem);
             if ((yyvsp[(3) - (3)].tok) < 0)
@@ -1722,7 +1726,7 @@
   case 7:
 
 /* Line 1455 of yacc.c  */
-#line 166 "../../../lib/srchilite/langdefparser.yy"
+#line 170 "../../../lib/srchilite/langdefparser.yy"
     {
             StateLangElem *statelangelem = new StateLangElem((yyvsp[(3) - (6)].statestartlangelem)->getName(), (yyvsp[(3) - (6)].statestartlangelem), (yyvsp[(5) - (6)].langelems), !(yyvsp[(2) - (6)].booloption));
             (yyval.langelem) = statelangelem;
@@ -1735,7 +1739,7 @@
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 173 "../../../lib/srchilite/langdefparser.yy"
+#line 177 "../../../lib/srchilite/langdefparser.yy"
     {
             vardefinitions->add(*(yyvsp[(2) - (4)].string), (yyvsp[(4) - (4)].stringdefs));
             (yyval.langelem) = 0;
@@ -1745,7 +1749,7 @@
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 177 "../../../lib/srchilite/langdefparser.yy"
+#line 181 "../../../lib/srchilite/langdefparser.yy"
     {
             // this token is used by the scanner to signal an error
             // in opening an include file
@@ -1760,7 +1764,7 @@
   case 10:
 
 /* Line 1455 of yacc.c  */
-#line 189 "../../../lib/srchilite/langdefparser.yy"
+#line 193 "../../../lib/srchilite/langdefparser.yy"
     {
                   (yyval.statestartlangelem) = new DelimitedLangElem(*((yyvsp[(1) - (7)].key)->key), (yyvsp[(3) - (7)].stringdef), (yyvsp[(4) - (7)].stringdef), (yyvsp[(5) - (7)].stringdef), (yyvsp[(6) - (7)].booloption), (yyvsp[(7) - (7)].booloption));
                   (yyval.statestartlangelem)->setParserInfo((yyvsp[(1) - (7)].key));
@@ -1772,7 +1776,7 @@
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 195 "../../../lib/srchilite/langdefparser.yy"
+#line 199 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.statestartlangelem) = new DelimitedLangElem(*((yyvsp[(1) - (3)].key)->key), (yyvsp[(3) - (3)].stringdef), 0, 0, false, false);
               (yyval.statestartlangelem)->setParserInfo((yyvsp[(1) - (3)].key));
@@ -1783,7 +1787,7 @@
   case 12:
 
 /* Line 1455 of yacc.c  */
-#line 200 "../../../lib/srchilite/langdefparser.yy"
+#line 204 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.statestartlangelem) = new StringListLangElem(*((yyvsp[(1) - (4)].key)->key), (yyvsp[(3) - (4)].stringdefs), (yyvsp[(4) - (4)].booloption));
               (yyval.statestartlangelem)->setParserInfo((yyvsp[(1) - (4)].key));
@@ -1795,7 +1799,7 @@
   case 13:
 
 /* Line 1455 of yacc.c  */
-#line 206 "../../../lib/srchilite/langdefparser.yy"
+#line 210 "../../../lib/srchilite/langdefparser.yy"
     {
           		(yyval.statestartlangelem) = new NamedSubExpsLangElem((yyvsp[(2) - (5)].keys), new StringDef(*(yyvsp[(5) - (5)].string)));
                         (yyval.statestartlangelem)->setParserInfo(parsestruct->file_name, (yylsp[(1) - (5)]).first_line);
@@ -1805,7 +1809,7 @@
   case 14:
 
 /* Line 1455 of yacc.c  */
-#line 212 "../../../lib/srchilite/langdefparser.yy"
+#line 216 "../../../lib/srchilite/langdefparser.yy"
     {
     (yyval.key) = new Key;
     (yyval.key)->key = (yyvsp[(1) - (1)].string);
@@ -1816,7 +1820,7 @@
   case 15:
 
 /* Line 1455 of yacc.c  */
-#line 220 "../../../lib/srchilite/langdefparser.yy"
+#line 224 "../../../lib/srchilite/langdefparser.yy"
     {
         (yyval.keys) = (yyvsp[(1) - (3)].keys);
         (yyval.keys)->push_back(*(yyvsp[(3) - (3)].string));
@@ -1826,7 +1830,7 @@
   case 16:
 
 /* Line 1455 of yacc.c  */
-#line 225 "../../../lib/srchilite/langdefparser.yy"
+#line 229 "../../../lib/srchilite/langdefparser.yy"
     {
     	(yyval.keys) = new ElementNamesList;
     	(yyval.keys)->push_back(*(yyvsp[(1) - (1)].string));
@@ -1836,140 +1840,140 @@
   case 17:
 
 /* Line 1455 of yacc.c  */
-#line 231 "../../../lib/srchilite/langdefparser.yy"
+#line 235 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.stringdef) = (yyvsp[(2) - (2)].stringdef); }
     break;
 
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 232 "../../../lib/srchilite/langdefparser.yy"
+#line 236 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.stringdef) = 0; }
     break;
 
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 235 "../../../lib/srchilite/langdefparser.yy"
+#line 239 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.tok) = -1; }
     break;
 
   case 20:
 
 /* Line 1455 of yacc.c  */
-#line 236 "../../../lib/srchilite/langdefparser.yy"
+#line 240 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.tok) = (yyvsp[(2) - (2)].level); }
     break;
 
   case 21:
 
 /* Line 1455 of yacc.c  */
-#line 237 "../../../lib/srchilite/langdefparser.yy"
+#line 241 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.tok) = 0; }
     break;
 
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 240 "../../../lib/srchilite/langdefparser.yy"
+#line 244 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.level) = (yyvsp[(1) - (1)].level); }
     break;
 
   case 23:
 
 /* Line 1455 of yacc.c  */
-#line 241 "../../../lib/srchilite/langdefparser.yy"
+#line 245 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.level) = 1; }
     break;
 
   case 24:
 
 /* Line 1455 of yacc.c  */
-#line 244 "../../../lib/srchilite/langdefparser.yy"
+#line 248 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.booloption) = true; }
     break;
 
   case 25:
 
 /* Line 1455 of yacc.c  */
-#line 245 "../../../lib/srchilite/langdefparser.yy"
+#line 249 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.booloption) = false; }
     break;
 
   case 26:
 
 /* Line 1455 of yacc.c  */
-#line 248 "../../../lib/srchilite/langdefparser.yy"
+#line 252 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.booloption) = true; }
     break;
 
   case 27:
 
 /* Line 1455 of yacc.c  */
-#line 249 "../../../lib/srchilite/langdefparser.yy"
+#line 253 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.booloption) = false; }
     break;
 
   case 28:
 
 /* Line 1455 of yacc.c  */
-#line 252 "../../../lib/srchilite/langdefparser.yy"
+#line 256 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.tok) = 1; }
     break;
 
   case 29:
 
 /* Line 1455 of yacc.c  */
-#line 253 "../../../lib/srchilite/langdefparser.yy"
+#line 257 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.tok) = 2; }
     break;
 
   case 30:
 
 /* Line 1455 of yacc.c  */
-#line 254 "../../../lib/srchilite/langdefparser.yy"
+#line 258 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.tok) = 0; }
     break;
 
   case 31:
 
 /* Line 1455 of yacc.c  */
-#line 257 "../../../lib/srchilite/langdefparser.yy"
+#line 261 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.booloption) = true; }
     break;
 
   case 32:
 
 /* Line 1455 of yacc.c  */
-#line 258 "../../../lib/srchilite/langdefparser.yy"
+#line 262 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.booloption) = false; }
     break;
 
   case 33:
 
 /* Line 1455 of yacc.c  */
-#line 261 "../../../lib/srchilite/langdefparser.yy"
+#line 265 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.booloption) = true; }
     break;
 
   case 34:
 
 /* Line 1455 of yacc.c  */
-#line 262 "../../../lib/srchilite/langdefparser.yy"
+#line 266 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.booloption) = false; }
     break;
 
   case 35:
 
 /* Line 1455 of yacc.c  */
-#line 265 "../../../lib/srchilite/langdefparser.yy"
+#line 269 "../../../lib/srchilite/langdefparser.yy"
     { (yyval.stringdefs) = (yyvsp[(1) - (3)].stringdefs); (yyval.stringdefs)->push_back((yyvsp[(3) - (3)].stringdef)); }
     break;
 
   case 36:
 
 /* Line 1455 of yacc.c  */
-#line 266 "../../../lib/srchilite/langdefparser.yy"
+#line 270 "../../../lib/srchilite/langdefparser.yy"
     {
                 (yyval.stringdefs) = new StringDefs;
                 (yyval.stringdefs)->push_back((yyvsp[(1) - (1)].stringdef)); }
@@ -1978,7 +1982,7 @@
   case 37:
 
 /* Line 1455 of yacc.c  */
-#line 271 "../../../lib/srchilite/langdefparser.yy"
+#line 275 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.stringdef) = (yyvsp[(1) - (1)].stringdef);
             }
@@ -1987,7 +1991,7 @@
   case 38:
 
 /* Line 1455 of yacc.c  */
-#line 274 "../../../lib/srchilite/langdefparser.yy"
+#line 278 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.stringdef) = new StringDef(*(yyvsp[(1) - (1)].string), true);
             }
@@ -1996,7 +2000,7 @@
   case 39:
 
 /* Line 1455 of yacc.c  */
-#line 277 "../../../lib/srchilite/langdefparser.yy"
+#line 281 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.stringdef) = new StringDef(*(yyvsp[(1) - (1)].string));
             }
@@ -2005,7 +2009,7 @@
   case 40:
 
 /* Line 1455 of yacc.c  */
-#line 280 "../../../lib/srchilite/langdefparser.yy"
+#line 284 "../../../lib/srchilite/langdefparser.yy"
     {
               if (! vardefinitions->contains(*(yyvsp[(1) - (1)].string))) {
                 yyerror("undefined variable " + *(yyvsp[(1) - (1)].string));
@@ -2018,7 +2022,7 @@
   case 41:
 
 /* Line 1455 of yacc.c  */
-#line 287 "../../../lib/srchilite/langdefparser.yy"
+#line 291 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.stringdef) = new StringDef(*(yyvsp[(1) - (1)].string));
               (yyval.stringdef)->setBackRef(true);
@@ -2028,7 +2032,7 @@
   case 42:
 
 /* Line 1455 of yacc.c  */
-#line 291 "../../../lib/srchilite/langdefparser.yy"
+#line 295 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.stringdef) = StringDef::concat((yyvsp[(1) - (3)].stringdef), (yyvsp[(3) - (3)].stringdef));
               delete (yyvsp[(1) - (3)].stringdef);
@@ -2039,7 +2043,7 @@
   case 43:
 
 /* Line 1455 of yacc.c  */
-#line 296 "../../../lib/srchilite/langdefparser.yy"
+#line 300 "../../../lib/srchilite/langdefparser.yy"
     {
             // this token is used by the scanner to signal an error
             // in scanning a string with backreference
@@ -2053,7 +2057,7 @@
   case 44:
 
 /* Line 1455 of yacc.c  */
-#line 306 "../../../lib/srchilite/langdefparser.yy"
+#line 310 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.stringdef) = (yyvsp[(1) - (1)].stringdef);
             }
@@ -2062,7 +2066,7 @@
   case 45:
 
 /* Line 1455 of yacc.c  */
-#line 309 "../../../lib/srchilite/langdefparser.yy"
+#line 313 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.stringdef) = new StringDef(*(yyvsp[(1) - (1)].string), true);
             }
@@ -2071,7 +2075,7 @@
   case 46:
 
 /* Line 1455 of yacc.c  */
-#line 312 "../../../lib/srchilite/langdefparser.yy"
+#line 316 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.stringdef) = new StringDef(*(yyvsp[(1) - (1)].string));
             }
@@ -2080,7 +2084,7 @@
   case 47:
 
 /* Line 1455 of yacc.c  */
-#line 315 "../../../lib/srchilite/langdefparser.yy"
+#line 319 "../../../lib/srchilite/langdefparser.yy"
     {
               if (! vardefinitions->contains(*(yyvsp[(1) - (1)].string))) {
                 yyerror("undefined variable " + *(yyvsp[(1) - (1)].string));
@@ -2093,7 +2097,7 @@
   case 48:
 
 /* Line 1455 of yacc.c  */
-#line 322 "../../../lib/srchilite/langdefparser.yy"
+#line 326 "../../../lib/srchilite/langdefparser.yy"
     {
               (yyval.stringdef) = StringDef::concat((yyvsp[(1) - (3)].stringdef), (yyvsp[(3) - (3)].stringdef));
               delete (yyvsp[(1) - (3)].stringdef);
@@ -2104,7 +2108,7 @@
   case 49:
 
 /* Line 1455 of yacc.c  */
-#line 327 "../../../lib/srchilite/langdefparser.yy"
+#line 331 "../../../lib/srchilite/langdefparser.yy"
     {
             // this token is used by the scanner to signal an error
             // in scanning a string with backreference
@@ -2118,7 +2122,7 @@
 
 
 /* Line 1455 of yacc.c  */
-#line 2122 "../../../lib/srchilite/langdefparser.cc"
+#line 2126 "../../../lib/srchilite/langdefparser.cc"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -2337,7 +2341,7 @@
 
 
 /* Line 1675 of yacc.c  */
-#line 337 "../../../lib/srchilite/langdefparser.yy"
+#line 341 "../../../lib/srchilite/langdefparser.yy"
 
 
 extern int langdef_lex_destroy (void);
diff -Nru source-highlight-3.1.6/lib/srchilite/langdefparser.h source-highlight-3.1.7/lib/srchilite/langdefparser.h
--- source-highlight-3.1.6/lib/srchilite/langdefparser.h	2011-12-23 09:29:01.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langdefparser.h	2012-04-14 14:00:27.000000000 +0000
@@ -99,7 +99,7 @@
 {
 
 /* Line 1676 of yacc.c  */
-#line 91 "../../../lib/srchilite/langdefparser.yy"
+#line 95 "../../../lib/srchilite/langdefparser.yy"
 
   int tok ; /* command */
   bool booloption ;
diff -Nru source-highlight-3.1.6/lib/srchilite/langdefparser.yy source-highlight-3.1.7/lib/srchilite/langdefparser.yy
--- source-highlight-3.1.6/lib/srchilite/langdefparser.yy	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langdefparser.yy	2012-04-14 13:55:59.000000000 +0000
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
diff -Nru source-highlight-3.1.6/lib/srchilite/langdefscanner.cc source-highlight-3.1.7/lib/srchilite/langdefscanner.cc
--- source-highlight-3.1.6/lib/srchilite/langdefscanner.cc	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langdefscanner.cc	2012-04-14 14:00:27.000000000 +0000
@@ -614,6 +614,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include "stringdef.h"
@@ -664,7 +668,7 @@
 
 
 
-#line 668 "../../../lib/srchilite/langdefscanner.cc"
+#line 672 "../../../lib/srchilite/langdefscanner.cc"
 
 #define INITIAL 0
 #define COMMENT_STATE 1
@@ -856,10 +860,10 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 86 "../../../lib/srchilite/langdefscanner.ll"
+#line 90 "../../../lib/srchilite/langdefscanner.ll"
 
 
-#line 863 "../../../lib/srchilite/langdefscanner.cc"
+#line 867 "../../../lib/srchilite/langdefscanner.cc"
 
 	if ( !(yy_init) )
 		{
@@ -944,113 +948,113 @@
 
 case 1:
 YY_RULE_SETUP
-#line 88 "../../../lib/srchilite/langdefscanner.ll"
+#line 92 "../../../lib/srchilite/langdefscanner.ll"
 {}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 90 "../../../lib/srchilite/langdefscanner.ll"
+#line 94 "../../../lib/srchilite/langdefscanner.ll"
 {}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 92 "../../../lib/srchilite/langdefscanner.ll"
+#line 96 "../../../lib/srchilite/langdefscanner.ll"
 { BEGIN(COMMENT_STATE); }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 93 "../../../lib/srchilite/langdefscanner.ll"
+#line 97 "../../../lib/srchilite/langdefscanner.ll"
 {}
 	YY_BREAK
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 94 "../../../lib/srchilite/langdefscanner.ll"
+#line 98 "../../../lib/srchilite/langdefscanner.ll"
 { ++(parsestruct->line);  BEGIN(INITIAL); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 96 "../../../lib/srchilite/langdefscanner.ll"
+#line 100 "../../../lib/srchilite/langdefscanner.ll"
 { return BEGIN_T ; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 97 "../../../lib/srchilite/langdefscanner.ll"
+#line 101 "../../../lib/srchilite/langdefscanner.ll"
 { return END_T ; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 98 "../../../lib/srchilite/langdefscanner.ll"
+#line 102 "../../../lib/srchilite/langdefscanner.ll"
 { return ENVIRONMENT_T; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 99 "../../../lib/srchilite/langdefscanner.ll"
+#line 103 "../../../lib/srchilite/langdefscanner.ll"
 { return STATE_T; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 100 "../../../lib/srchilite/langdefscanner.ll"
+#line 104 "../../../lib/srchilite/langdefscanner.ll"
 { return MULTILINE_T; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 101 "../../../lib/srchilite/langdefscanner.ll"
+#line 105 "../../../lib/srchilite/langdefscanner.ll"
 { return DELIM_T; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 102 "../../../lib/srchilite/langdefscanner.ll"
+#line 106 "../../../lib/srchilite/langdefscanner.ll"
 { return START_T; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 103 "../../../lib/srchilite/langdefscanner.ll"
+#line 107 "../../../lib/srchilite/langdefscanner.ll"
 { return ESCAPE_T; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 104 "../../../lib/srchilite/langdefscanner.ll"
+#line 108 "../../../lib/srchilite/langdefscanner.ll"
 { return NESTED_T; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 105 "../../../lib/srchilite/langdefscanner.ll"
+#line 109 "../../../lib/srchilite/langdefscanner.ll"
 { return EXIT_ALL; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 106 "../../../lib/srchilite/langdefscanner.ll"
+#line 110 "../../../lib/srchilite/langdefscanner.ll"
 { return EXIT_T; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 107 "../../../lib/srchilite/langdefscanner.ll"
+#line 111 "../../../lib/srchilite/langdefscanner.ll"
 { return VARDEF_T; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 108 "../../../lib/srchilite/langdefscanner.ll"
+#line 112 "../../../lib/srchilite/langdefscanner.ll"
 { return REDEF_T; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 109 "../../../lib/srchilite/langdefscanner.ll"
+#line 113 "../../../lib/srchilite/langdefscanner.ll"
 { return SUBST_T; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 110 "../../../lib/srchilite/langdefscanner.ll"
+#line 114 "../../../lib/srchilite/langdefscanner.ll"
 { return NONSENSITIVE_T; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 112 "../../../lib/srchilite/langdefscanner.ll"
+#line 116 "../../../lib/srchilite/langdefscanner.ll"
 { BEGIN(INCLUDE_STATE); }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 113 "../../../lib/srchilite/langdefscanner.ll"
+#line 117 "../../../lib/srchilite/langdefscanner.ll"
 {
   DEB2("inclusion of ", langdef_text);
   
@@ -1075,7 +1079,7 @@
 case YY_STATE_EOF(REGEXP_STATE):
 case YY_STATE_EOF(REGEXP_NOPREPROC_STATE):
 case YY_STATE_EOF(INCLUDE_STATE):
-#line 131 "../../../lib/srchilite/langdefscanner.ll"
+#line 135 "../../../lib/srchilite/langdefscanner.ll"
 {
   DEB("END OF FILE");
   
@@ -1093,12 +1097,12 @@
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 146 "../../../lib/srchilite/langdefscanner.ll"
+#line 150 "../../../lib/srchilite/langdefscanner.ll"
 { DEB2("VAR",langdef_text); langdef_lval.string = stringTable->newString(&langdef_text[1]) ; return VARUSE ; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 147 "../../../lib/srchilite/langdefscanner.ll"
+#line 151 "../../../lib/srchilite/langdefscanner.ll"
 { 
 	DEB2("BACKREFVAR",langdef_text);
 	langdef_lval.string = stringTable->newString(langdef_text); 
@@ -1107,183 +1111,183 @@
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 152 "../../../lib/srchilite/langdefscanner.ll"
+#line 156 "../../../lib/srchilite/langdefscanner.ll"
 { DEB2("KEY",langdef_text); langdef_lval.string = stringTable->newString(langdef_text) ; updateTokenInfo(); return KEY ; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 153 "../../../lib/srchilite/langdefscanner.ll"
+#line 157 "../../../lib/srchilite/langdefscanner.ll"
 { return '=' ; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 154 "../../../lib/srchilite/langdefscanner.ll"
+#line 158 "../../../lib/srchilite/langdefscanner.ll"
 { return ',' ; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 155 "../../../lib/srchilite/langdefscanner.ll"
+#line 159 "../../../lib/srchilite/langdefscanner.ll"
 { return '+' ; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 156 "../../../lib/srchilite/langdefscanner.ll"
+#line 160 "../../../lib/srchilite/langdefscanner.ll"
 { updateTokenInfo(); return '(' ; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 157 "../../../lib/srchilite/langdefscanner.ll"
+#line 161 "../../../lib/srchilite/langdefscanner.ll"
 { return ')' ; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 159 "../../../lib/srchilite/langdefscanner.ll"
+#line 163 "../../../lib/srchilite/langdefscanner.ll"
 { BEGIN(STRING_STATE) ; }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 160 "../../../lib/srchilite/langdefscanner.ll"
+#line 164 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer_escape( langdef_text ) ; }
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 161 "../../../lib/srchilite/langdefscanner.ll"
+#line 165 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( langdef_text ) ; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 162 "../../../lib/srchilite/langdefscanner.ll"
+#line 166 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( langdef_text ) ; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 163 "../../../lib/srchilite/langdefscanner.ll"
+#line 167 "../../../lib/srchilite/langdefscanner.ll"
 {  
 	return WRONG_BACKREFERENCE ; 
 	}
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 166 "../../../lib/srchilite/langdefscanner.ll"
+#line 170 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( langdef_text ) ; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 167 "../../../lib/srchilite/langdefscanner.ll"
+#line 171 "../../../lib/srchilite/langdefscanner.ll"
 { BEGIN(INITIAL) ; langdef_lval.string = flush_buffer() ; DEB2("STRINGDEF",langdef_lval.string); return STRINGDEF; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 168 "../../../lib/srchilite/langdefscanner.ll"
+#line 172 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( langdef_text ) ; }
 	YY_BREAK
 case 39:
 /* rule 39 can match eol */
 YY_RULE_SETUP
-#line 169 "../../../lib/srchilite/langdefscanner.ll"
+#line 173 "../../../lib/srchilite/langdefscanner.ll"
 { DEB("NEWLINE"); ++(parsestruct->line) ; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 171 "../../../lib/srchilite/langdefscanner.ll"
+#line 175 "../../../lib/srchilite/langdefscanner.ll"
 { BEGIN(REGEXP_STATE) ; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 172 "../../../lib/srchilite/langdefscanner.ll"
+#line 176 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer_escape( langdef_text ) ; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 173 "../../../lib/srchilite/langdefscanner.ll"
+#line 177 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( langdef_text ) ; }
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 174 "../../../lib/srchilite/langdefscanner.ll"
+#line 178 "../../../lib/srchilite/langdefscanner.ll"
 {  
 	return WRONG_BACKREFERENCE ; 
 	}
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 177 "../../../lib/srchilite/langdefscanner.ll"
+#line 181 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( "'" ) ; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 178 "../../../lib/srchilite/langdefscanner.ll"
+#line 182 "../../../lib/srchilite/langdefscanner.ll"
 { BEGIN(INITIAL) ; langdef_lval.stringdef = flush_buffer_preproc() ; DEB2("REGEXPDEF",langdef_lval.string); return REGEXPDEF; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 179 "../../../lib/srchilite/langdefscanner.ll"
+#line 183 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( langdef_text ) ; }
 	YY_BREAK
 case 47:
 /* rule 47 can match eol */
 YY_RULE_SETUP
-#line 180 "../../../lib/srchilite/langdefscanner.ll"
+#line 184 "../../../lib/srchilite/langdefscanner.ll"
 { DEB("NEWLINE"); ++(parsestruct->line) ; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 182 "../../../lib/srchilite/langdefscanner.ll"
+#line 186 "../../../lib/srchilite/langdefscanner.ll"
 { BEGIN(REGEXP_NOPREPROC_STATE) ; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 183 "../../../lib/srchilite/langdefscanner.ll"
+#line 187 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer_escape( langdef_text ) ; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 184 "../../../lib/srchilite/langdefscanner.ll"
+#line 188 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( langdef_text ) ; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 185 "../../../lib/srchilite/langdefscanner.ll"
+#line 189 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( "'" ) ; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 186 "../../../lib/srchilite/langdefscanner.ll"
+#line 190 "../../../lib/srchilite/langdefscanner.ll"
 { BEGIN(INITIAL) ; langdef_lval.string = flush_buffer() ; DEB2("REGEXPNOPREPROCDEF",langdef_lval.string); return REGEXPNOPREPROC; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 187 "../../../lib/srchilite/langdefscanner.ll"
+#line 191 "../../../lib/srchilite/langdefscanner.ll"
 {  buffer( langdef_text ) ; }
 	YY_BREAK
 case 54:
 /* rule 54 can match eol */
 YY_RULE_SETUP
-#line 188 "../../../lib/srchilite/langdefscanner.ll"
+#line 192 "../../../lib/srchilite/langdefscanner.ll"
 { DEB("NEWLINE"); ++(parsestruct->line) ; }
 	YY_BREAK
 case 55:
 /* rule 55 can match eol */
 YY_RULE_SETUP
-#line 190 "../../../lib/srchilite/langdefscanner.ll"
+#line 194 "../../../lib/srchilite/langdefscanner.ll"
 { DEB("NEWLINE"); ++(parsestruct->line) ; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 192 "../../../lib/srchilite/langdefscanner.ll"
+#line 196 "../../../lib/srchilite/langdefscanner.ll"
 { langdef_lval.level = atoi(langdef_text); return LEVEL ; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 194 "../../../lib/srchilite/langdefscanner.ll"
+#line 198 "../../../lib/srchilite/langdefscanner.ll"
 { return langdef_text[0] ; }
 	YY_BREAK
 case 58:
 YY_RULE_SETUP
-#line 196 "../../../lib/srchilite/langdefscanner.ll"
+#line 200 "../../../lib/srchilite/langdefscanner.ll"
 ECHO;
 	YY_BREAK
-#line 1287 "../../../lib/srchilite/langdefscanner.cc"
+#line 1291 "../../../lib/srchilite/langdefscanner.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2279,7 +2283,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 196 "../../../lib/srchilite/langdefscanner.ll"
+#line 200 "../../../lib/srchilite/langdefscanner.ll"
 
 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/langdefscanner.ll source-highlight-3.1.7/lib/srchilite/langdefscanner.ll
--- source-highlight-3.1.6/lib/srchilite/langdefscanner.ll	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langdefscanner.ll	2012-04-14 13:56:08.000000000 +0000
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include "stringdef.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/langelem.cpp source-highlight-3.1.7/lib/srchilite/langelem.cpp
--- source-highlight-3.1.6/lib/srchilite/langelem.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langelem.cpp	2012-04-14 13:51:54.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "langelem.h"
 #include 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/langelems.cpp source-highlight-3.1.7/lib/srchilite/langelems.cpp
--- source-highlight-3.1.6/lib/srchilite/langelems.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langelems.cpp	2012-04-14 13:51:59.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "langelems.h"
 
 #include 
diff -Nru source-highlight-3.1.6/lib/srchilite/langelemsprinter.cpp source-highlight-3.1.7/lib/srchilite/langelemsprinter.cpp
--- source-highlight-3.1.6/lib/srchilite/langelemsprinter.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langelemsprinter.cpp	2012-04-14 13:52:05.000000000 +0000
@@ -10,6 +10,10 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "langelemsprinter.hpp"
 
 #include "statelangelem.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/langmap.cpp source-highlight-3.1.7/lib/srchilite/langmap.cpp
--- source-highlight-3.1.6/lib/srchilite/langmap.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/langmap.cpp	2012-04-14 13:52:09.000000000 +0000
@@ -10,6 +10,10 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/languageinfer.cpp source-highlight-3.1.7/lib/srchilite/languageinfer.cpp
--- source-highlight-3.1.6/lib/srchilite/languageinfer.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/languageinfer.cpp	2012-04-14 13:52:14.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "languageinfer.h"
 #include "fileutil.h"
 
diff -Nru source-highlight-3.1.6/lib/srchilite/linenumgenerator.cpp source-highlight-3.1.7/lib/srchilite/linenumgenerator.cpp
--- source-highlight-3.1.6/lib/srchilite/linenumgenerator.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/linenumgenerator.cpp	2012-04-14 13:52:19.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "linenumgenerator.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/lineranges.cpp source-highlight-3.1.7/lib/srchilite/lineranges.cpp
--- source-highlight-3.1.6/lib/srchilite/lineranges.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/lineranges.cpp	2012-04-14 13:52:23.000000000 +0000
@@ -6,6 +6,10 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "lineranges.h"
 #include 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/Makefile.am source-highlight-3.1.7/lib/srchilite/Makefile.am
--- source-highlight-3.1.6/lib/srchilite/Makefile.am	2011-12-16 17:10:10.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/Makefile.am	2012-04-14 13:40:43.000000000 +0000
@@ -51,7 +51,7 @@
 	rm -f $(builddir)/html/*
 endif
 
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl -I$(top_srcdir)/src $(BOOST_CPPFLAGS)
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 LDADD = $(top_builddir)/gl/libgnu.la
@@ -140,8 +140,6 @@
              sourcehighlightutils.h utils.h \
              instances.h
 
-INCLUDES = -I@top_srcdir@/src
-
 EXTRA_DIST = $(h_sources) \
 langelemsprinter_dbtab.cc \
 highlightstatebuilder_dbtab.cc \
diff -Nru source-highlight-3.1.6/lib/srchilite/Makefile.in source-highlight-3.1.7/lib/srchilite/Makefile.in
--- source-highlight-3.1.6/lib/srchilite/Makefile.in	2011-12-23 09:28:31.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/Makefile.in	2012-05-09 17:49:57.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -103,6 +103,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(library_includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
@@ -686,7 +692,7 @@
 # for doxygen documentation
 @HAVE_DOXYGEN_TRUE@DOXYFILE = $(builddir)/srchilite.doxyfile
 @HAVE_DOXYGEN_TRUE@help_dir = $(htmldir)/api
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl -I$(top_srcdir)/src $(BOOST_CPPFLAGS)
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 LDADD = $(top_builddir)/gl/libgnu.la
 lib_LTLIBRARIES = libsource-highlight.la
@@ -770,7 +776,6 @@
              sourcehighlightutils.h utils.h \
              instances.h
 
-INCLUDES = -I@top_srcdir@/src
 EXTRA_DIST = $(h_sources) \
 langelemsprinter_dbtab.cc \
 highlightstatebuilder_dbtab.cc \
@@ -867,9 +872,9 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libsource-highlight.la: $(libsource_highlight_la_OBJECTS) $(libsource_highlight_la_DEPENDENCIES) 
+libsource-highlight.la: $(libsource_highlight_la_OBJECTS) $(libsource_highlight_la_DEPENDENCIES) $(EXTRA_libsource_highlight_la_DEPENDENCIES) 
 	$(libsource_highlight_la_LINK) -rpath $(libdir) $(libsource_highlight_la_OBJECTS) $(libsource_highlight_la_LIBADD) $(LIBS)
-test_readtags$(EXEEXT): $(test_readtags_OBJECTS) $(test_readtags_DEPENDENCIES) 
+test_readtags$(EXEEXT): $(test_readtags_OBJECTS) $(test_readtags_DEPENDENCIES) $(EXTRA_test_readtags_DEPENDENCIES) 
 	@rm -f test_readtags$(EXEEXT)
 	$(CXXLINK) $(test_readtags_OBJECTS) $(test_readtags_LDADD) $(LIBS)
 
@@ -1036,9 +1041,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(library_include_HEADERS)'; test -n "$(library_includedir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(library_includedir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(library_includedir)" && rm -f $$files
+	dir='$(DESTDIR)$(library_includedir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1141,10 +1144,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru source-highlight-3.1.6/lib/srchilite/namedsubexpslangelem.cpp source-highlight-3.1.7/lib/srchilite/namedsubexpslangelem.cpp
--- source-highlight-3.1.6/lib/srchilite/namedsubexpslangelem.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/namedsubexpslangelem.cpp	2012-04-14 13:52:28.000000000 +0000
@@ -10,6 +10,10 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "namedsubexpslangelem.h"
 #include "stringdef.h"
 #include "tostringcollection.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/outlangdefparser.cc source-highlight-3.1.7/lib/srchilite/outlangdefparser.cc
--- source-highlight-3.1.6/lib/srchilite/outlangdefparser.cc	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/outlangdefparser.cc	2012-04-14 14:00:27.000000000 +0000
@@ -97,6 +97,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
@@ -135,7 +139,7 @@
 
 
 /* Line 189 of yacc.c  */
-#line 139 "../../../lib/srchilite/outlangdefparser.cc"
+#line 143 "../../../lib/srchilite/outlangdefparser.cc"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -232,7 +236,7 @@
 {
 
 /* Line 214 of yacc.c  */
-#line 58 "../../../lib/srchilite/outlangdefparser.yy"
+#line 62 "../../../lib/srchilite/outlangdefparser.yy"
 
   int tok ; /* command */
   bool booloption ;
@@ -242,7 +246,7 @@
 
 
 /* Line 214 of yacc.c  */
-#line 246 "../../../lib/srchilite/outlangdefparser.cc"
+#line 250 "../../../lib/srchilite/outlangdefparser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -254,7 +258,7 @@
 
 
 /* Line 264 of yacc.c  */
-#line 258 "../../../lib/srchilite/outlangdefparser.cc"
+#line 262 "../../../lib/srchilite/outlangdefparser.cc"
 
 #ifdef short
 # undef short
@@ -551,10 +555,10 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,    74,    74,    77,    78,    81,    88,    95,   101,   107,
-     113,   119,   125,   131,   137,   143,   149,   155,   161,   167,
-     173,   179,   190,   196,   202,   208,   213,   217,   227,   230,
-     232,   235,   242,   249,   252,   254,   257
+       0,    78,    78,    81,    82,    85,    92,    99,   105,   111,
+     117,   123,   129,   135,   141,   147,   153,   159,   165,   171,
+     177,   183,   194,   200,   206,   212,   217,   221,   231,   234,
+     236,   239,   246,   253,   256,   258,   261
 };
 #endif
 
@@ -1499,7 +1503,7 @@
         case 5:
 
 /* Line 1455 of yacc.c  */
-#line 82 "../../../lib/srchilite/outlangdefparser.yy"
+#line 86 "../../../lib/srchilite/outlangdefparser.yy"
     {
     textstyles->docTemplate = DocTemplate(*(yyvsp[(2) - (4)].string), *(yyvsp[(3) - (4)].string));
     delete (yyvsp[(2) - (4)].string);
@@ -1510,7 +1514,7 @@
   case 6:
 
 /* Line 1455 of yacc.c  */
-#line 89 "../../../lib/srchilite/outlangdefparser.yy"
+#line 93 "../../../lib/srchilite/outlangdefparser.yy"
     {
     textstyles->noDocTemplate = DocTemplate(*(yyvsp[(2) - (4)].string), *(yyvsp[(3) - (4)].string));
     delete (yyvsp[(2) - (4)].string);
@@ -1521,7 +1525,7 @@
   case 7:
 
 /* Line 1455 of yacc.c  */
-#line 96 "../../../lib/srchilite/outlangdefparser.yy"
+#line 100 "../../../lib/srchilite/outlangdefparser.yy"
     {
     textstyles->starting_template = *(yyvsp[(2) - (2)].string);
     delete (yyvsp[(2) - (2)].string);
@@ -1531,7 +1535,7 @@
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 102 "../../../lib/srchilite/outlangdefparser.yy"
+#line 106 "../../../lib/srchilite/outlangdefparser.yy"
     {
     textstyles->style_separator = *(yyvsp[(2) - (2)].string);
     delete (yyvsp[(2) - (2)].string);
@@ -1541,7 +1545,7 @@
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 108 "../../../lib/srchilite/outlangdefparser.yy"
+#line 112 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->bold = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1551,7 +1555,7 @@
   case 10:
 
 /* Line 1455 of yacc.c  */
-#line 114 "../../../lib/srchilite/outlangdefparser.yy"
+#line 118 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->italics = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1561,7 +1565,7 @@
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 120 "../../../lib/srchilite/outlangdefparser.yy"
+#line 124 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->underline = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1571,7 +1575,7 @@
   case 12:
 
 /* Line 1455 of yacc.c  */
-#line 126 "../../../lib/srchilite/outlangdefparser.yy"
+#line 130 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->fixed = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1581,7 +1585,7 @@
   case 13:
 
 /* Line 1455 of yacc.c  */
-#line 132 "../../../lib/srchilite/outlangdefparser.yy"
+#line 136 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->notfixed = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1591,7 +1595,7 @@
   case 14:
 
 /* Line 1455 of yacc.c  */
-#line 138 "../../../lib/srchilite/outlangdefparser.yy"
+#line 142 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->color = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1601,7 +1605,7 @@
   case 15:
 
 /* Line 1455 of yacc.c  */
-#line 144 "../../../lib/srchilite/outlangdefparser.yy"
+#line 148 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->bg_color = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1611,7 +1615,7 @@
   case 16:
 
 /* Line 1455 of yacc.c  */
-#line 150 "../../../lib/srchilite/outlangdefparser.yy"
+#line 154 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->onestyle = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1621,7 +1625,7 @@
   case 17:
 
 /* Line 1455 of yacc.c  */
-#line 156 "../../../lib/srchilite/outlangdefparser.yy"
+#line 160 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->file_extension = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1631,7 +1635,7 @@
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 162 "../../../lib/srchilite/outlangdefparser.yy"
+#line 166 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->refstyle.anchor = TextStyle(*(yyvsp[(2) - (2)].string), anchor_vars);
   delete (yyvsp[(2) - (2)].string);
@@ -1641,7 +1645,7 @@
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 168 "../../../lib/srchilite/outlangdefparser.yy"
+#line 172 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->line_prefix = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1651,7 +1655,7 @@
   case 20:
 
 /* Line 1455 of yacc.c  */
-#line 174 "../../../lib/srchilite/outlangdefparser.yy"
+#line 178 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->linenum = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(2) - (2)].string);
@@ -1661,7 +1665,7 @@
   case 21:
 
 /* Line 1455 of yacc.c  */
-#line 180 "../../../lib/srchilite/outlangdefparser.yy"
+#line 184 "../../../lib/srchilite/outlangdefparser.yy"
     {
   if (textstyles->refstyle.inline_reference.empty())
     textstyles->refstyle.inline_reference = TextStyle(*(yyvsp[(2) - (2)].string), reference_vars);
@@ -1676,7 +1680,7 @@
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 191 "../../../lib/srchilite/outlangdefparser.yy"
+#line 195 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->refstyle.inline_reference = TextStyle(*(yyvsp[(2) - (2)].string), reference_vars);
   delete (yyvsp[(2) - (2)].string);
@@ -1686,7 +1690,7 @@
   case 23:
 
 /* Line 1455 of yacc.c  */
-#line 197 "../../../lib/srchilite/outlangdefparser.yy"
+#line 201 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->refstyle.postline_reference = TextStyle(*(yyvsp[(2) - (2)].string), reference_vars);
   delete (yyvsp[(2) - (2)].string);
@@ -1696,7 +1700,7 @@
   case 24:
 
 /* Line 1455 of yacc.c  */
-#line 203 "../../../lib/srchilite/outlangdefparser.yy"
+#line 207 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->refstyle.postdoc_reference = TextStyle(*(yyvsp[(2) - (2)].string), reference_vars);
   delete (yyvsp[(2) - (2)].string);
@@ -1706,7 +1710,7 @@
   case 25:
 
 /* Line 1455 of yacc.c  */
-#line 209 "../../../lib/srchilite/outlangdefparser.yy"
+#line 213 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->colorMap = colorMap;
 }
@@ -1715,7 +1719,7 @@
   case 26:
 
 /* Line 1455 of yacc.c  */
-#line 214 "../../../lib/srchilite/outlangdefparser.yy"
+#line 218 "../../../lib/srchilite/outlangdefparser.yy"
     {
   textstyles->charTranslator = charTranslator;
 }
@@ -1724,7 +1728,7 @@
   case 27:
 
 /* Line 1455 of yacc.c  */
-#line 217 "../../../lib/srchilite/outlangdefparser.yy"
+#line 221 "../../../lib/srchilite/outlangdefparser.yy"
     {
             // this token is used by the scanner to signal an error
             // in opening an include file
@@ -1738,7 +1742,7 @@
   case 31:
 
 /* Line 1455 of yacc.c  */
-#line 236 "../../../lib/srchilite/outlangdefparser.yy"
+#line 240 "../../../lib/srchilite/outlangdefparser.yy"
     {
   (*colorMap)[*(yyvsp[(1) - (2)].string)] = *(yyvsp[(2) - (2)].string);
   delete (yyvsp[(1) - (2)].string);
@@ -1749,7 +1753,7 @@
   case 32:
 
 /* Line 1455 of yacc.c  */
-#line 243 "../../../lib/srchilite/outlangdefparser.yy"
+#line 247 "../../../lib/srchilite/outlangdefparser.yy"
     {
   colorMap->setDefault(*(yyvsp[(2) - (2)].string));
   delete (yyvsp[(2) - (2)].string);
@@ -1759,7 +1763,7 @@
   case 36:
 
 /* Line 1455 of yacc.c  */
-#line 258 "../../../lib/srchilite/outlangdefparser.yy"
+#line 262 "../../../lib/srchilite/outlangdefparser.yy"
     {
   charTranslator->set_translation(*(yyvsp[(1) - (2)].string), *(yyvsp[(2) - (2)].string));
   delete (yyvsp[(1) - (2)].string);
@@ -1770,7 +1774,7 @@
 
 
 /* Line 1455 of yacc.c  */
-#line 1774 "../../../lib/srchilite/outlangdefparser.cc"
+#line 1778 "../../../lib/srchilite/outlangdefparser.cc"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1982,7 +1986,7 @@
 
 
 /* Line 1675 of yacc.c  */
-#line 264 "../../../lib/srchilite/outlangdefparser.yy"
+#line 268 "../../../lib/srchilite/outlangdefparser.yy"
 
 
 extern int outlangdef_lex_destroy (void);
diff -Nru source-highlight-3.1.6/lib/srchilite/outlangdefparser.h source-highlight-3.1.7/lib/srchilite/outlangdefparser.h
--- source-highlight-3.1.6/lib/srchilite/outlangdefparser.h	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/outlangdefparser.h	2012-04-14 14:00:27.000000000 +0000
@@ -109,7 +109,7 @@
 {
 
 /* Line 1676 of yacc.c  */
-#line 58 "../../../lib/srchilite/outlangdefparser.yy"
+#line 62 "../../../lib/srchilite/outlangdefparser.yy"
 
   int tok ; /* command */
   bool booloption ;
diff -Nru source-highlight-3.1.6/lib/srchilite/outlangdefparser.yy source-highlight-3.1.7/lib/srchilite/outlangdefparser.yy
--- source-highlight-3.1.6/lib/srchilite/outlangdefparser.yy	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/outlangdefparser.yy	2012-04-14 13:56:14.000000000 +0000
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
diff -Nru source-highlight-3.1.6/lib/srchilite/outlangdefscanner.cc source-highlight-3.1.7/lib/srchilite/outlangdefscanner.cc
--- source-highlight-3.1.6/lib/srchilite/outlangdefscanner.cc	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/outlangdefscanner.cc	2012-04-14 14:00:27.000000000 +0000
@@ -681,6 +681,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include "outlangdefparser.h"
 #include "outlangdefscanner.h"
@@ -720,7 +724,7 @@
 static ParseStructStack parsestructstack;
 
 
-#line 724 "../../../lib/srchilite/outlangdefscanner.cc"
+#line 728 "../../../lib/srchilite/outlangdefscanner.cc"
 
 #define INITIAL 0
 #define COMMENT_STATE 1
@@ -924,10 +928,10 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 77 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 81 "../../../lib/srchilite/outlangdefscanner.ll"
 
 
-#line 931 "../../../lib/srchilite/outlangdefscanner.cc"
+#line 935 "../../../lib/srchilite/outlangdefscanner.cc"
 
 	if ( !(yy_init) )
 		{
@@ -1012,163 +1016,163 @@
 
 case 1:
 YY_RULE_SETUP
-#line 79 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 83 "../../../lib/srchilite/outlangdefscanner.ll"
 {}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 81 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 85 "../../../lib/srchilite/outlangdefscanner.ll"
 {}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 83 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 87 "../../../lib/srchilite/outlangdefscanner.ll"
 { PUSH(COMMENT_STATE); }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 84 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 88 "../../../lib/srchilite/outlangdefscanner.ll"
 {}
 	YY_BREAK
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 85 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 89 "../../../lib/srchilite/outlangdefscanner.ll"
 { ++(outlang_parsestruct->line);  POP(); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 87 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 91 "../../../lib/srchilite/outlangdefscanner.ll"
 { return NODOC_TEMPLATE_T ; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 88 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 92 "../../../lib/srchilite/outlangdefscanner.ll"
 { return DOC_TEMPLATE_T ; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 89 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 93 "../../../lib/srchilite/outlangdefscanner.ll"
 { return STYLE_TEMPLATE_T ; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 90 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 94 "../../../lib/srchilite/outlangdefscanner.ll"
 { return STYLE_SEPARATOR_T ; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 91 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 95 "../../../lib/srchilite/outlangdefscanner.ll"
 { return BOLD_T ; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 92 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 96 "../../../lib/srchilite/outlangdefscanner.ll"
 { return ITALICS_T ; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 93 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 97 "../../../lib/srchilite/outlangdefscanner.ll"
 { return UNDERLINE_T ; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 94 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 98 "../../../lib/srchilite/outlangdefscanner.ll"
 { return NOTFIXED_T ; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 95 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 99 "../../../lib/srchilite/outlangdefscanner.ll"
 { return FIXED_T ; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 96 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 100 "../../../lib/srchilite/outlangdefscanner.ll"
 { return COLORMAP_T ; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 97 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 101 "../../../lib/srchilite/outlangdefscanner.ll"
 { return BG_COLOR_T ; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 98 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 102 "../../../lib/srchilite/outlangdefscanner.ll"
 { return COLOR_T ; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 99 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 103 "../../../lib/srchilite/outlangdefscanner.ll"
 { return DEFAULT_T ; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 100 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 104 "../../../lib/srchilite/outlangdefscanner.ll"
 { return ONESTYLE_T ; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 101 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 105 "../../../lib/srchilite/outlangdefscanner.ll"
 { return EXTENSION_T ; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 102 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 106 "../../../lib/srchilite/outlangdefscanner.ll"
 { return ANCHOR_T ; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 103 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 107 "../../../lib/srchilite/outlangdefscanner.ll"
 { return INLINE_REFERENCE_T ; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 104 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 108 "../../../lib/srchilite/outlangdefscanner.ll"
 { return POSTLINE_REFERENCE_T ; }
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 105 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 109 "../../../lib/srchilite/outlangdefscanner.ll"
 { return POSTDOC_REFERENCE_T ; }
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 106 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 110 "../../../lib/srchilite/outlangdefscanner.ll"
 { return REFERENCE_T ; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 107 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 111 "../../../lib/srchilite/outlangdefscanner.ll"
 { return LINE_PREFIX_T; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 108 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 112 "../../../lib/srchilite/outlangdefscanner.ll"
 { return LINENUM_T; }
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 109 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 113 "../../../lib/srchilite/outlangdefscanner.ll"
 { BEGIN(TRANSLATION_STATE); return TRANSLATIONS_T ; }
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 110 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 114 "../../../lib/srchilite/outlangdefscanner.ll"
 { return BEGIN_T ; }
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 111 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 115 "../../../lib/srchilite/outlangdefscanner.ll"
 { BEGIN(INITIAL); return END_T ; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 113 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 117 "../../../lib/srchilite/outlangdefscanner.ll"
 { BEGIN(INCLUDE_STATE); }
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 114 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 118 "../../../lib/srchilite/outlangdefscanner.ll"
 {
   char *file_name = &outlangdef_text[1];
   file_name[strlen(file_name)-1] = '\0';
@@ -1193,7 +1197,7 @@
 case YY_STATE_EOF(REGEX_STATE):
 case YY_STATE_EOF(LITERAL_STATE):
 case YY_STATE_EOF(TRANSLATED_STATE):
-#line 130 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 134 "../../../lib/srchilite/outlangdefscanner.ll"
 {
   fclose(outlangdef_in);
   outlangdef_in = 0;
@@ -1209,32 +1213,32 @@
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 143 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 147 "../../../lib/srchilite/outlangdefscanner.ll"
 { DEB2("KEY",outlangdef_text); outlangdef_lval.string = new std::string(outlangdef_text) ; return KEY ; }
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 144 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 148 "../../../lib/srchilite/outlangdefscanner.ll"
 { return '=' ; }
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 145 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 149 "../../../lib/srchilite/outlangdefscanner.ll"
 { return ',' ; }
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 146 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 150 "../../../lib/srchilite/outlangdefscanner.ll"
 { return '+' ; }
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 148 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 152 "../../../lib/srchilite/outlangdefscanner.ll"
 { BEGIN(STRING_STATE) ; }
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 149 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 153 "../../../lib/srchilite/outlangdefscanner.ll"
 {
   string s = &outlangdef_text[1];
   s = "0" + s;
@@ -1244,78 +1248,78 @@
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 155 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 159 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( outlangdef_text ) ; }
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 156 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 160 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( "\"" ) ; }
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 157 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 161 "../../../lib/srchilite/outlangdefscanner.ll"
 { BEGIN(INITIAL) ; outlangdef_lval.string = flush_buffer() ; DEB2("STRINGDEF",outlangdef_lval.string); return STRINGDEF; }
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 158 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 162 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( outlangdef_text ) ; }
 	YY_BREAK
 case 43:
 /* rule 43 can match eol */
 YY_RULE_SETUP
-#line 159 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 163 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( "\n" ) ; }
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 161 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 165 "../../../lib/srchilite/outlangdefscanner.ll"
 { BEGIN(LITERAL_STATE) ; }
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 162 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 166 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer_escape( outlangdef_text ) ; }
 	YY_BREAK
 case 46:
 YY_RULE_SETUP
-#line 163 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 167 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( outlangdef_text ) ; }
 	YY_BREAK
 case 47:
 YY_RULE_SETUP
-#line 164 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 168 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( outlangdef_text ) ; }
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 165 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 169 "../../../lib/srchilite/outlangdefscanner.ll"
 { BEGIN(TRANSLATION_STATE) ; outlangdef_lval.string = flush_buffer() ; DEB2("STRINGDEF",loutlangdef_lval.string); return REGEXDEF; }
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 166 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 170 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( outlangdef_text ) ; }
 	YY_BREAK
 case 50:
 YY_RULE_SETUP
-#line 168 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 172 "../../../lib/srchilite/outlangdefscanner.ll"
 { BEGIN(REGEX_STATE) ; }
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 169 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 173 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( outlangdef_text ) ; }
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 170 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 174 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( "'" ) ; }
 	YY_BREAK
 case 53:
 YY_RULE_SETUP
-#line 171 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 175 "../../../lib/srchilite/outlangdefscanner.ll"
 {
     BEGIN(TRANSLATED_STATE) ;
     // entering TRANSLATED_STATE makes sure that 'regex' is used only
@@ -1326,26 +1330,26 @@
 	YY_BREAK
 case 54:
 YY_RULE_SETUP
-#line 178 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 182 "../../../lib/srchilite/outlangdefscanner.ll"
 {  buffer( outlangdef_text ) ; }
 	YY_BREAK
 case 55:
 /* rule 55 can match eol */
 YY_RULE_SETUP
-#line 180 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 184 "../../../lib/srchilite/outlangdefscanner.ll"
 { DEB("NEWLINE"); ++(outlang_parsestruct->line) ; }
 	YY_BREAK
 case 56:
 YY_RULE_SETUP
-#line 182 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 186 "../../../lib/srchilite/outlangdefscanner.ll"
 { return outlangdef_text[0] ; }
 	YY_BREAK
 case 57:
 YY_RULE_SETUP
-#line 184 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 188 "../../../lib/srchilite/outlangdefscanner.ll"
 ECHO;
 	YY_BREAK
-#line 1349 "../../../lib/srchilite/outlangdefscanner.cc"
+#line 1353 "../../../lib/srchilite/outlangdefscanner.cc"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -2386,7 +2390,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 184 "../../../lib/srchilite/outlangdefscanner.ll"
+#line 188 "../../../lib/srchilite/outlangdefscanner.ll"
 
 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/outlangdefscanner.ll source-highlight-3.1.7/lib/srchilite/outlangdefscanner.ll
--- source-highlight-3.1.6/lib/srchilite/outlangdefscanner.ll	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/outlangdefscanner.ll	2012-04-14 13:56:19.000000000 +0000
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include "outlangdefparser.h"
 #include "outlangdefscanner.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/parserexception.cpp source-highlight-3.1.7/lib/srchilite/parserexception.cpp
--- source-highlight-3.1.6/lib/srchilite/parserexception.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/parserexception.cpp	2012-04-14 13:52:36.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "parserexception.h"
 
 #include "parsestruct.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/preformatter.cpp source-highlight-3.1.7/lib/srchilite/preformatter.cpp
--- source-highlight-3.1.6/lib/srchilite/preformatter.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/preformatter.cpp	2012-04-14 13:52:41.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "preformatter.h"
 
 using namespace std;
diff -Nru source-highlight-3.1.6/lib/srchilite/readtags.c source-highlight-3.1.7/lib/srchilite/readtags.c
--- source-highlight-3.1.6/lib/srchilite/readtags.c	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/readtags.c	2012-04-14 13:52:48.000000000 +0000
@@ -8,6 +8,10 @@
 *   This module contains functions for reading tag files.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /*
 *   INCLUDE FILES
 */
diff -Nru source-highlight-3.1.6/lib/srchilite/regexhighlightrule.cpp source-highlight-3.1.7/lib/srchilite/regexhighlightrule.cpp
--- source-highlight-3.1.6/lib/srchilite/regexhighlightrule.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/regexhighlightrule.cpp	2012-04-14 13:52:54.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "regexhighlightrule.h"
 #include "highlighttoken.h"
 #include "matchingparameters.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/regexpreprocessor.cpp source-highlight-3.1.7/lib/srchilite/regexpreprocessor.cpp
--- source-highlight-3.1.6/lib/srchilite/regexpreprocessor.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/regexpreprocessor.cpp	2012-04-14 13:52:58.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "regexpreprocessor.h"
 #include 
 #include 
diff -Nru source-highlight-3.1.6/lib/srchilite/regexranges.cpp source-highlight-3.1.7/lib/srchilite/regexranges.cpp
--- source-highlight-3.1.6/lib/srchilite/regexranges.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/regexranges.cpp	2012-04-14 13:53:02.000000000 +0000
@@ -6,6 +6,10 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "regexranges.h"
 
 namespace srchilite {
diff -Nru source-highlight-3.1.6/lib/srchilite/regexrulefactory.cpp source-highlight-3.1.7/lib/srchilite/regexrulefactory.cpp
--- source-highlight-3.1.6/lib/srchilite/regexrulefactory.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/regexrulefactory.cpp	2012-04-14 13:53:07.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "regexrulefactory.h"
 #include "regexhighlightrule.h"
 #include "tostringcollection.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/sourcefilehighlighter.cpp source-highlight-3.1.7/lib/srchilite/sourcefilehighlighter.cpp
--- source-highlight-3.1.6/lib/srchilite/sourcefilehighlighter.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/sourcefilehighlighter.cpp	2012-04-14 13:53:16.000000000 +0000
@@ -10,6 +10,10 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/sourcehighlight.cpp source-highlight-3.1.7/lib/srchilite/sourcehighlight.cpp
--- source-highlight-3.1.6/lib/srchilite/sourcehighlight.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/sourcehighlight.cpp	2012-04-14 13:53:20.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "sourcehighlight.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/sourcehighlighter.cpp source-highlight-3.1.7/lib/srchilite/sourcehighlighter.cpp
--- source-highlight-3.1.6/lib/srchilite/sourcehighlighter.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/sourcehighlighter.cpp	2012-04-14 13:53:25.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "sourcehighlighter.h"
 #include "highlighttoken.h"
 #include "matchingparameters.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/sourcehighlightutils.cpp source-highlight-3.1.7/lib/srchilite/sourcehighlightutils.cpp
--- source-highlight-3.1.6/lib/srchilite/sourcehighlightutils.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/sourcehighlightutils.cpp	2012-04-14 13:53:29.000000000 +0000
@@ -6,6 +6,10 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "sourcehighlightutils.h"
 #include "ioexception.h"
 #include "fileutil.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/srcuntabifier.cpp source-highlight-3.1.7/lib/srchilite/srcuntabifier.cpp
--- source-highlight-3.1.6/lib/srchilite/srcuntabifier.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/srcuntabifier.cpp	2012-04-14 13:53:33.000000000 +0000
@@ -10,6 +10,10 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "srcuntabifier.h"
 #include 
 #include 
diff -Nru source-highlight-3.1.6/lib/srchilite/statelangelem.cpp source-highlight-3.1.7/lib/srchilite/statelangelem.cpp
--- source-highlight-3.1.6/lib/srchilite/statelangelem.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/statelangelem.cpp	2012-04-14 13:53:38.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "statelangelem.h"
 
 #include "statestartlangelem.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/statestartlangelem.cpp source-highlight-3.1.7/lib/srchilite/statestartlangelem.cpp
--- source-highlight-3.1.6/lib/srchilite/statestartlangelem.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/statestartlangelem.cpp	2012-04-14 13:53:42.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "statestartlangelem.h"
 
 using std::string;
diff -Nru source-highlight-3.1.6/lib/srchilite/stopwatch.cpp source-highlight-3.1.7/lib/srchilite/stopwatch.cpp
--- source-highlight-3.1.6/lib/srchilite/stopwatch.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stopwatch.cpp	2012-04-14 13:53:47.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stopwatch.h"
 
 #include 
diff -Nru source-highlight-3.1.6/lib/srchilite/stringdef.cpp source-highlight-3.1.7/lib/srchilite/stringdef.cpp
--- source-highlight-3.1.6/lib/srchilite/stringdef.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stringdef.cpp	2012-04-14 13:53:53.000000000 +0000
@@ -17,6 +17,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "stringdef.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/stringlistlangelem.cpp source-highlight-3.1.7/lib/srchilite/stringlistlangelem.cpp
--- source-highlight-3.1.6/lib/srchilite/stringlistlangelem.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stringlistlangelem.cpp	2012-04-14 13:53:57.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stringlistlangelem.h"
 
 #include "stringdef.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/stringtable.cpp source-highlight-3.1.7/lib/srchilite/stringtable.cpp
--- source-highlight-3.1.6/lib/srchilite/stringtable.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stringtable.cpp	2012-04-14 13:54:02.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stringtable.h"
 
 using namespace std;
diff -Nru source-highlight-3.1.6/lib/srchilite/stylecssparser.cc source-highlight-3.1.7/lib/srchilite/stylecssparser.cc
--- source-highlight-3.1.6/lib/srchilite/stylecssparser.cc	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stylecssparser.cc	2012-04-14 14:00:27.000000000 +0000
@@ -97,6 +97,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
@@ -147,7 +151,7 @@
 
 
 /* Line 189 of yacc.c  */
-#line 151 "../../../lib/srchilite/stylecssparser.cc"
+#line 155 "../../../lib/srchilite/stylecssparser.cc"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -208,7 +212,7 @@
 {
 
 /* Line 214 of yacc.c  */
-#line 70 "../../../lib/srchilite/stylecssparser.yy"
+#line 74 "../../../lib/srchilite/stylecssparser.yy"
 
   int tok ; /* command */
   const std::string * string ; /* string : id, ... */
@@ -219,7 +223,7 @@
 
 
 /* Line 214 of yacc.c  */
-#line 223 "../../../lib/srchilite/stylecssparser.cc"
+#line 227 "../../../lib/srchilite/stylecssparser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -231,7 +235,7 @@
 
 
 /* Line 264 of yacc.c  */
-#line 235 "../../../lib/srchilite/stylecssparser.cc"
+#line 239 "../../../lib/srchilite/stylecssparser.cc"
 
 #ifdef short
 # undef short
@@ -520,9 +524,9 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    90,    90,    91,    94,    95,    98,   102,   101,   143,
-     149,   157,   158,   161,   162,   163,   166,   171,   178,   183,
-     190,   191,   192,   193,   194,   195
+       0,    94,    94,    95,    98,    99,   102,   106,   105,   147,
+     153,   161,   162,   165,   166,   167,   170,   175,   182,   187,
+     194,   195,   196,   197,   198,   199
 };
 #endif
 
@@ -1136,62 +1140,62 @@
       case 9: /* "KEY" */
 
 /* Line 1000 of yacc.c  */
-#line 83 "../../../lib/srchilite/stylecssparser.yy"
+#line 87 "../../../lib/srchilite/stylecssparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1147 "../../../lib/srchilite/stylecssparser.cc"
+#line 1151 "../../../lib/srchilite/stylecssparser.cc"
 	break;
       case 10: /* "COLOR" */
 
 /* Line 1000 of yacc.c  */
-#line 83 "../../../lib/srchilite/stylecssparser.yy"
+#line 87 "../../../lib/srchilite/stylecssparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1159 "../../../lib/srchilite/stylecssparser.cc"
+#line 1163 "../../../lib/srchilite/stylecssparser.cc"
 	break;
       case 11: /* "BG_COLOR" */
 
 /* Line 1000 of yacc.c  */
-#line 83 "../../../lib/srchilite/stylecssparser.yy"
+#line 87 "../../../lib/srchilite/stylecssparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1171 "../../../lib/srchilite/stylecssparser.cc"
+#line 1175 "../../../lib/srchilite/stylecssparser.cc"
 	break;
       case 12: /* "STRINGDEF" */
 
 /* Line 1000 of yacc.c  */
-#line 83 "../../../lib/srchilite/stylecssparser.yy"
+#line 87 "../../../lib/srchilite/stylecssparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1183 "../../../lib/srchilite/stylecssparser.cc"
+#line 1187 "../../../lib/srchilite/stylecssparser.cc"
 	break;
       case 22: /* "keylist" */
 
 /* Line 1000 of yacc.c  */
-#line 83 "../../../lib/srchilite/stylecssparser.yy"
+#line 87 "../../../lib/srchilite/stylecssparser.yy"
 	{
 	if ((yyvaluep->keylist))
 	  delete (yyvaluep->keylist);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1195 "../../../lib/srchilite/stylecssparser.cc"
+#line 1199 "../../../lib/srchilite/stylecssparser.cc"
 	break;
 
       default:
@@ -1496,14 +1500,14 @@
         case 2:
 
 /* Line 1455 of yacc.c  */
-#line 90 "../../../lib/srchilite/stylecssparser.yy"
+#line 94 "../../../lib/srchilite/stylecssparser.yy"
     { /* allow empty files */ }
     break;
 
   case 7:
 
 /* Line 1455 of yacc.c  */
-#line 102 "../../../lib/srchilite/stylecssparser.yy"
+#line 106 "../../../lib/srchilite/stylecssparser.yy"
     {
                //printSequence( $1 ) ;
                //printMessage_noln( ": " ) ;
@@ -1516,7 +1520,7 @@
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 110 "../../../lib/srchilite/stylecssparser.yy"
+#line 114 "../../../lib/srchilite/stylecssparser.yy"
     {
                KeyType key;
                KeyList *keylist = (yyvsp[(1) - (4)].keylist);
@@ -1553,7 +1557,7 @@
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 144 "../../../lib/srchilite/stylecssparser.yy"
+#line 148 "../../../lib/srchilite/stylecssparser.yy"
     {
               (yyvsp[(1) - (3)].keylist)->push_back(*(yyvsp[(3) - (3)].string));
               (yyval.keylist) = (yyvsp[(1) - (3)].keylist);
@@ -1564,7 +1568,7 @@
   case 10:
 
 /* Line 1455 of yacc.c  */
-#line 150 "../../../lib/srchilite/stylecssparser.yy"
+#line 154 "../../../lib/srchilite/stylecssparser.yy"
     {
               (yyval.keylist) = new KeyList;
               (yyval.keylist)->push_back(*(yyvsp[(1) - (1)].string));
@@ -1575,14 +1579,14 @@
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 157 "../../../lib/srchilite/stylecssparser.yy"
+#line 161 "../../../lib/srchilite/stylecssparser.yy"
     {}
     break;
 
   case 16:
 
 /* Line 1455 of yacc.c  */
-#line 167 "../../../lib/srchilite/stylecssparser.yy"
+#line 171 "../../../lib/srchilite/stylecssparser.yy"
     {
           currentColor = *(yyvsp[(1) - (1)].string);
           delete (yyvsp[(1) - (1)].string);
@@ -1592,7 +1596,7 @@
   case 17:
 
 /* Line 1455 of yacc.c  */
-#line 172 "../../../lib/srchilite/stylecssparser.yy"
+#line 176 "../../../lib/srchilite/stylecssparser.yy"
     {
           currentColor = *(yyvsp[(1) - (1)].string);
           delete (yyvsp[(1) - (1)].string);
@@ -1602,7 +1606,7 @@
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 179 "../../../lib/srchilite/stylecssparser.yy"
+#line 183 "../../../lib/srchilite/stylecssparser.yy"
     {
           currentBGColor = *(yyvsp[(1) - (1)].string);
           delete (yyvsp[(1) - (1)].string);
@@ -1612,7 +1616,7 @@
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 184 "../../../lib/srchilite/stylecssparser.yy"
+#line 188 "../../../lib/srchilite/stylecssparser.yy"
     {
           currentBGColor = *(yyvsp[(1) - (1)].string);
           delete (yyvsp[(1) - (1)].string);
@@ -1622,49 +1626,49 @@
   case 20:
 
 /* Line 1455 of yacc.c  */
-#line 190 "../../../lib/srchilite/stylecssparser.yy"
+#line 194 "../../../lib/srchilite/stylecssparser.yy"
     { currentStyleConstants->push_back(ISBOLD); }
     break;
 
   case 21:
 
 /* Line 1455 of yacc.c  */
-#line 191 "../../../lib/srchilite/stylecssparser.yy"
+#line 195 "../../../lib/srchilite/stylecssparser.yy"
     { currentStyleConstants->push_back(ISITALIC); }
     break;
 
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 192 "../../../lib/srchilite/stylecssparser.yy"
+#line 196 "../../../lib/srchilite/stylecssparser.yy"
     { currentStyleConstants->push_back(ISUNDERLINE); }
     break;
 
   case 23:
 
 /* Line 1455 of yacc.c  */
-#line 193 "../../../lib/srchilite/stylecssparser.yy"
+#line 197 "../../../lib/srchilite/stylecssparser.yy"
     { currentStyleConstants->push_back(ISFIXED); }
     break;
 
   case 24:
 
 /* Line 1455 of yacc.c  */
-#line 194 "../../../lib/srchilite/stylecssparser.yy"
+#line 198 "../../../lib/srchilite/stylecssparser.yy"
     { currentStyleConstants->push_back(ISNOTFIXED); }
     break;
 
   case 25:
 
 /* Line 1455 of yacc.c  */
-#line 195 "../../../lib/srchilite/stylecssparser.yy"
+#line 199 "../../../lib/srchilite/stylecssparser.yy"
     { currentStyleConstants->push_back(ISNOREF); }
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 1668 "../../../lib/srchilite/stylecssparser.cc"
+#line 1672 "../../../lib/srchilite/stylecssparser.cc"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1876,7 +1880,7 @@
 
 
 /* Line 1675 of yacc.c  */
-#line 198 "../../../lib/srchilite/stylecssparser.yy"
+#line 202 "../../../lib/srchilite/stylecssparser.yy"
 
 
 // string current_file; defined in styleparser
diff -Nru source-highlight-3.1.6/lib/srchilite/stylecssparser.h source-highlight-3.1.7/lib/srchilite/stylecssparser.h
--- source-highlight-3.1.6/lib/srchilite/stylecssparser.h	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stylecssparser.h	2012-04-14 14:00:27.000000000 +0000
@@ -73,7 +73,7 @@
 {
 
 /* Line 1676 of yacc.c  */
-#line 70 "../../../lib/srchilite/stylecssparser.yy"
+#line 74 "../../../lib/srchilite/stylecssparser.yy"
 
   int tok ; /* command */
   const std::string * string ; /* string : id, ... */
diff -Nru source-highlight-3.1.6/lib/srchilite/stylecssparser.yy source-highlight-3.1.7/lib/srchilite/stylecssparser.yy
--- source-highlight-3.1.6/lib/srchilite/stylecssparser.yy	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stylecssparser.yy	2012-04-14 13:56:26.000000000 +0000
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
diff -Nru source-highlight-3.1.6/lib/srchilite/stylecssscanner.cc source-highlight-3.1.7/lib/srchilite/stylecssscanner.cc
--- source-highlight-3.1.6/lib/srchilite/stylecssscanner.cc	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stylecssscanner.cc	2012-04-14 14:00:27.000000000 +0000
@@ -716,6 +716,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
@@ -743,7 +747,7 @@
 #endif
 
 
-#line 747 "../../../lib/srchilite/stylecssscanner.cc"
+#line 751 "../../../lib/srchilite/stylecssscanner.cc"
 
 #define INITIAL 0
 #define COMMENT_STATE 1
@@ -941,10 +945,10 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 65 "../../../lib/srchilite/stylecssscanner.ll"
+#line 69 "../../../lib/srchilite/stylecssscanner.ll"
 
 
-#line 948 "../../../lib/srchilite/stylecssscanner.cc"
+#line 952 "../../../lib/srchilite/stylecssscanner.cc"
 
 	if ( !(yy_init) )
 		{
@@ -1029,49 +1033,49 @@
 
 case 1:
 YY_RULE_SETUP
-#line 67 "../../../lib/srchilite/stylecssscanner.ll"
+#line 71 "../../../lib/srchilite/stylecssscanner.ll"
 {}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 69 "../../../lib/srchilite/stylecssscanner.ll"
+#line 73 "../../../lib/srchilite/stylecssscanner.ll"
 {}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 71 "../../../lib/srchilite/stylecssscanner.ll"
+#line 75 "../../../lib/srchilite/stylecssscanner.ll"
 { BEGIN(MULTI_COMMENT_STATE); }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 72 "../../../lib/srchilite/stylecssscanner.ll"
+#line 76 "../../../lib/srchilite/stylecssscanner.ll"
 {}
 	YY_BREAK
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 73 "../../../lib/srchilite/stylecssscanner.ll"
+#line 77 "../../../lib/srchilite/stylecssscanner.ll"
 { ++line;  BEGIN(INITIAL); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 76 "../../../lib/srchilite/stylecssscanner.ll"
+#line 80 "../../../lib/srchilite/stylecssscanner.ll"
 { return ',' ; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 77 "../../../lib/srchilite/stylecssscanner.ll"
+#line 81 "../../../lib/srchilite/stylecssscanner.ll"
 { stylecsssc_lval.string = new std::string(stylecsssc_text) ; return KEY ; }
 	YY_BREAK
 case 8:
 /* rule 8 can match eol */
 YY_RULE_SETUP
-#line 79 "../../../lib/srchilite/stylecssscanner.ll"
+#line 83 "../../../lib/srchilite/stylecssscanner.ll"
 { ++line ; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 81 "../../../lib/srchilite/stylecssscanner.ll"
+#line 85 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_SELECTOR) ;
   DEB("CSS SELECTOR");
@@ -1079,7 +1083,7 @@
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 85 "../../../lib/srchilite/stylecssscanner.ll"
+#line 89 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_SELECTOR) ;
   DEB("BODY CSS SELECTOR");
@@ -1089,7 +1093,7 @@
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 92 "../../../lib/srchilite/stylecssscanner.ll"
+#line 96 "../../../lib/srchilite/stylecssscanner.ll"
 {
   // in case of comma separated selectors
   DEB("CSS SELECTOR");
@@ -1097,7 +1101,7 @@
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 96 "../../../lib/srchilite/stylecssscanner.ll"
+#line 100 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_PROPERTIES);
   DEB("CSS PROPERTIES");
@@ -1105,7 +1109,7 @@
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 100 "../../../lib/srchilite/stylecssscanner.ll"
+#line 104 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_COLOR);
   DEB("CSS COLOR");
@@ -1113,7 +1117,7 @@
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 104 "../../../lib/srchilite/stylecssscanner.ll"
+#line 108 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_PROPERTIES);
   stylecsssc_lval.string = new std::string(stylecsssc_text) ;
@@ -1123,7 +1127,7 @@
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 110 "../../../lib/srchilite/stylecssscanner.ll"
+#line 114 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_PROPERTIES);
   DEB2("CSS COLOR", stylecsssc_text);
@@ -1137,7 +1141,7 @@
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 120 "../../../lib/srchilite/stylecssscanner.ll"
+#line 124 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_BG_COLOR);
   DEB("CSS BACKGROUND COLOR");
@@ -1145,7 +1149,7 @@
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 124 "../../../lib/srchilite/stylecssscanner.ll"
+#line 128 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_PROPERTIES);
   stylecsssc_lval.string = new std::string(stylecsssc_text) ;
@@ -1155,7 +1159,7 @@
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 130 "../../../lib/srchilite/stylecssscanner.ll"
+#line 134 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_PROPERTIES);
   DEB2("CSS BG COLOR", stylecsssc_text);
@@ -1169,7 +1173,7 @@
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 140 "../../../lib/srchilite/stylecssscanner.ll"
+#line 144 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_FONT_WEIGHT);
   DEB("CSS FONT WEIGHT");
@@ -1177,7 +1181,7 @@
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 144 "../../../lib/srchilite/stylecssscanner.ll"
+#line 148 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_PROPERTIES);
   if (strcmp(stylecsssc_text, "bold") == 0) {
@@ -1190,7 +1194,7 @@
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 153 "../../../lib/srchilite/stylecssscanner.ll"
+#line 157 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_FONT_STYLE);
   DEB("CSS FONT STYLE");
@@ -1198,7 +1202,7 @@
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 157 "../../../lib/srchilite/stylecssscanner.ll"
+#line 161 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_PROPERTIES);
   if (strcmp(stylecsssc_text, "italic") == 0) {
@@ -1211,7 +1215,7 @@
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 166 "../../../lib/srchilite/stylecssscanner.ll"
+#line 170 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_FONT_FAMILY);
   DEB("CSS FONT FAMILY");
@@ -1219,7 +1223,7 @@
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 170 "../../../lib/srchilite/stylecssscanner.ll"
+#line 174 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_PROPERTIES);
   if (strcmp(stylecsssc_text, "monospace") == 0) {
@@ -1232,7 +1236,7 @@
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 179 "../../../lib/srchilite/stylecssscanner.ll"
+#line 183 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_TEXT_DECORATION);
   DEB("CSS TEXT DECORATION");
@@ -1240,7 +1244,7 @@
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 183 "../../../lib/srchilite/stylecssscanner.ll"
+#line 187 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(CSS_PROPERTIES);
   if (strcmp(stylecsssc_text, "underline") == 0) {
@@ -1253,7 +1257,7 @@
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 192 "../../../lib/srchilite/stylecssscanner.ll"
+#line 196 "../../../lib/srchilite/stylecssscanner.ll"
 {
   BEGIN(INITIAL);
   DEB("CSS END PROPERTIES");
@@ -1266,7 +1270,7 @@
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 201 "../../../lib/srchilite/stylecssscanner.ll"
+#line 205 "../../../lib/srchilite/stylecssscanner.ll"
 {
   /* discard other characters */
   DEB2("CSS discarding", stylecsssc_text);
@@ -1274,7 +1278,7 @@
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 205 "../../../lib/srchilite/stylecssscanner.ll"
+#line 209 "../../../lib/srchilite/stylecssscanner.ll"
 {
   /* discard other properties */
   DEB2("CSS PROPERTIES discarding", stylecsssc_text);
@@ -1282,15 +1286,15 @@
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 210 "../../../lib/srchilite/stylecssscanner.ll"
+#line 214 "../../../lib/srchilite/stylecssscanner.ll"
 { return stylecsssc_text[0] ; }
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 212 "../../../lib/srchilite/stylecssscanner.ll"
+#line 216 "../../../lib/srchilite/stylecssscanner.ll"
 ECHO;
 	YY_BREAK
-#line 1294 "../../../lib/srchilite/stylecssscanner.cc"
+#line 1298 "../../../lib/srchilite/stylecssscanner.cc"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(COMMENT_STATE):
 case YY_STATE_EOF(MULTI_COMMENT_STATE):
@@ -2299,7 +2303,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 212 "../../../lib/srchilite/stylecssscanner.ll"
+#line 216 "../../../lib/srchilite/stylecssscanner.ll"
 
 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/stylecssscanner.ll source-highlight-3.1.7/lib/srchilite/stylecssscanner.ll
--- source-highlight-3.1.6/lib/srchilite/stylecssscanner.ll	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stylecssscanner.ll	2012-04-14 13:56:31.000000000 +0000
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/stylefileparser.cpp source-highlight-3.1.7/lib/srchilite/stylefileparser.cpp
--- source-highlight-3.1.6/lib/srchilite/stylefileparser.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stylefileparser.cpp	2012-04-14 13:54:10.000000000 +0000
@@ -6,6 +6,10 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "stylefileparser.h"
 #include "parsestyles.h"
 #include "settings.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/styleparser.cc source-highlight-3.1.7/lib/srchilite/styleparser.cc
--- source-highlight-3.1.6/lib/srchilite/styleparser.cc	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/styleparser.cc	2012-04-14 14:00:27.000000000 +0000
@@ -97,6 +97,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
@@ -139,7 +143,7 @@
 
 
 /* Line 189 of yacc.c  */
-#line 143 "../../../lib/srchilite/styleparser.cc"
+#line 147 "../../../lib/srchilite/styleparser.cc"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -202,7 +206,7 @@
 {
 
 /* Line 214 of yacc.c  */
-#line 62 "../../../lib/srchilite/styleparser.yy"
+#line 66 "../../../lib/srchilite/styleparser.yy"
 
   int tok ; /* command */
   const std::string * string ; /* string : id, ... */
@@ -213,7 +217,7 @@
 
 
 /* Line 214 of yacc.c  */
-#line 217 "../../../lib/srchilite/styleparser.cc"
+#line 221 "../../../lib/srchilite/styleparser.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -225,7 +229,7 @@
 
 
 /* Line 264 of yacc.c  */
-#line 229 "../../../lib/srchilite/styleparser.cc"
+#line 233 "../../../lib/srchilite/styleparser.cc"
 
 #ifdef short
 # undef short
@@ -516,9 +520,9 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint8 yyrline[] =
 {
-       0,    86,    86,    87,    90,    91,    94,    95,    99,    98,
-     134,   140,   148,   149,   150,   153,   154,   155,   158,   159,
-     162,   163,   166,   167,   170,   171,   172,   173,   174,   175
+       0,    90,    90,    91,    94,    95,    98,    99,   103,   102,
+     138,   144,   152,   153,   154,   157,   158,   159,   162,   163,
+     166,   167,   170,   171,   174,   175,   176,   177,   178,   179
 };
 #endif
 
@@ -1137,86 +1141,86 @@
       case 9: /* "KEY" */
 
 /* Line 1000 of yacc.c  */
-#line 79 "../../../lib/srchilite/styleparser.yy"
+#line 83 "../../../lib/srchilite/styleparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1148 "../../../lib/srchilite/styleparser.cc"
+#line 1152 "../../../lib/srchilite/styleparser.cc"
 	break;
       case 10: /* "COLOR" */
 
 /* Line 1000 of yacc.c  */
-#line 79 "../../../lib/srchilite/styleparser.yy"
+#line 83 "../../../lib/srchilite/styleparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1160 "../../../lib/srchilite/styleparser.cc"
+#line 1164 "../../../lib/srchilite/styleparser.cc"
 	break;
       case 11: /* "BG_COLOR" */
 
 /* Line 1000 of yacc.c  */
-#line 79 "../../../lib/srchilite/styleparser.yy"
+#line 83 "../../../lib/srchilite/styleparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1172 "../../../lib/srchilite/styleparser.cc"
+#line 1176 "../../../lib/srchilite/styleparser.cc"
 	break;
       case 12: /* "STRINGDEF" */
 
 /* Line 1000 of yacc.c  */
-#line 79 "../../../lib/srchilite/styleparser.yy"
+#line 83 "../../../lib/srchilite/styleparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1184 "../../../lib/srchilite/styleparser.cc"
+#line 1188 "../../../lib/srchilite/styleparser.cc"
 	break;
       case 24: /* "keylist" */
 
 /* Line 1000 of yacc.c  */
-#line 79 "../../../lib/srchilite/styleparser.yy"
+#line 83 "../../../lib/srchilite/styleparser.yy"
 	{
 	if ((yyvaluep->keylist))
 	  delete (yyvaluep->keylist);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1196 "../../../lib/srchilite/styleparser.cc"
+#line 1200 "../../../lib/srchilite/styleparser.cc"
 	break;
       case 25: /* "color" */
 
 /* Line 1000 of yacc.c  */
-#line 79 "../../../lib/srchilite/styleparser.yy"
+#line 83 "../../../lib/srchilite/styleparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1208 "../../../lib/srchilite/styleparser.cc"
+#line 1212 "../../../lib/srchilite/styleparser.cc"
 	break;
       case 26: /* "bgcolor" */
 
 /* Line 1000 of yacc.c  */
-#line 79 "../../../lib/srchilite/styleparser.yy"
+#line 83 "../../../lib/srchilite/styleparser.yy"
 	{
 	if ((yyvaluep->string))
 	  delete (yyvaluep->string);
 };
 
 /* Line 1000 of yacc.c  */
-#line 1220 "../../../lib/srchilite/styleparser.cc"
+#line 1224 "../../../lib/srchilite/styleparser.cc"
 	break;
 
       default:
@@ -1521,14 +1525,14 @@
         case 2:
 
 /* Line 1455 of yacc.c  */
-#line 86 "../../../lib/srchilite/styleparser.yy"
+#line 90 "../../../lib/srchilite/styleparser.yy"
     { /* allow empty files */ }
     break;
 
   case 8:
 
 /* Line 1455 of yacc.c  */
-#line 99 "../../../lib/srchilite/styleparser.yy"
+#line 103 "../../../lib/srchilite/styleparser.yy"
     {
                  //printSequence( $1 ) ;
                  //printMessage_noln( ": " ) ;
@@ -1541,7 +1545,7 @@
   case 9:
 
 /* Line 1455 of yacc.c  */
-#line 107 "../../../lib/srchilite/styleparser.yy"
+#line 111 "../../../lib/srchilite/styleparser.yy"
     {
                KeyType key;
                KeyList *keylist = (yyvsp[(1) - (6)].keylist);
@@ -1572,7 +1576,7 @@
   case 10:
 
 /* Line 1455 of yacc.c  */
-#line 135 "../../../lib/srchilite/styleparser.yy"
+#line 139 "../../../lib/srchilite/styleparser.yy"
     {
               (yyvsp[(1) - (3)].keylist)->push_back(*(yyvsp[(3) - (3)].string));
               (yyval.keylist) = (yyvsp[(1) - (3)].keylist);
@@ -1583,7 +1587,7 @@
   case 11:
 
 /* Line 1455 of yacc.c  */
-#line 141 "../../../lib/srchilite/styleparser.yy"
+#line 145 "../../../lib/srchilite/styleparser.yy"
     {
               (yyval.keylist) = new KeyList;
               (yyval.keylist)->push_back(*(yyvsp[(1) - (1)].string));
@@ -1594,133 +1598,133 @@
   case 12:
 
 /* Line 1455 of yacc.c  */
-#line 148 "../../../lib/srchilite/styleparser.yy"
+#line 152 "../../../lib/srchilite/styleparser.yy"
     { (yyval.string) = 0; }
     break;
 
   case 13:
 
 /* Line 1455 of yacc.c  */
-#line 149 "../../../lib/srchilite/styleparser.yy"
+#line 153 "../../../lib/srchilite/styleparser.yy"
     { (yyval.string) = (yyvsp[(1) - (1)].string);}
     break;
 
   case 14:
 
 /* Line 1455 of yacc.c  */
-#line 150 "../../../lib/srchilite/styleparser.yy"
+#line 154 "../../../lib/srchilite/styleparser.yy"
     { (yyval.string) = (yyvsp[(1) - (1)].string); }
     break;
 
   case 15:
 
 /* Line 1455 of yacc.c  */
-#line 153 "../../../lib/srchilite/styleparser.yy"
+#line 157 "../../../lib/srchilite/styleparser.yy"
     { (yyval.string) = 0; }
     break;
 
   case 16:
 
 /* Line 1455 of yacc.c  */
-#line 154 "../../../lib/srchilite/styleparser.yy"
+#line 158 "../../../lib/srchilite/styleparser.yy"
     { (yyval.string) = (yyvsp[(3) - (3)].string);}
     break;
 
   case 17:
 
 /* Line 1455 of yacc.c  */
-#line 155 "../../../lib/srchilite/styleparser.yy"
+#line 159 "../../../lib/srchilite/styleparser.yy"
     { (yyval.string) = (yyvsp[(3) - (3)].string); }
     break;
 
   case 18:
 
 /* Line 1455 of yacc.c  */
-#line 158 "../../../lib/srchilite/styleparser.yy"
+#line 162 "../../../lib/srchilite/styleparser.yy"
     { updateBgColor((yyvsp[(2) - (3)].string)); }
     break;
 
   case 19:
 
 /* Line 1455 of yacc.c  */
-#line 159 "../../../lib/srchilite/styleparser.yy"
+#line 163 "../../../lib/srchilite/styleparser.yy"
     { updateBgColor((yyvsp[(2) - (3)].string)); }
     break;
 
   case 20:
 
 /* Line 1455 of yacc.c  */
-#line 162 "../../../lib/srchilite/styleparser.yy"
+#line 166 "../../../lib/srchilite/styleparser.yy"
     { (yyval.styleconstants) = 0 ; }
     break;
 
   case 21:
 
 /* Line 1455 of yacc.c  */
-#line 163 "../../../lib/srchilite/styleparser.yy"
+#line 167 "../../../lib/srchilite/styleparser.yy"
     { (yyval.styleconstants) = (yyvsp[(1) - (1)].styleconstants); }
     break;
 
   case 22:
 
 /* Line 1455 of yacc.c  */
-#line 166 "../../../lib/srchilite/styleparser.yy"
+#line 170 "../../../lib/srchilite/styleparser.yy"
     { (yyval.styleconstants) = (yyvsp[(1) - (3)].styleconstants); (yyval.styleconstants)->push_back((yyvsp[(3) - (3)].flag)) ; }
     break;
 
   case 23:
 
 /* Line 1455 of yacc.c  */
-#line 167 "../../../lib/srchilite/styleparser.yy"
+#line 171 "../../../lib/srchilite/styleparser.yy"
     { (yyval.styleconstants) = new StyleConstants; (yyval.styleconstants)->push_back((yyvsp[(1) - (1)].flag)); }
     break;
 
   case 24:
 
 /* Line 1455 of yacc.c  */
-#line 170 "../../../lib/srchilite/styleparser.yy"
+#line 174 "../../../lib/srchilite/styleparser.yy"
     { (yyval.flag) = ISBOLD ; }
     break;
 
   case 25:
 
 /* Line 1455 of yacc.c  */
-#line 171 "../../../lib/srchilite/styleparser.yy"
+#line 175 "../../../lib/srchilite/styleparser.yy"
     { (yyval.flag) = ISITALIC ; }
     break;
 
   case 26:
 
 /* Line 1455 of yacc.c  */
-#line 172 "../../../lib/srchilite/styleparser.yy"
+#line 176 "../../../lib/srchilite/styleparser.yy"
     { (yyval.flag) = ISUNDERLINE ; }
     break;
 
   case 27:
 
 /* Line 1455 of yacc.c  */
-#line 173 "../../../lib/srchilite/styleparser.yy"
+#line 177 "../../../lib/srchilite/styleparser.yy"
     { (yyval.flag) = ISFIXED ; }
     break;
 
   case 28:
 
 /* Line 1455 of yacc.c  */
-#line 174 "../../../lib/srchilite/styleparser.yy"
+#line 178 "../../../lib/srchilite/styleparser.yy"
     { (yyval.flag) = ISNOTFIXED ; }
     break;
 
   case 29:
 
 /* Line 1455 of yacc.c  */
-#line 175 "../../../lib/srchilite/styleparser.yy"
+#line 179 "../../../lib/srchilite/styleparser.yy"
     { (yyval.flag) = ISNOREF ; }
     break;
 
 
 
 /* Line 1455 of yacc.c  */
-#line 1724 "../../../lib/srchilite/styleparser.cc"
+#line 1728 "../../../lib/srchilite/styleparser.cc"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1932,7 +1936,7 @@
 
 
 /* Line 1675 of yacc.c  */
-#line 178 "../../../lib/srchilite/styleparser.yy"
+#line 182 "../../../lib/srchilite/styleparser.yy"
 
 
 string current_file;
diff -Nru source-highlight-3.1.6/lib/srchilite/styleparser.h source-highlight-3.1.7/lib/srchilite/styleparser.h
--- source-highlight-3.1.6/lib/srchilite/styleparser.h	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/styleparser.h	2012-04-14 14:00:27.000000000 +0000
@@ -75,7 +75,7 @@
 {
 
 /* Line 1676 of yacc.c  */
-#line 62 "../../../lib/srchilite/styleparser.yy"
+#line 66 "../../../lib/srchilite/styleparser.yy"
 
   int tok ; /* command */
   const std::string * string ; /* string : id, ... */
diff -Nru source-highlight-3.1.6/lib/srchilite/styleparser.yy source-highlight-3.1.7/lib/srchilite/styleparser.yy
--- source-highlight-3.1.6/lib/srchilite/styleparser.yy	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/styleparser.yy	2012-04-14 13:56:36.000000000 +0000
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
diff -Nru source-highlight-3.1.6/lib/srchilite/stylescanner.cc source-highlight-3.1.7/lib/srchilite/stylescanner.cc
--- source-highlight-3.1.6/lib/srchilite/stylescanner.cc	2011-12-23 09:29:02.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stylescanner.cc	2012-04-14 14:00:27.000000000 +0000
@@ -577,6 +577,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "stylekey.h"
@@ -607,7 +611,7 @@
 static const std::string *flush_buffer();
 
 
-#line 611 "../../../lib/srchilite/stylescanner.cc"
+#line 615 "../../../lib/srchilite/stylescanner.cc"
 
 #define INITIAL 0
 #define COMMENT_STATE 1
@@ -796,10 +800,10 @@
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 66 "../../../lib/srchilite/stylescanner.ll"
+#line 70 "../../../lib/srchilite/stylescanner.ll"
 
 
-#line 803 "../../../lib/srchilite/stylescanner.cc"
+#line 807 "../../../lib/srchilite/stylescanner.cc"
 
 	if ( !(yy_init) )
 		{
@@ -884,143 +888,143 @@
 
 case 1:
 YY_RULE_SETUP
-#line 68 "../../../lib/srchilite/stylescanner.ll"
+#line 72 "../../../lib/srchilite/stylescanner.ll"
 {}
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 70 "../../../lib/srchilite/stylescanner.ll"
+#line 74 "../../../lib/srchilite/stylescanner.ll"
 {}
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 72 "../../../lib/srchilite/stylescanner.ll"
+#line 76 "../../../lib/srchilite/stylescanner.ll"
 { BEGIN(COMMENT_STATE); }
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 73 "../../../lib/srchilite/stylescanner.ll"
+#line 77 "../../../lib/srchilite/stylescanner.ll"
 {}
 	YY_BREAK
 case 5:
 /* rule 5 can match eol */
 YY_RULE_SETUP
-#line 74 "../../../lib/srchilite/stylescanner.ll"
+#line 78 "../../../lib/srchilite/stylescanner.ll"
 { ++line;  BEGIN(INITIAL); }
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 76 "../../../lib/srchilite/stylescanner.ll"
+#line 80 "../../../lib/srchilite/stylescanner.ll"
 { stylesc_lval.string = new std::string(stylesc_text) ; return COLOR ; }
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 78 "../../../lib/srchilite/stylescanner.ll"
+#line 82 "../../../lib/srchilite/stylescanner.ll"
 { return BODY_BG_COLOR ; }
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 80 "../../../lib/srchilite/stylescanner.ll"
+#line 84 "../../../lib/srchilite/stylescanner.ll"
 { return BG_T ; }
 	YY_BREAK
 case 9:
 YY_RULE_SETUP
-#line 82 "../../../lib/srchilite/stylescanner.ll"
+#line 86 "../../../lib/srchilite/stylescanner.ll"
 { stylesc_lval.flag = ISBOLD ; return BOLD ; }
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 83 "../../../lib/srchilite/stylescanner.ll"
+#line 87 "../../../lib/srchilite/stylescanner.ll"
 { stylesc_lval.flag = ISITALIC ; return ITALICS ; }
 	YY_BREAK
 case 11:
 YY_RULE_SETUP
-#line 84 "../../../lib/srchilite/stylescanner.ll"
+#line 88 "../../../lib/srchilite/stylescanner.ll"
 { stylesc_lval.flag = ISUNDERLINE ; return UNDERLINE ; }
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 85 "../../../lib/srchilite/stylescanner.ll"
+#line 89 "../../../lib/srchilite/stylescanner.ll"
 { stylesc_lval.flag = ISFIXED; return FIXED; }
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 86 "../../../lib/srchilite/stylescanner.ll"
+#line 90 "../../../lib/srchilite/stylescanner.ll"
 { stylesc_lval.flag = ISNOTFIXED; return NOTFIXED; }
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 87 "../../../lib/srchilite/stylescanner.ll"
+#line 91 "../../../lib/srchilite/stylescanner.ll"
 { stylesc_lval.flag = ISNOREF; return NOREF; }
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 89 "../../../lib/srchilite/stylescanner.ll"
+#line 93 "../../../lib/srchilite/stylescanner.ll"
 { return ',' ; }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 90 "../../../lib/srchilite/stylescanner.ll"
+#line 94 "../../../lib/srchilite/stylescanner.ll"
 { return ';' ; }
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 91 "../../../lib/srchilite/stylescanner.ll"
+#line 95 "../../../lib/srchilite/stylescanner.ll"
 { return ':' ; }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 93 "../../../lib/srchilite/stylescanner.ll"
+#line 97 "../../../lib/srchilite/stylescanner.ll"
 { stylesc_lval.string = new std::string(stylesc_text) ; return KEY ; }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 95 "../../../lib/srchilite/stylescanner.ll"
+#line 99 "../../../lib/srchilite/stylescanner.ll"
 { BEGIN(STRING_STATE); DEB("STRING_STATE"); buffer( stylesc_text ) ; }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 96 "../../../lib/srchilite/stylescanner.ll"
+#line 100 "../../../lib/srchilite/stylescanner.ll"
 {  buffer( stylesc_text ) ; }
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 97 "../../../lib/srchilite/stylescanner.ll"
+#line 101 "../../../lib/srchilite/stylescanner.ll"
 {  buffer( "\"" ) ; }
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 98 "../../../lib/srchilite/stylescanner.ll"
+#line 102 "../../../lib/srchilite/stylescanner.ll"
 { BEGIN(INITIAL) ; buffer( stylesc_text ) ; DEB("END STRING_STATE"); stylesc_lval.string = flush_buffer() ; return STRINGDEF; }
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 99 "../../../lib/srchilite/stylescanner.ll"
+#line 103 "../../../lib/srchilite/stylescanner.ll"
 {  buffer( stylesc_text ) ; }
 	YY_BREAK
 case 24:
 /* rule 24 can match eol */
 YY_RULE_SETUP
-#line 100 "../../../lib/srchilite/stylescanner.ll"
+#line 104 "../../../lib/srchilite/stylescanner.ll"
 {  buffer( "\n" ) ; }
 	YY_BREAK
 case 25:
 /* rule 25 can match eol */
 YY_RULE_SETUP
-#line 102 "../../../lib/srchilite/stylescanner.ll"
+#line 106 "../../../lib/srchilite/stylescanner.ll"
 { ++line ; }
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 104 "../../../lib/srchilite/stylescanner.ll"
+#line 108 "../../../lib/srchilite/stylescanner.ll"
 { /* anything else will generate a parsing error */ return stylesc_text[0] ; }
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 106 "../../../lib/srchilite/stylescanner.ll"
+#line 110 "../../../lib/srchilite/stylescanner.ll"
 ECHO;
 	YY_BREAK
-#line 1024 "../../../lib/srchilite/stylescanner.cc"
+#line 1028 "../../../lib/srchilite/stylescanner.cc"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(COMMENT_STATE):
 case YY_STATE_EOF(STRING_STATE):
@@ -2020,7 +2024,7 @@
 
 #define YYTABLES_NAME "yytables"
 
-#line 106 "../../../lib/srchilite/stylescanner.ll"
+#line 110 "../../../lib/srchilite/stylescanner.ll"
 
 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/stylescanner.ll source-highlight-3.1.7/lib/srchilite/stylescanner.ll
--- source-highlight-3.1.6/lib/srchilite/stylescanner.ll	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/stylescanner.ll	2012-04-14 13:56:41.000000000 +0000
@@ -18,6 +18,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "stylekey.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/substfun.cpp source-highlight-3.1.7/lib/srchilite/substfun.cpp
--- source-highlight-3.1.6/lib/srchilite/substfun.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/substfun.cpp	2012-04-14 13:54:15.000000000 +0000
@@ -7,6 +7,10 @@
  * Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "substfun.h"
 
 using namespace std;
diff -Nru source-highlight-3.1.6/lib/srchilite/textstylebuilder.cpp source-highlight-3.1.7/lib/srchilite/textstylebuilder.cpp
--- source-highlight-3.1.6/lib/srchilite/textstylebuilder.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/textstylebuilder.cpp	2012-04-14 13:54:24.000000000 +0000
@@ -9,6 +9,10 @@
  * Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "textstylebuilder.h"
 
 using namespace std;
diff -Nru source-highlight-3.1.6/lib/srchilite/textstyle.cpp source-highlight-3.1.7/lib/srchilite/textstyle.cpp
--- source-highlight-3.1.6/lib/srchilite/textstyle.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/textstyle.cpp	2012-04-14 13:54:19.000000000 +0000
@@ -7,6 +7,10 @@
  * Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "textstyle.h"
 #include 
 
diff -Nru source-highlight-3.1.6/lib/srchilite/textstyleformatter.cpp source-highlight-3.1.7/lib/srchilite/textstyleformatter.cpp
--- source-highlight-3.1.6/lib/srchilite/textstyleformatter.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/textstyleformatter.cpp	2012-04-14 13:54:32.000000000 +0000
@@ -5,6 +5,10 @@
  * Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "textstyleformatter.h"
 #include "bufferedoutput.h"
 #include "preformatter.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/textstyleformatterfactory.cpp source-highlight-3.1.7/lib/srchilite/textstyleformatterfactory.cpp
--- source-highlight-3.1.6/lib/srchilite/textstyleformatterfactory.cpp	2011-12-16 17:10:11.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/textstyleformatterfactory.cpp	2012-04-14 13:54:36.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "textstyleformatterfactory.h"
 #include "formattermanager.h"
 #include "textstylebuilder.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/utils.cpp source-highlight-3.1.7/lib/srchilite/utils.cpp
--- source-highlight-3.1.6/lib/srchilite/utils.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/utils.cpp	2012-04-14 13:54:43.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "utils.h"
 #include 
 #include       // old 
diff -Nru source-highlight-3.1.6/lib/srchilite/vardefinitions.cpp source-highlight-3.1.7/lib/srchilite/vardefinitions.cpp
--- source-highlight-3.1.6/lib/srchilite/vardefinitions.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/vardefinitions.cpp	2012-04-14 13:54:47.000000000 +0000
@@ -9,6 +9,11 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 //
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "vardefinitions.h"
 #include "stringdef.h"
 #include "tostringcollection.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/verbosity.cpp source-highlight-3.1.7/lib/srchilite/verbosity.cpp
--- source-highlight-3.1.6/lib/srchilite/verbosity.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/verbosity.cpp	2012-04-14 13:54:52.000000000 +0000
@@ -6,6 +6,10 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "verbosity.h"
 
 namespace srchilite {
diff -Nru source-highlight-3.1.6/lib/srchilite/versions.cpp source-highlight-3.1.7/lib/srchilite/versions.cpp
--- source-highlight-3.1.6/lib/srchilite/versions.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/versions.cpp	2012-04-14 13:54:56.000000000 +0000
@@ -6,6 +6,10 @@
  *  Copyright: See COPYING file that comes with this distribution
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "versions.h"
 
 #ifdef HAVE_CONFIG_H
diff -Nru source-highlight-3.1.6/lib/srchilite/wordtokenizer.cpp source-highlight-3.1.7/lib/srchilite/wordtokenizer.cpp
--- source-highlight-3.1.6/lib/srchilite/wordtokenizer.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/wordtokenizer.cpp	2012-04-14 13:55:00.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "wordtokenizer.h"
diff -Nru source-highlight-3.1.6/lib/srchilite/yywrap.c source-highlight-3.1.7/lib/srchilite/yywrap.c
--- source-highlight-3.1.6/lib/srchilite/yywrap.c	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/srchilite/yywrap.c	2012-04-14 13:55:05.000000000 +0000
@@ -8,6 +8,10 @@
   I don't know about lex; anyway this should worry only who implements.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 int
 yywrap()
 {
diff -Nru source-highlight-3.1.6/lib/tests/logformatter.cpp source-highlight-3.1.7/lib/tests/logformatter.cpp
--- source-highlight-3.1.6/lib/tests/logformatter.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/logformatter.cpp	2012-04-14 13:56:48.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "logformatter.h"
 #include "srchilite/formatterparams.h"
 
diff -Nru source-highlight-3.1.6/lib/tests/Makefile.am source-highlight-3.1.7/lib/tests/Makefile.am
--- source-highlight-3.1.6/lib/tests/Makefile.am	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/Makefile.am	2012-04-14 13:41:23.000000000 +0000
@@ -8,7 +8,11 @@
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/gl \
+	-I$(top_builddir)/gl \
+	-I$(top_srcdir)/src -I$(srcdir)/..
+	$(BOOST_CPPFLAGS)
 AM_LDFLAGS = $(BOOST_LDFLAGS) -no-install
 
 LDADD = $(top_builddir)/gl/libgnu.la $(LIBDIR)/libsource-highlight.la $(BOOST_REGEX_LIB)
@@ -16,8 +20,6 @@
 #LIBDIR = $(top_builddir)/lib/srchilite/
 LIBDIR = ../srchilite/
 
-INCLUDES = -I@top_srcdir@/src -I@srcdir@/..
-
 VALGRIND_TESTS = test_regexrules test_formatter_manager test_highlighter \
 	test_exception test_highlightbuilder test_buffered_output \
 	test_textstyle test_textgenerator test_textstyleformatter test_wordtokenizer test_linenum \
diff -Nru source-highlight-3.1.6/lib/tests/Makefile.in source-highlight-3.1.7/lib/tests/Makefile.in
--- source-highlight-3.1.6/lib/tests/Makefile.in	2011-12-23 09:28:31.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/Makefile.in	2012-05-09 17:49:57.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -928,13 +928,16 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/gl \
+	-I$(top_builddir)/gl \
+	-I$(top_srcdir)/src -I$(srcdir)/..
+
 AM_LDFLAGS = $(BOOST_LDFLAGS) -no-install
 LDADD = $(top_builddir)/gl/libgnu.la $(LIBDIR)/libsource-highlight.la $(BOOST_REGEX_LIB)
 
 #LIBDIR = $(top_builddir)/lib/srchilite/
 LIBDIR = ../srchilite/
-INCLUDES = -I@top_srcdir@/src -I@srcdir@/..
 VALGRIND_TESTS = test_regexrules test_formatter_manager \
 	test_highlighter test_exception test_highlightbuilder \
 	test_buffered_output test_textstyle test_textgenerator \
@@ -1058,109 +1061,109 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-test_buffered_output$(EXEEXT): $(test_buffered_output_OBJECTS) $(test_buffered_output_DEPENDENCIES) 
+test_buffered_output$(EXEEXT): $(test_buffered_output_OBJECTS) $(test_buffered_output_DEPENDENCIES) $(EXTRA_test_buffered_output_DEPENDENCIES) 
 	@rm -f test_buffered_output$(EXEEXT)
 	$(CXXLINK) $(test_buffered_output_OBJECTS) $(test_buffered_output_LDADD) $(LIBS)
-test_ctagscollector$(EXEEXT): $(test_ctagscollector_OBJECTS) $(test_ctagscollector_DEPENDENCIES) 
+test_ctagscollector$(EXEEXT): $(test_ctagscollector_OBJECTS) $(test_ctagscollector_DEPENDENCIES) $(EXTRA_test_ctagscollector_DEPENDENCIES) 
 	@rm -f test_ctagscollector$(EXEEXT)
 	$(test_ctagscollector_LINK) $(test_ctagscollector_OBJECTS) $(test_ctagscollector_LDADD) $(LIBS)
-test_ctagsformatter$(EXEEXT): $(test_ctagsformatter_OBJECTS) $(test_ctagsformatter_DEPENDENCIES) 
+test_ctagsformatter$(EXEEXT): $(test_ctagsformatter_OBJECTS) $(test_ctagsformatter_DEPENDENCIES) $(EXTRA_test_ctagsformatter_DEPENDENCIES) 
 	@rm -f test_ctagsformatter$(EXEEXT)
 	$(test_ctagsformatter_LINK) $(test_ctagsformatter_OBJECTS) $(test_ctagsformatter_LDADD) $(LIBS)
-test_ctagsmanager$(EXEEXT): $(test_ctagsmanager_OBJECTS) $(test_ctagsmanager_DEPENDENCIES) 
+test_ctagsmanager$(EXEEXT): $(test_ctagsmanager_OBJECTS) $(test_ctagsmanager_DEPENDENCIES) $(EXTRA_test_ctagsmanager_DEPENDENCIES) 
 	@rm -f test_ctagsmanager$(EXEEXT)
 	$(test_ctagsmanager_LINK) $(test_ctagsmanager_OBJECTS) $(test_ctagsmanager_LDADD) $(LIBS)
-test_debuglistener$(EXEEXT): $(test_debuglistener_OBJECTS) $(test_debuglistener_DEPENDENCIES) 
+test_debuglistener$(EXEEXT): $(test_debuglistener_OBJECTS) $(test_debuglistener_DEPENDENCIES) $(EXTRA_test_debuglistener_DEPENDENCIES) 
 	@rm -f test_debuglistener$(EXEEXT)
 	$(CXXLINK) $(test_debuglistener_OBJECTS) $(test_debuglistener_LDADD) $(LIBS)
-test_events$(EXEEXT): $(test_events_OBJECTS) $(test_events_DEPENDENCIES) 
+test_events$(EXEEXT): $(test_events_OBJECTS) $(test_events_DEPENDENCIES) $(EXTRA_test_events_DEPENDENCIES) 
 	@rm -f test_events$(EXEEXT)
 	$(CXXLINK) $(test_events_OBJECTS) $(test_events_LDADD) $(LIBS)
-test_exception$(EXEEXT): $(test_exception_OBJECTS) $(test_exception_DEPENDENCIES) 
+test_exception$(EXEEXT): $(test_exception_OBJECTS) $(test_exception_DEPENDENCIES) $(EXTRA_test_exception_DEPENDENCIES) 
 	@rm -f test_exception$(EXEEXT)
 	$(CXXLINK) $(test_exception_OBJECTS) $(test_exception_LDADD) $(LIBS)
-test_filenotfound$(EXEEXT): $(test_filenotfound_OBJECTS) $(test_filenotfound_DEPENDENCIES) 
+test_filenotfound$(EXEEXT): $(test_filenotfound_OBJECTS) $(test_filenotfound_DEPENDENCIES) $(EXTRA_test_filenotfound_DEPENDENCIES) 
 	@rm -f test_filenotfound$(EXEEXT)
 	$(test_filenotfound_LINK) $(test_filenotfound_OBJECTS) $(test_filenotfound_LDADD) $(LIBS)
-test_formatreferences$(EXEEXT): $(test_formatreferences_OBJECTS) $(test_formatreferences_DEPENDENCIES) 
+test_formatreferences$(EXEEXT): $(test_formatreferences_OBJECTS) $(test_formatreferences_DEPENDENCIES) $(EXTRA_test_formatreferences_DEPENDENCIES) 
 	@rm -f test_formatreferences$(EXEEXT)
 	$(test_formatreferences_LINK) $(test_formatreferences_OBJECTS) $(test_formatreferences_LDADD) $(LIBS)
-test_formatter_manager$(EXEEXT): $(test_formatter_manager_OBJECTS) $(test_formatter_manager_DEPENDENCIES) 
+test_formatter_manager$(EXEEXT): $(test_formatter_manager_OBJECTS) $(test_formatter_manager_DEPENDENCIES) $(EXTRA_test_formatter_manager_DEPENDENCIES) 
 	@rm -f test_formatter_manager$(EXEEXT)
 	$(CXXLINK) $(test_formatter_manager_OBJECTS) $(test_formatter_manager_LDADD) $(LIBS)
-test_highlightbuilder$(EXEEXT): $(test_highlightbuilder_OBJECTS) $(test_highlightbuilder_DEPENDENCIES) 
+test_highlightbuilder$(EXEEXT): $(test_highlightbuilder_OBJECTS) $(test_highlightbuilder_DEPENDENCIES) $(EXTRA_test_highlightbuilder_DEPENDENCIES) 
 	@rm -f test_highlightbuilder$(EXEEXT)
 	$(CXXLINK) $(test_highlightbuilder_OBJECTS) $(test_highlightbuilder_LDADD) $(LIBS)
-test_highlighter$(EXEEXT): $(test_highlighter_OBJECTS) $(test_highlighter_DEPENDENCIES) 
+test_highlighter$(EXEEXT): $(test_highlighter_OBJECTS) $(test_highlighter_DEPENDENCIES) $(EXTRA_test_highlighter_DEPENDENCIES) 
 	@rm -f test_highlighter$(EXEEXT)
 	$(CXXLINK) $(test_highlighter_OBJECTS) $(test_highlighter_LDADD) $(LIBS)
-test_instances$(EXEEXT): $(test_instances_OBJECTS) $(test_instances_DEPENDENCIES) 
+test_instances$(EXEEXT): $(test_instances_OBJECTS) $(test_instances_DEPENDENCIES) $(EXTRA_test_instances_DEPENDENCIES) 
 	@rm -f test_instances$(EXEEXT)
 	$(test_instances_LINK) $(test_instances_OBJECTS) $(test_instances_LDADD) $(LIBS)
-test_langdefmanager$(EXEEXT): $(test_langdefmanager_OBJECTS) $(test_langdefmanager_DEPENDENCIES) 
+test_langdefmanager$(EXEEXT): $(test_langdefmanager_OBJECTS) $(test_langdefmanager_DEPENDENCIES) $(EXTRA_test_langdefmanager_DEPENDENCIES) 
 	@rm -f test_langdefmanager$(EXEEXT)
 	$(test_langdefmanager_LINK) $(test_langdefmanager_OBJECTS) $(test_langdefmanager_LDADD) $(LIBS)
-test_langinfer$(EXEEXT): $(test_langinfer_OBJECTS) $(test_langinfer_DEPENDENCIES) 
+test_langinfer$(EXEEXT): $(test_langinfer_OBJECTS) $(test_langinfer_DEPENDENCIES) $(EXTRA_test_langinfer_DEPENDENCIES) 
 	@rm -f test_langinfer$(EXEEXT)
 	$(CXXLINK) $(test_langinfer_OBJECTS) $(test_langinfer_LDADD) $(LIBS)
-test_langmap$(EXEEXT): $(test_langmap_OBJECTS) $(test_langmap_DEPENDENCIES) 
+test_langmap$(EXEEXT): $(test_langmap_OBJECTS) $(test_langmap_DEPENDENCIES) $(EXTRA_test_langmap_DEPENDENCIES) 
 	@rm -f test_langmap$(EXEEXT)
 	$(test_langmap_LINK) $(test_langmap_OBJECTS) $(test_langmap_LDADD) $(LIBS)
-test_linenum$(EXEEXT): $(test_linenum_OBJECTS) $(test_linenum_DEPENDENCIES) 
+test_linenum$(EXEEXT): $(test_linenum_OBJECTS) $(test_linenum_DEPENDENCIES) $(EXTRA_test_linenum_DEPENDENCIES) 
 	@rm -f test_linenum$(EXEEXT)
 	$(CXXLINK) $(test_linenum_OBJECTS) $(test_linenum_LDADD) $(LIBS)
-test_lineranges$(EXEEXT): $(test_lineranges_OBJECTS) $(test_lineranges_DEPENDENCIES) 
+test_lineranges$(EXEEXT): $(test_lineranges_OBJECTS) $(test_lineranges_DEPENDENCIES) $(EXTRA_test_lineranges_DEPENDENCIES) 
 	@rm -f test_lineranges$(EXEEXT)
 	$(CXXLINK) $(test_lineranges_OBJECTS) $(test_lineranges_LDADD) $(LIBS)
-test_outlang_errors$(EXEEXT): $(test_outlang_errors_OBJECTS) $(test_outlang_errors_DEPENDENCIES) 
+test_outlang_errors$(EXEEXT): $(test_outlang_errors_OBJECTS) $(test_outlang_errors_DEPENDENCIES) $(EXTRA_test_outlang_errors_DEPENDENCIES) 
 	@rm -f test_outlang_errors$(EXEEXT)
 	$(test_outlang_errors_LINK) $(test_outlang_errors_OBJECTS) $(test_outlang_errors_LDADD) $(LIBS)
-test_outlangparser$(EXEEXT): $(test_outlangparser_OBJECTS) $(test_outlangparser_DEPENDENCIES) 
+test_outlangparser$(EXEEXT): $(test_outlangparser_OBJECTS) $(test_outlangparser_DEPENDENCIES) $(EXTRA_test_outlangparser_DEPENDENCIES) 
 	@rm -f test_outlangparser$(EXEEXT)
 	$(test_outlangparser_LINK) $(test_outlangparser_OBJECTS) $(test_outlangparser_LDADD) $(LIBS)
-test_regexpreprocessor$(EXEEXT): $(test_regexpreprocessor_OBJECTS) $(test_regexpreprocessor_DEPENDENCIES) 
+test_regexpreprocessor$(EXEEXT): $(test_regexpreprocessor_OBJECTS) $(test_regexpreprocessor_DEPENDENCIES) $(EXTRA_test_regexpreprocessor_DEPENDENCIES) 
 	@rm -f test_regexpreprocessor$(EXEEXT)
 	$(CXXLINK) $(test_regexpreprocessor_OBJECTS) $(test_regexpreprocessor_LDADD) $(LIBS)
-test_regexranges$(EXEEXT): $(test_regexranges_OBJECTS) $(test_regexranges_DEPENDENCIES) 
+test_regexranges$(EXEEXT): $(test_regexranges_OBJECTS) $(test_regexranges_DEPENDENCIES) $(EXTRA_test_regexranges_DEPENDENCIES) 
 	@rm -f test_regexranges$(EXEEXT)
 	$(CXXLINK) $(test_regexranges_OBJECTS) $(test_regexranges_LDADD) $(LIBS)
-test_regexrules$(EXEEXT): $(test_regexrules_OBJECTS) $(test_regexrules_DEPENDENCIES) 
+test_regexrules$(EXEEXT): $(test_regexrules_OBJECTS) $(test_regexrules_DEPENDENCIES) $(EXTRA_test_regexrules_DEPENDENCIES) 
 	@rm -f test_regexrules$(EXEEXT)
 	$(CXXLINK) $(test_regexrules_OBJECTS) $(test_regexrules_LDADD) $(LIBS)
-test_settings$(EXEEXT): $(test_settings_OBJECTS) $(test_settings_DEPENDENCIES) 
+test_settings$(EXEEXT): $(test_settings_OBJECTS) $(test_settings_DEPENDENCIES) $(EXTRA_test_settings_DEPENDENCIES) 
 	@rm -f test_settings$(EXEEXT)
 	$(test_settings_LINK) $(test_settings_OBJECTS) $(test_settings_LDADD) $(LIBS)
-test_sourcefilehighlighter$(EXEEXT): $(test_sourcefilehighlighter_OBJECTS) $(test_sourcefilehighlighter_DEPENDENCIES) 
+test_sourcefilehighlighter$(EXEEXT): $(test_sourcefilehighlighter_OBJECTS) $(test_sourcefilehighlighter_DEPENDENCIES) $(EXTRA_test_sourcefilehighlighter_DEPENDENCIES) 
 	@rm -f test_sourcefilehighlighter$(EXEEXT)
 	$(CXXLINK) $(test_sourcefilehighlighter_OBJECTS) $(test_sourcefilehighlighter_LDADD) $(LIBS)
-test_sourcehighlight$(EXEEXT): $(test_sourcehighlight_OBJECTS) $(test_sourcehighlight_DEPENDENCIES) 
+test_sourcehighlight$(EXEEXT): $(test_sourcehighlight_OBJECTS) $(test_sourcehighlight_DEPENDENCIES) $(EXTRA_test_sourcehighlight_DEPENDENCIES) 
 	@rm -f test_sourcehighlight$(EXEEXT)
 	$(test_sourcehighlight_LINK) $(test_sourcehighlight_OBJECTS) $(test_sourcehighlight_LDADD) $(LIBS)
-test_sourcehighlight_errors$(EXEEXT): $(test_sourcehighlight_errors_OBJECTS) $(test_sourcehighlight_errors_DEPENDENCIES) 
+test_sourcehighlight_errors$(EXEEXT): $(test_sourcehighlight_errors_OBJECTS) $(test_sourcehighlight_errors_DEPENDENCIES) $(EXTRA_test_sourcehighlight_errors_DEPENDENCIES) 
 	@rm -f test_sourcehighlight_errors$(EXEEXT)
 	$(test_sourcehighlight_errors_LINK) $(test_sourcehighlight_errors_OBJECTS) $(test_sourcehighlight_errors_LDADD) $(LIBS)
-test_style_errors$(EXEEXT): $(test_style_errors_OBJECTS) $(test_style_errors_DEPENDENCIES) 
+test_style_errors$(EXEEXT): $(test_style_errors_OBJECTS) $(test_style_errors_DEPENDENCIES) $(EXTRA_test_style_errors_DEPENDENCIES) 
 	@rm -f test_style_errors$(EXEEXT)
 	$(test_style_errors_LINK) $(test_style_errors_OBJECTS) $(test_style_errors_LDADD) $(LIBS)
-test_textgenerator$(EXEEXT): $(test_textgenerator_OBJECTS) $(test_textgenerator_DEPENDENCIES) 
+test_textgenerator$(EXEEXT): $(test_textgenerator_OBJECTS) $(test_textgenerator_DEPENDENCIES) $(EXTRA_test_textgenerator_DEPENDENCIES) 
 	@rm -f test_textgenerator$(EXEEXT)
 	$(CXXLINK) $(test_textgenerator_OBJECTS) $(test_textgenerator_LDADD) $(LIBS)
-test_textstyle$(EXEEXT): $(test_textstyle_OBJECTS) $(test_textstyle_DEPENDENCIES) 
+test_textstyle$(EXEEXT): $(test_textstyle_OBJECTS) $(test_textstyle_DEPENDENCIES) $(EXTRA_test_textstyle_DEPENDENCIES) 
 	@rm -f test_textstyle$(EXEEXT)
 	$(CXXLINK) $(test_textstyle_OBJECTS) $(test_textstyle_LDADD) $(LIBS)
-test_textstyleformatter$(EXEEXT): $(test_textstyleformatter_OBJECTS) $(test_textstyleformatter_DEPENDENCIES) 
+test_textstyleformatter$(EXEEXT): $(test_textstyleformatter_OBJECTS) $(test_textstyleformatter_DEPENDENCIES) $(EXTRA_test_textstyleformatter_DEPENDENCIES) 
 	@rm -f test_textstyleformatter$(EXEEXT)
 	$(CXXLINK) $(test_textstyleformatter_OBJECTS) $(test_textstyleformatter_LDADD) $(LIBS)
-test_textstyleformatterfactory$(EXEEXT): $(test_textstyleformatterfactory_OBJECTS) $(test_textstyleformatterfactory_DEPENDENCIES) 
+test_textstyleformatterfactory$(EXEEXT): $(test_textstyleformatterfactory_OBJECTS) $(test_textstyleformatterfactory_DEPENDENCIES) $(EXTRA_test_textstyleformatterfactory_DEPENDENCIES) 
 	@rm -f test_textstyleformatterfactory$(EXEEXT)
 	$(CXXLINK) $(test_textstyleformatterfactory_OBJECTS) $(test_textstyleformatterfactory_LDADD) $(LIBS)
-test_untabifier$(EXEEXT): $(test_untabifier_OBJECTS) $(test_untabifier_DEPENDENCIES) 
+test_untabifier$(EXEEXT): $(test_untabifier_OBJECTS) $(test_untabifier_DEPENDENCIES) $(EXTRA_test_untabifier_DEPENDENCIES) 
 	@rm -f test_untabifier$(EXEEXT)
 	$(CXXLINK) $(test_untabifier_OBJECTS) $(test_untabifier_LDADD) $(LIBS)
-test_utils$(EXEEXT): $(test_utils_OBJECTS) $(test_utils_DEPENDENCIES) 
+test_utils$(EXEEXT): $(test_utils_OBJECTS) $(test_utils_DEPENDENCIES) $(EXTRA_test_utils_DEPENDENCIES) 
 	@rm -f test_utils$(EXEEXT)
 	$(test_utils_LINK) $(test_utils_OBJECTS) $(test_utils_LDADD) $(LIBS)
-test_wordtokenizer$(EXEEXT): $(test_wordtokenizer_OBJECTS) $(test_wordtokenizer_DEPENDENCIES) 
+test_wordtokenizer$(EXEEXT): $(test_wordtokenizer_OBJECTS) $(test_wordtokenizer_DEPENDENCIES) $(EXTRA_test_wordtokenizer_DEPENDENCIES) 
 	@rm -f test_wordtokenizer$(EXEEXT)
 	$(CXXLINK) $(test_wordtokenizer_OBJECTS) $(test_wordtokenizer_LDADD) $(LIBS)
 
@@ -1592,14 +1595,15 @@
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
+	    col="$$grn"; \
 	  else \
-	    echo "$$red$$dashes"; \
+	    col="$$red"; \
 	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -1649,10 +1653,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1752,6 +1761,7 @@
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am
 
+	$(BOOST_CPPFLAGS)
 
 mytags: $(top_srcdir)/lib/srchilite/test_readtags_main.cpp
 	$(CTAGS) --excmd=n --fields=+n -o mytags $(top_srcdir)/lib/srchilite/test_readtags_main.cpp $(top_srcdir)/lib/srchilite/readtags.h
diff -Nru source-highlight-3.1.6/lib/tests/test_buffered_output_main.cpp source-highlight-3.1.7/lib/tests/test_buffered_output_main.cpp
--- source-highlight-3.1.6/lib/tests/test_buffered_output_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_buffered_output_main.cpp	2012-04-14 13:56:56.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/tests/test_ctagscollector_main.cpp source-highlight-3.1.7/lib/tests/test_ctagscollector_main.cpp
--- source-highlight-3.1.6/lib/tests/test_ctagscollector_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_ctagscollector_main.cpp	2012-04-14 13:57:05.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_ctagsformatter_main.cpp source-highlight-3.1.7/lib/tests/test_ctagsformatter_main.cpp
--- source-highlight-3.1.6/lib/tests/test_ctagsformatter_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_ctagsformatter_main.cpp	2012-04-14 13:57:11.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_ctagsmanager_main.cpp source-highlight-3.1.7/lib/tests/test_ctagsmanager_main.cpp
--- source-highlight-3.1.6/lib/tests/test_ctagsmanager_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_ctagsmanager_main.cpp	2012-04-14 13:57:14.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_debuglistener_main.cpp source-highlight-3.1.7/lib/tests/test_debuglistener_main.cpp
--- source-highlight-3.1.6/lib/tests/test_debuglistener_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_debuglistener_main.cpp	2012-04-14 13:57:17.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/sourcehighlighter.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_events_main.cpp source-highlight-3.1.7/lib/tests/test_events_main.cpp
--- source-highlight-3.1.6/lib/tests/test_events_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_events_main.cpp	2012-04-14 13:57:21.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/tests/test_exception_main.cpp source-highlight-3.1.7/lib/tests/test_exception_main.cpp
--- source-highlight-3.1.6/lib/tests/test_exception_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_exception_main.cpp	2012-04-14 13:57:24.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/highlightbuilderexception.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_filenotfound_main.cpp source-highlight-3.1.7/lib/tests/test_filenotfound_main.cpp
--- source-highlight-3.1.6/lib/tests/test_filenotfound_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_filenotfound_main.cpp	2012-04-14 13:57:29.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include 
diff -Nru source-highlight-3.1.6/lib/tests/test_formatreferences_main.cpp source-highlight-3.1.7/lib/tests/test_formatreferences_main.cpp
--- source-highlight-3.1.6/lib/tests/test_formatreferences_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_formatreferences_main.cpp	2012-04-14 13:57:32.000000000 +0000
@@ -1,5 +1,9 @@
 // tests for class TextStyle
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_formatter_manager_main.cpp source-highlight-3.1.7/lib/tests/test_formatter_manager_main.cpp
--- source-highlight-3.1.6/lib/tests/test_formatter_manager_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_formatter_manager_main.cpp	2012-04-14 13:57:36.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/formattermanager.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_highlightbuilder_main.cpp source-highlight-3.1.7/lib/tests/test_highlightbuilder_main.cpp
--- source-highlight-3.1.6/lib/tests/test_highlightbuilder_main.cpp	2011-12-26 10:57:09.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_highlightbuilder_main.cpp	2012-04-14 13:57:39.000000000 +0000
@@ -4,6 +4,10 @@
 // Copyright: See COPYING file that comes with this distribution
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/highlightstatebuilder.hpp"
diff -Nru source-highlight-3.1.6/lib/tests/test_highlighter_main.cpp source-highlight-3.1.7/lib/tests/test_highlighter_main.cpp
--- source-highlight-3.1.6/lib/tests/test_highlighter_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_highlighter_main.cpp	2012-04-14 13:57:42.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "logformatter.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_instances_main.cpp source-highlight-3.1.7/lib/tests/test_instances_main.cpp
--- source-highlight-3.1.6/lib/tests/test_instances_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_instances_main.cpp	2012-04-14 13:57:46.000000000 +0000
@@ -2,6 +2,10 @@
  * Tests for language inference, class LanguageInfer
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "srchilite/instances.h"
 #include "srchilite/langdefmanager.h"
 #include "srchilite/langmap.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_langdefmanager_main.cpp source-highlight-3.1.7/lib/tests/test_langdefmanager_main.cpp
--- source-highlight-3.1.6/lib/tests/test_langdefmanager_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_langdefmanager_main.cpp	2012-04-14 13:57:50.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/langdefmanager.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_langinfer_main.cpp source-highlight-3.1.7/lib/tests/test_langinfer_main.cpp
--- source-highlight-3.1.6/lib/tests/test_langinfer_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_langinfer_main.cpp	2012-04-14 13:57:55.000000000 +0000
@@ -2,6 +2,10 @@
  * Tests for language inference, class LanguageInfer
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "srchilite/languageinfer.h"
 #include 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_langmap_main.cpp source-highlight-3.1.7/lib/tests/test_langmap_main.cpp
--- source-highlight-3.1.6/lib/tests/test_langmap_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_langmap_main.cpp	2012-04-14 13:57:58.000000000 +0000
@@ -2,6 +2,10 @@
  * Tests for language inference, class LanguageInfer
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "srchilite/langmap.h"
 #include 
 #include 
diff -Nru source-highlight-3.1.6/lib/tests/test_linenum_main.cpp source-highlight-3.1.7/lib/tests/test_linenum_main.cpp
--- source-highlight-3.1.6/lib/tests/test_linenum_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_linenum_main.cpp	2012-04-14 13:58:03.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_lineranges_main.cpp source-highlight-3.1.7/lib/tests/test_lineranges_main.cpp
--- source-highlight-3.1.6/lib/tests/test_lineranges_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_lineranges_main.cpp	2012-04-14 13:58:06.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/tests/test_outlang_errors_main.cpp source-highlight-3.1.7/lib/tests/test_outlang_errors_main.cpp
--- source-highlight-3.1.6/lib/tests/test_outlang_errors_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_outlang_errors_main.cpp	2012-04-14 13:58:09.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/sourcehighlight.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_outlangparser_main.cpp source-highlight-3.1.7/lib/tests/test_outlangparser_main.cpp
--- source-highlight-3.1.6/lib/tests/test_outlangparser_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_outlangparser_main.cpp	2012-04-14 13:58:13.000000000 +0000
@@ -10,6 +10,10 @@
 //
 //
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/tests/test_regexpreprocessor_main.cpp source-highlight-3.1.7/lib/tests/test_regexpreprocessor_main.cpp
--- source-highlight-3.1.6/lib/tests/test_regexpreprocessor_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_regexpreprocessor_main.cpp	2012-04-14 13:58:21.000000000 +0000
@@ -23,6 +23,10 @@
  * This tests regex preprocessing
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
diff -Nru source-highlight-3.1.6/lib/tests/test_regexranges_main.cpp source-highlight-3.1.7/lib/tests/test_regexranges_main.cpp
--- source-highlight-3.1.6/lib/tests/test_regexranges_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_regexranges_main.cpp	2012-04-14 13:58:25.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/tests/test_regexrules_main.cpp source-highlight-3.1.7/lib/tests/test_regexrules_main.cpp
--- source-highlight-3.1.6/lib/tests/test_regexrules_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_regexrules_main.cpp	2012-04-14 13:58:32.000000000 +0000
@@ -1,5 +1,9 @@
 // tests for RegexHighlightRules
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
diff -Nru source-highlight-3.1.6/lib/tests/test_settings_main.cpp source-highlight-3.1.7/lib/tests/test_settings_main.cpp
--- source-highlight-3.1.6/lib/tests/test_settings_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_settings_main.cpp	2012-04-14 13:58:35.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/settings.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_sourcefilehighlighter_main.cpp source-highlight-3.1.7/lib/tests/test_sourcefilehighlighter_main.cpp
--- source-highlight-3.1.6/lib/tests/test_sourcefilehighlighter_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_sourcefilehighlighter_main.cpp	2012-04-14 13:58:38.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/sourcehighlighter.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_sourcehighlight_errors_main.cpp source-highlight-3.1.7/lib/tests/test_sourcehighlight_errors_main.cpp
--- source-highlight-3.1.6/lib/tests/test_sourcehighlight_errors_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_sourcehighlight_errors_main.cpp	2012-04-14 13:58:42.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/sourcehighlight.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_sourcehighlight_main.cpp source-highlight-3.1.7/lib/tests/test_sourcehighlight_main.cpp
--- source-highlight-3.1.6/lib/tests/test_sourcehighlight_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_sourcehighlight_main.cpp	2012-04-14 13:58:45.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/sourcehighlight.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_style_errors_main.cpp source-highlight-3.1.7/lib/tests/test_style_errors_main.cpp
--- source-highlight-3.1.6/lib/tests/test_style_errors_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_style_errors_main.cpp	2012-04-14 13:58:48.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/sourcehighlight.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_textgenerator_main.cpp source-highlight-3.1.7/lib/tests/test_textgenerator_main.cpp
--- source-highlight-3.1.6/lib/tests/test_textgenerator_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_textgenerator_main.cpp	2012-04-14 13:58:52.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "srchilite/textstyleformatter.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_textstyleformatterfactory_main.cpp source-highlight-3.1.7/lib/tests/test_textstyleformatterfactory_main.cpp
--- source-highlight-3.1.6/lib/tests/test_textstyleformatterfactory_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_textstyleformatterfactory_main.cpp	2012-04-14 13:59:02.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_textstyleformatter_main.cpp source-highlight-3.1.7/lib/tests/test_textstyleformatter_main.cpp
--- source-highlight-3.1.6/lib/tests/test_textstyleformatter_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_textstyleformatter_main.cpp	2012-04-14 13:58:59.000000000 +0000
@@ -1,5 +1,9 @@
 // tests for class TextStyle
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_textstyle_main.cpp source-highlight-3.1.7/lib/tests/test_textstyle_main.cpp
--- source-highlight-3.1.6/lib/tests/test_textstyle_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_textstyle_main.cpp	2012-04-14 13:58:55.000000000 +0000
@@ -1,5 +1,9 @@
 // tests for class TextStyle
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_untabifier_main.cpp source-highlight-3.1.7/lib/tests/test_untabifier_main.cpp
--- source-highlight-3.1.6/lib/tests/test_untabifier_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_untabifier_main.cpp	2012-04-14 13:59:05.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/lib/tests/test_utils_main.cpp source-highlight-3.1.7/lib/tests/test_utils_main.cpp
--- source-highlight-3.1.6/lib/tests/test_utils_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_utils_main.cpp	2012-04-14 13:59:09.000000000 +0000
@@ -2,6 +2,10 @@
  * Tests for SourceHighlightUtils
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "srchilite/sourcehighlightutils.h"
 #include 
 #include 
diff -Nru source-highlight-3.1.6/lib/tests/test_wordtokenizer_main.cpp source-highlight-3.1.7/lib/tests/test_wordtokenizer_main.cpp
--- source-highlight-3.1.6/lib/tests/test_wordtokenizer_main.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/lib/tests/test_wordtokenizer_main.cpp	2012-04-14 13:59:12.000000000 +0000
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 
 #include "asserttestexit.h"
diff -Nru source-highlight-3.1.6/m4/ltversion.m4 source-highlight-3.1.7/m4/ltversion.m4
--- source-highlight-3.1.6/m4/ltversion.m4	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/m4/ltversion.m4	2012-05-09 17:49:52.000000000 +0000
@@ -9,15 +9,15 @@
 
 # @configure_input@
 
-# serial 3293 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.4])
-m4_define([LT_PACKAGE_REVISION], [1.3293])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4'
-macro_revision='1.3293'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
diff -Nru source-highlight-3.1.6/m4/Makefile.in source-highlight-3.1.7/m4/Makefile.in
--- source-highlight-3.1.6/m4/Makefile.in	2011-12-23 09:28:31.000000000 +0000
+++ source-highlight-3.1.7/m4/Makefile.in	2012-05-09 17:49:57.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -882,10 +882,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru source-highlight-3.1.6/Makefile.in source-highlight-3.1.7/Makefile.in
--- source-highlight-3.1.6/Makefile.in	2011-12-23 09:28:31.000000000 +0000
+++ source-highlight-3.1.7/Makefile.in	2012-05-09 17:49:57.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -116,6 +116,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(bash_completiondir)" \
 	"$(DESTDIR)$(pkgconfigdir)" \
 	"$(DESTDIR)$(source_highlightdocdir)"
@@ -132,9 +138,11 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -163,6 +171,8 @@
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ABSOLUTEDATADIR = @ABSOLUTEDATADIR@
 ACLOCAL = @ACLOCAL@
@@ -708,7 +718,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -744,10 +754,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -789,9 +797,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(bash_completion_DATA)'; test -n "$(bash_completiondir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bash_completiondir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bash_completiondir)" && rm -f $$files
+	dir='$(DESTDIR)$(bash_completiondir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@@ -809,9 +815,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pkgconfigdir)'; $(am__uninstall_files_from_dir)
 install-source_highlightdocDATA: $(source_highlightdoc_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(source_highlightdocdir)" || $(MKDIR_P) "$(DESTDIR)$(source_highlightdocdir)"
@@ -829,9 +833,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(source_highlightdoc_DATA)'; test -n "$(source_highlightdocdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(source_highlightdocdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(source_highlightdocdir)" && rm -f $$files
+	dir='$(DESTDIR)$(source_highlightdocdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -1040,7 +1042,11 @@
 	$(am__remove_distdir)
 
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -1048,7 +1054,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -1079,6 +1085,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -1098,6 +1106,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -1126,8 +1135,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -1161,10 +1178,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1254,8 +1276,8 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
-	distcheck distclean distclean-generic distclean-hdr \
+	dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
+	dist-zip distcheck distclean distclean-generic distclean-hdr \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-bash_completionDATA install-data \
diff -Nru source-highlight-3.1.6/NEWS source-highlight-3.1.7/NEWS
--- source-highlight-3.1.6/NEWS	2011-12-26 10:41:07.000000000 +0000
+++ source-highlight-3.1.7/NEWS	2012-04-14 17:15:18.000000000 +0000
@@ -8,6 +8,17 @@
 
 Please send source-highlight bug reports to bug-source-highlight at gnu.org
 
+Version 3.1.7
+
+   * fixed compilation bugs in MacOsX systems (thanks to 
+     Trevor Spiteri)
+   * language definition for Lilypond (thanks to Federico Bruni)
+   * language definition for R statistics programming language
+   * language definition for ISLISP (thanks to Christian Jullien)
+   * improved Erlang definition file (thanks to Erik Søe Sørensen)
+   * new output format: ESC 256 ascii code (thanks to
+     Xavier-Emmanuel Vincent).
+
 Version 3.1.6
 
    * language definition file for T/Foswiki TML markup (thanks to
diff -Nru source-highlight-3.1.6/source-highlight.spec source-highlight-3.1.7/source-highlight.spec
--- source-highlight-3.1.6/source-highlight.spec	2011-12-24 10:24:34.000000000 +0000
+++ source-highlight-3.1.7/source-highlight.spec	2012-06-29 19:07:12.000000000 +0000
@@ -6,8 +6,8 @@
 
 Summary:   syntax highlighting for source documents
 Name:      source-highlight
-Version:   3.1.6
-Release:   3.1.6
+Version:   3.1.7
+Release:   3.1.7
 License:   GPL
 Group:     Utilities/Console
 Source:    ftp://ftp.gnu.org/gnu/source-highlight/%{name}-%{version}.tar.gz
diff -Nru source-highlight-3.1.6/src/check-regexp.cpp source-highlight-3.1.7/src/check-regexp.cpp
--- source-highlight-3.1.6/src/check-regexp.cpp	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/src/check-regexp.cpp	2012-04-14 13:59:25.000000000 +0000
@@ -48,6 +48,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 #include 
diff -Nru source-highlight-3.1.6/src/envmapper.c source-highlight-3.1.7/src/envmapper.c
--- source-highlight-3.1.6/src/envmapper.c	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/src/envmapper.c	2012-04-14 13:59:34.000000000 +0000
@@ -30,6 +30,11 @@
  * written by Robert Wetzel 
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+
 #include 
 #include 
 #include 
diff -Nru source-highlight-3.1.6/src/erlang.lang source-highlight-3.1.7/src/erlang.lang
--- source-highlight-3.1.6/src/erlang.lang	2011-12-16 17:10:12.000000000 +0000
+++ source-highlight-3.1.7/src/erlang.lang	2012-04-14 16:59:12.000000000 +0000
@@ -3,8 +3,26 @@
 # from: http://caolanmcmahon.com/erlang_syntax_highlighting
 # patched by Miklos Vajna
 # further modifications by Lorenzo Bettini
+# and even further by Erik Søe Sørensen
 
-keyword = "div|rem|or|xor|bor|bxor|bsl|bsr|and|band|not|bnot|abs|alive|apply|atom_to_list|binary_to_list|binary_to_term|concat_binary|date|disconnect_node|element|erase|exit|float|float_to_list|get|get_keys|group_leader|halt|hd|integer_to_list|is_alive|length|link|list_to_atom|list_to_binary|list_to_float|list_to_integer|list_to_pid|list_to_tuple|load_module|make_ref|monitor_node|node|nodes|now|open_port|pid_to_list|process_flag|process_info|process|put|register|registered|round|self|setelement|size|spawn|spawn_link|split_binary|statistics|term_to_binary|throw|time|tl|trunc|tuple_to_list|unlink|unregister|whereis|atom|binary|constant|function|integer|list|number|pid|ports|port_close|port_info|reference|record|check_process_code|delete_module|get_cookie|hash|math|module_loaded|preloaded|processes|purge_module|set_cookie|set_node|acos|asin|atan|atan2|cos|cosh|exp|log|log10|pi|pow|power|sin|sinh|sqrt|tan|tanh|call|module_info|parse_transform|undefined_function|error_handler|after|begin|case|catch|cond|end|fun|if|let|of|query|receive|when|creation|current_function|dictionary|group_leader|heap_size|high|initial_call|linked|low|memory_in_use|message_queue|net_kernel|node|normal|priority|reductions|registered_name|runnable|running|stack_trace|status|timer|trap_exit|waiting|command|count_in|count_out|creation|in|in_format|linked|node|out|owner|packeting|atom_tables|communicating|creation|current_gc|current_reductions|current_runtime|current_wall_clock|distribution_port|entry_points|error_handler|friends|garbage_collection|magic_cookie|magic_cookies|module_table|monitored_nodes|name|next_ref|ports|preloaded|processes|reductions|ref_state|registry|runtime|wall_clock|apply_lambda|module_info|module_lambdas|record|record_index|record_info|badarg|nocookie|false|fun|true|badsig|kill|killed|exit|normal"
+#==================== Keywords and other known names: ====================
+
+# Actual keywords:
+keyword = "after|and|andalso|band|begin|bnot|bor|bsl|bsr|bxor|case|catch|cond|div|end|fun|if|let|not|of|or|orelse|query|receive|rem|try|when|xor"
+
+# Built-in functions - type tests:
+predef_func = "is_atom|is_binary|is_bitstring|is_boolean|is_float|is_function|is_function|is_integer|is_list|is_number|is_pid|is_port|is_record|is_record|is_reference|is_tuple"
+
+# Built-in functions - other guard functions:
+predef_func = "abs|bit_size|byte_size|element|float|hd|length|node|node|round|self|size|tl|trunc|tuple_size"
+
+# Built-in functions - others:
+predef_func = '(?|>=|++|--|=|!|<-|->"
-symbol = ':|_|@|\\|\"|\.'
+symbol = ':|@|\\|\"|\.'
 
diff -Nru source-highlight-3.1.6/src/esc256.outlang source-highlight-3.1.7/src/esc256.outlang
--- source-highlight-3.1.6/src/esc256.outlang	1970-01-01 00:00:00.000000000 +0000
+++ source-highlight-3.1.7/src/esc256.outlang	2012-04-14 16:27:06.000000000 +0000
@@ -0,0 +1,53 @@
+extension "txt"
+
+styletemplate "\x1b[$stylem$text\x1b[m"
+color "00;38;05;$style"
+
+colormap
+"blue"    "75"
+"darkblue" "33"
+"gray"    "242"
+"green"   "70"
+"orange"  "208"
+"purple"  "171"
+"red"     "196"
+"white"   "255"
+"yellow"  "226"
+default   "255"
+end
+
+
+####################
+# Code color help
+#####################
+
+# 256 code color control template:
+# Code            : \033[AA;FF;BBm
+# AA (attributes) : 00|01|03|04|05|07|22|23|24|25|27
+# FF (foreground) : 38;05;color
+# BB (background) : 48;05;color
+# color           : 000-255
+
+# Attributes meaning
+# 00  Reset
+# 01  Bold
+# 03  Italic
+# 04  Underline
+# 05  Blink (doesn't work when a background is set)
+# 07  Reverse (swap foreground and background)
+# 22  No Bold
+# 23  No Italic
+# 24  No Underline
+# 25  No Blink
+# 27  No Reverse
+
+# Any of AA,FF,BB may be omited.
+# Reset code (default color/attribute): \033[m
+
+# Examples:
+# -> Hello world in color 226 (=> yellow):
+#    echo -e "\033[38;05;226mHello, World"
+# -> Hello world in bold blanking yellow:
+#    echo -e "\033[01;05;38;05;226mHello, World"
+# -> Hello world in bold yellow with a red background:
+#    echo -e "\033[01;38;05;226;48;05;196mHello, World"
diff -Nru source-highlight-3.1.6/src/esc256.style source-highlight-3.1.7/src/esc256.style
--- source-highlight-3.1.6/src/esc256.style	1970-01-01 00:00:00.000000000 +0000
+++ source-highlight-3.1.7/src/esc256.style	2012-04-14 16:03:29.000000000 +0000
@@ -0,0 +1,42 @@
+classname orange ;
+comment gray ;
+function blue;
+keyword purple ;
+preproc darkblue ;
+regexp orange ;
+string red ;
+todo yellow ;
+type green ;
+usertype orange ;
+variable green ;
+
+// diff files
+oldfile red ;
+newfile green ;
+difflines darkblue ;
+
+// ChangeLog and log files
+date blue ;
+file red ;
+ip orange ;
+name green ;
+time darkblue ;
+
+// line numbers
+linenum yellow ;
+
+// Internet related
+url blue ;
+
+// for css
+selector purple ;
+property blue ;
+value green ;
+
+// ===== Useless =====
+// cbracket
+// normal
+// number
+// specialchar
+// symbol
+// ====
diff -Nru source-highlight-3.1.6/src/islisp.lang source-highlight-3.1.7/src/islisp.lang
--- source-highlight-3.1.6/src/islisp.lang	1970-01-01 00:00:00.000000000 +0000
+++ source-highlight-3.1.7/src/islisp.lang	2012-04-14 17:11:57.000000000 +0000
@@ -0,0 +1,3 @@
+include "lisp.lang"
+
+redef (cbracket,keyword) = `(\()(and|assure|block|case|case-using|catch|class|cond|convert|defclass|defconstant|defdynamic|defgeneric|defglobal|defmacro|defmethod|defun|dynamic|dynamic-let|flet|for|function|go|if|ignore-errors|labels|lambda|let|or|progn|quote|return-from|setf|setq|tagbody|the|throw|unwind-protect|while|with-error-output|with-handler|with-open-input-file|with-open-io-file|with-open-output-file|with-standard-input|with-standard-output)`
diff -Nru source-highlight-3.1.6/src/lang.map source-highlight-3.1.7/src/lang.map
--- source-highlight-3.1.6/src/lang.map	2011-12-16 17:10:13.000000000 +0000
+++ source-highlight-3.1.7/src/lang.map	2012-04-14 17:13:57.000000000 +0000
@@ -124,6 +124,7 @@
 mf = manifest.lang
 asm = asm.lang
 s = asm.lang
+r = asm.lang
 applescript = applescript.lang
 scpt = applescript.lang
 vbscript = vbscript.lang
@@ -143,6 +144,7 @@
 vala = vala.lang
 lisp = lisp.lang
 el = lisp.lang
+islisp = islisp.lang
 scm = scheme.lang
 scheme = scheme.lang
 po = po.lang
@@ -150,4 +152,6 @@
 opa = opa.lang
 javalog = javalog.lang
 upc = upc.lang
-tml = tml.lang
\ No newline at end of file
+tml = tml.lang
+lilypond = lilypond.lang
+ly = lilypond.lang
\ No newline at end of file
diff -Nru source-highlight-3.1.6/src/lilypond.lang source-highlight-3.1.7/src/lilypond.lang
--- source-highlight-3.1.6/src/lilypond.lang	1970-01-01 00:00:00.000000000 +0000
+++ source-highlight-3.1.7/src/lilypond.lang	2012-04-14 14:29:06.000000000 +0000
@@ -0,0 +1,143 @@
+# LilyPond v2.16.0
+# Federico Bruni
+
+string delim "\"" "\"" multiline
+
+comment delim "%{" "%}" multiline nested
+comment start "%"
+
+# Scheme
+environment scheme delim '#\'?\(' ")" multiline nested begin
+  string delim "\"" "\"" multiline
+  comment start ";"
+  environment scheme delim "(" ")" multiline nested begin
+    string delim "\"" "\"" multiline
+    comment start ";"
+  end
+end
+
+vardef SCHEME_VALUE = '##(t|f)', '#{1,2}\'?[[:alnum:]\.:+-]+'
+scheme_value = $SCHEME_VALUE
+
+
+# Symbols
+vardef CBRACKET = "{|}|<<|>>"
+cbracket = $CBRACKET
+
+symbol = "(|)|~|^|_"
+dynamic = '\\(<|>|!|f{1,5}|p{1,5}|m(f|p)|fp|(r|s)fz|s(f|p){1,2})(?!\w)'
+
+# Numbers
+specialchar = '(?\*])(1|2|4|8|16|32|64|128)(\.+|\b)'
+value = '[[:digit:]/]+'
+
+# Markup commands (any \command inside \markup{})
+environment markup delim '\\markup\s*\{' "}" multiline nested begin
+  # definitions I want to preserve in this environment
+  cbracket = $CBRACKET
+  string delim "\"" "\"" multiline
+  comment delim "%{" "%}" multiline nested
+  comment start "%"
+  scheme_value = $SCHEME_VALUE
+  environment scheme delim '#\'?\(' ")" multiline nested begin
+    string delim "\"" "\"" multiline
+    comment start ";"
+    environment scheme delim "(" ")" multiline nested begin
+      string delim "\"" "\"" multiline
+      comment start ";"
+    end
+  end
+  # actual definition
+  markup_command = '\\[[:alpha:]-]+'
+
+  # needed for nested blocks inside \markup{}
+  environment markup delim "{" "}" multiline nested begin
+    cbracket = $CBRACKET
+    string delim "\"" "\"" multiline
+    comment delim "%{" "%}" multiline nested
+    comment start "%"
+    scheme_value = $SCHEME_VALUE
+    environment scheme delim '#\'?\(' ")" multiline nested begin
+      string delim "\"" "\"" multiline
+      comment start ";"
+      environment scheme delim "(" ")" multiline nested begin
+        string delim "\"" "\"" multiline
+        comment start ";"
+      end
+    end
+    markup_command = '\\[[:alpha:]-]+'
+  end
+end
+
+lyric_command = '\\(lyricmode|lyrics(to)?)'
+
+# Main commands
+preproc = '\\(book(part)?|context|consists|header|include|language|layout',
+    'midi|once|override(Property)?|paper|remove(WithTag)?',
+    'revert|score|(un)?set|version|with)\b'
+
+# Variables of music functions
+variable = '(alto|baritone|bass|french|mezzosoprano|percussion',
+    'soprano|subbass|tenor|treble|varbaritone',
+    'percent|tremolo|unfold|volta',
+    '\\(aeolian|dorian|ionian|lydian|locrian|minor|major|mixolydian|phrygian))\b'
+
+header_variable = 'arranger', 'breakbefore', 'composer', 'copyright', 'date',
+    'dedication', 'enteredby', 'filename', 'footer', 'instrument\b', 'lastupdated',
+    'maintainer(Email|Web)?', 'meter', 'moreInfo',
+    'mutopia(composer|instrument|opus|poet|title)?',
+    'opus', 'poet', 'piece', 'source(url)?', 'style', '(sub){0,2}title',
+    'tagline', 'texidoc'
+
+# Contexts
+# old regexp: '([A-Z][a-z]+){2,}' <-- too greedy, a list is better
+context = '\\?(ChoirStaff|ChordNames|CueVoice|Devnull|Drum(Staff|Voice)',
+    'Dynamics|FiguredBass|FretBoards|Global|GrandStaff',
+    'GregorianTranscription(Staff|Voice)|Lyrics|Mensural(Staff|Voice)',
+    'NoteNames|PianoStaff|RhythmicStaff|Score|Staff(Group)?',
+    'Tab(Staff|Voice)|Vaticana(Staff|Voice)|Voice)\b'
+
+# Layout objects
+layout_object = 'Accidental(Cautionary|Placement|Suggestion)?',
+    'Ambitus(Accidental|Line|NoteHead)?', 'Arpeggio', 'BalloonTextItem',
+    'Bar(Line|Number)?', 'BassFigure(Alignment(Positioning)?|Bracket|Continuation|Line)?',
+    'Beam', 'BendAfter', 'Break(AlignGroup|Alignment)?', 'BreathingSign',
+    'ChordName', 'Clef', 'Cluster(Spanner(Beacon)?)', 'CombineTextScript',
+    'Cue(Clef|EndClef)?', 'Custos', 'Dot(Column|s)?',
+    'Double(PercentRepeat(Counter)?|RepeatSlash)?',
+    'Dynamic(LineSpanner|Text|TextSpanner)?\b', 'Episema', 'Fingering', 'Flag',
+    'Footnote(Item|Spanner)', 'FretBoard', 'Glissando', 'GraceSpacing',
+    'Grid(Line|Point)', 'Hairpin', 'HorizontalBracket',
+    'Instrument(Name|Switch)', 'Key(Cancellation|Signature)',
+    'Laissez(VibrerTie(Column)?)', 'LedgerLineSpanner',
+    'LeftEdge', 'LigatureBracket',
+    'Lyric(Extender|Hyphen|Space|Text)', 'MeasureGrouping',
+    'MelodyItem', 'MensuralLigature', 'MetronomeMark',
+    'MultiMeasureRest(Number|Text)?', 'NonMusicalPaperColumn',
+    'Note(Collision|Column|Head|Name|Spacing)', 'OctavateEight',
+    'OttavaBracket', 'PaperColumn', 'ParenthesesItem',
+    'Percent(Repeat(Counter)?)', 'PhrasingSlur', 'PianoPedalBracket',
+    'RehearsalMark', 'Repeat(Slash|Tie(Column)?)', 'Rest(Collision)?',
+    'Script(Column|Row)?', 'Slur', 'Sostenuto(Pedal(LineSpanner)?)',
+    'SpacingSpanner', 'SpanBar', 'Staff(Grouper|Spacing|Symbol)',
+    'StanzaNumber', 'Stem(Tremolo)?', 'StringNumber', 'StrokeFinger',
+    'SustainPedal(LineSpanner)?',
+    'System(StartBar|StartBrace|StartBracket|StartSquare)?',
+    'TabNoteHead', 'Text(Script|Spanner)', 'Tie(Column)?', 'TimeSignature',
+    'TrillPitch(Accidental|Group|Head)', 'TrillSpanner',
+    'Tuplet(Bracket|Number)', 'UnaCordaPedal(LineSpanner)?',
+    'VaticanaLigature', 'Vertical(Alignment|AxisGroup)', 'VoiceFollower',
+    'VoltaBracket(Spanner)?'
+
+# Context properties
+context_property = '\b[a-z]+([A-Z]+[a-z]+)+',
+                   'ottavation|output|stanza|timing|tonic'
+
+# Layout properties
+layout_property = '\b[a-z]+(-[a-z]+)+', 'indent'
+
+# All the other commands (including variables defined by users).
+# It must be at the end, otherwise the other \command definitions are overwritten.
+function = '\\[[:alpha:]-]+'
+
diff -Nru source-highlight-3.1.6/src/lilypond.style source-highlight-3.1.7/src/lilypond.style
--- source-highlight-3.1.6/src/lilypond.style	1970-01-01 00:00:00.000000000 +0000
+++ source-highlight-3.1.7/src/lilypond.style	2012-04-14 14:41:10.000000000 +0000
@@ -0,0 +1,21 @@
+symbol "#C000C0" b ;
+cbracket, preproc black b ;
+dynamic "#FF8000" b ;
+
+string "#C20F0F" ;
+scheme, scheme_value "#A04900" ;
+comment gray i ;
+
+note_duration teal ;
+value "#808000" ;
+specialchar "#FF8000" ;
+
+function "#0000C0" b ;
+markup_command "#008000" ;
+lyric_command "#006000" b ;
+
+header_variable, variable blue ;
+context "#C000C0" b ;
+layout_object "#C000C0" ;
+context_property, layout_property blue ;
+
diff -Nru source-highlight-3.1.6/src/Makefile.am source-highlight-3.1.7/src/Makefile.am
--- source-highlight-3.1.6/src/Makefile.am	2011-12-26 10:41:56.000000000 +0000
+++ source-highlight-3.1.7/src/Makefile.am	2012-04-14 17:11:34.000000000 +0000
@@ -28,15 +28,14 @@
 
 #bin_PROGRAMS = check-regexp source-highlight
 bin_PROGRAMS = check-regexp source-highlight source-highlight-settings
-bin_SCRIPTS = java2html cpp2html src-hilite-lesspipe.sh
+bin_SCRIPTS = java2html cpp2html src-hilite-lesspipe.sh \
+	source-highlight-esc.sh
 
 EXTRA_PROGRAMS = source-highlight-cgi 
 
 SRCHILITE = $(top_builddir)/src/source-highlight$(EXEEXT)
 
-INCLUDES = -I@top_srcdir@/lib
-
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl -I$(top_srcdir)/lib $(BOOST_CPPFLAGS)
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 
 LDADD = $(top_builddir)/gl/libgnu.la
@@ -84,8 +83,9 @@
 texinfo.lang haskell.lang haskell_literate.lang \
 manifest.lang asm.lang todo.lang applescript.lang \
 vbscript.lang awk.lang bat.lang clipper.lang cobol.lang d.lang \
-errors.lang erlang.lang proto.lang vala.lang lisp.lang \
-scheme.lang po.lang opa.lang javalog.lang upc.lang tml.lang
+errors.lang erlang.lang proto.lang vala.lang lisp.lang islisp.lang \
+scheme.lang po.lang opa.lang javalog.lang upc.lang tml.lang \
+lilypond.lang
 
 LANGFILES_NOTTOCHECK= \
 tml_formatting_all.lang  tml_macrolinks.lang      tml_macrosdelayed2.lang \
@@ -96,6 +96,7 @@
 OUTLANGFILES = \
 css_common.outlang \
 esc.outlang \
+esc256.outlang \
 html_common.outlang \
 html_ref.outlang \
 html_notfixed.outlang \
@@ -117,7 +118,7 @@
 mediawiki.outlang
 
 
-STYLEFILES = texinfo.style esc.style
+STYLEFILES = texinfo.style esc.style esc256.style lilypond.style
 
 source_highlightdata_DATA = \
 $(LANGFILES) $(LANGFILES_NOTTOCHECK) $(OUTLANGFILES) \
diff -Nru source-highlight-3.1.6/src/Makefile.in source-highlight-3.1.7/src/Makefile.in
--- source-highlight-3.1.6/src/Makefile.in	2011-12-26 10:49:31.000000000 +0000
+++ source-highlight-3.1.7/src/Makefile.in	2012-05-09 17:49:57.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -53,8 +53,8 @@
 subdir = src
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/cpp2html.in \
-	$(srcdir)/java2html.in $(srcdir)/src-hilite-lesspipe.sh.in \
-	ylwrap
+	$(srcdir)/java2html.in $(srcdir)/source-highlight-esc.sh.in \
+	$(srcdir)/src-hilite-lesspipe.sh.in ylwrap
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/gl/m4/00gnulib.m4 \
 	$(top_srcdir)/gl/m4/ac_prog_doxygen.m4 \
@@ -84,7 +84,8 @@
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = java2html cpp2html src-hilite-lesspipe.sh
+CONFIG_CLEAN_FILES = java2html cpp2html src-hilite-lesspipe.sh \
+	source-highlight-esc.sh
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(source_highlightdatadir)"
@@ -131,6 +132,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 SCRIPTS = $(bin_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
@@ -679,10 +686,11 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUFFIXES = .ggo
-bin_SCRIPTS = java2html cpp2html src-hilite-lesspipe.sh
+bin_SCRIPTS = java2html cpp2html src-hilite-lesspipe.sh \
+	source-highlight-esc.sh
+
 SRCHILITE = $(top_builddir)/src/source-highlight$(EXEEXT)
-INCLUDES = -I@top_srcdir@/lib
-AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl $(BOOST_CPPFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl -I$(top_srcdir)/lib $(BOOST_CPPFLAGS)
 AM_LDFLAGS = $(BOOST_LDFLAGS)
 LDADD = $(top_builddir)/gl/libgnu.la
 source_highlight_LDADD = $(LDADD) $(top_builddir)/lib/srchilite/libsource-highlight.la
@@ -725,8 +733,9 @@
 texinfo.lang haskell.lang haskell_literate.lang \
 manifest.lang asm.lang todo.lang applescript.lang \
 vbscript.lang awk.lang bat.lang clipper.lang cobol.lang d.lang \
-errors.lang erlang.lang proto.lang vala.lang lisp.lang \
-scheme.lang po.lang opa.lang javalog.lang upc.lang tml.lang
+errors.lang erlang.lang proto.lang vala.lang lisp.lang islisp.lang \
+scheme.lang po.lang opa.lang javalog.lang upc.lang tml.lang \
+lilypond.lang
 
 LANGFILES_NOTTOCHECK = \
 tml_formatting_all.lang  tml_macrolinks.lang      tml_macrosdelayed2.lang \
@@ -737,6 +746,7 @@
 OUTLANGFILES = \
 css_common.outlang \
 esc.outlang \
+esc256.outlang \
 html_common.outlang \
 html_ref.outlang \
 html_notfixed.outlang \
@@ -757,7 +767,7 @@
 odf.outlang \
 mediawiki.outlang
 
-STYLEFILES = texinfo.style esc.style
+STYLEFILES = texinfo.style esc.style esc256.style lilypond.style
 source_highlightdata_DATA = \
 $(LANGFILES) $(LANGFILES_NOTTOCHECK) $(OUTLANGFILES) \
 $(STYLEFILES) \
@@ -808,6 +818,8 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 src-hilite-lesspipe.sh: $(top_builddir)/config.status $(srcdir)/src-hilite-lesspipe.sh.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+source-highlight-esc.sh: $(top_builddir)/config.status $(srcdir)/source-highlight-esc.sh.in
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -851,16 +863,16 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-check-regexp$(EXEEXT): $(check_regexp_OBJECTS) $(check_regexp_DEPENDENCIES) 
+check-regexp$(EXEEXT): $(check_regexp_OBJECTS) $(check_regexp_DEPENDENCIES) $(EXTRA_check_regexp_DEPENDENCIES) 
 	@rm -f check-regexp$(EXEEXT)
 	$(CXXLINK) $(check_regexp_OBJECTS) $(check_regexp_LDADD) $(LIBS)
-source-highlight$(EXEEXT): $(source_highlight_OBJECTS) $(source_highlight_DEPENDENCIES) 
+source-highlight$(EXEEXT): $(source_highlight_OBJECTS) $(source_highlight_DEPENDENCIES) $(EXTRA_source_highlight_DEPENDENCIES) 
 	@rm -f source-highlight$(EXEEXT)
 	$(CXXLINK) $(source_highlight_OBJECTS) $(source_highlight_LDADD) $(LIBS)
-source-highlight-cgi$(EXEEXT): $(source_highlight_cgi_OBJECTS) $(source_highlight_cgi_DEPENDENCIES) 
+source-highlight-cgi$(EXEEXT): $(source_highlight_cgi_OBJECTS) $(source_highlight_cgi_DEPENDENCIES) $(EXTRA_source_highlight_cgi_DEPENDENCIES) 
 	@rm -f source-highlight-cgi$(EXEEXT)
 	$(CXXLINK) $(source_highlight_cgi_OBJECTS) $(source_highlight_cgi_LDADD) $(LIBS)
-source-highlight-settings$(EXEEXT): $(source_highlight_settings_OBJECTS) $(source_highlight_settings_DEPENDENCIES) 
+source-highlight-settings$(EXEEXT): $(source_highlight_settings_OBJECTS) $(source_highlight_settings_DEPENDENCIES) $(EXTRA_source_highlight_settings_DEPENDENCIES) 
 	@rm -f source-highlight-settings$(EXEEXT)
 	$(CXXLINK) $(source_highlight_settings_OBJECTS) $(source_highlight_settings_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
@@ -894,9 +906,7 @@
 	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -997,9 +1007,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(source_highlightdata_DATA)'; test -n "$(source_highlightdatadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(source_highlightdatadir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(source_highlightdatadir)" && rm -f $$files
+	dir='$(DESTDIR)$(source_highlightdatadir)'; $(am__uninstall_files_from_dir)
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -1099,10 +1107,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru source-highlight-3.1.6/src/outlang.map source-highlight-3.1.7/src/outlang.map
--- source-highlight-3.1.6/src/outlang.map	2011-12-26 10:41:44.000000000 +0000
+++ source-highlight-3.1.7/src/outlang.map	2012-04-14 16:03:29.000000000 +0000
@@ -5,6 +5,7 @@
 xhtmltable = xhtmltable.outlang
 xhtml-css = xhtmlcss.outlang
 esc = esc.outlang
+esc256 = esc256.outlang
 latex = latex.outlang
 latexcolor = latexcolor.outlang
 texinfo = texinfo.outlang
diff -Nru source-highlight-3.1.6/src/source-highlight-esc.sh.in source-highlight-3.1.7/src/source-highlight-esc.sh.in
--- source-highlight-3.1.6/src/source-highlight-esc.sh.in	1970-01-01 00:00:00.000000000 +0000
+++ source-highlight-3.1.7/src/source-highlight-esc.sh.in	2012-04-14 16:46:09.000000000 +0000
@@ -0,0 +1,32 @@
+#!@SHELL@
+
+# Detect how many colors the terminal supports so source-highlight can
+# output in 256.
+
+# Copyright 2012 Xavier-Emmanuel VINCENT
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see .
+
+
+colors=$(tput colors)
+
+# /dev/tty doesn't support 256 colors => check $DISPLAY
+if [ "${colors}" -eq 256 -a -n "${DISPLAY}" ]
+then
+	NB="256"
+else
+	NB=""
+fi
+
+source-highlight --outlang-def=esc${NB}.outlang --style-file=esc${NB}.style -i "$@"
diff -Nru source-highlight-3.1.6/src/source-highlight-settings.cpp source-highlight-3.1.7/src/source-highlight-settings.cpp
--- source-highlight-3.1.6/src/source-highlight-settings.cpp	2011-12-16 17:10:13.000000000 +0000
+++ source-highlight-3.1.7/src/source-highlight-settings.cpp	2012-04-14 13:59:58.000000000 +0000
@@ -21,6 +21,10 @@
  * This program is part of GNU source-highlight
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include 
 #include 
 
@@ -28,8 +32,6 @@
 #include "srchilite/versions.h"
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
-
 // this is glib related so don't use it when compiling with qmake
 #include "progname.h"
 
diff -Nru source-highlight-3.1.6/tests/lang.list source-highlight-3.1.7/tests/lang.list
--- source-highlight-3.1.6/tests/lang.list	2011-12-16 17:10:13.000000000 +0000
+++ source-highlight-3.1.7/tests/lang.list	2012-04-14 17:14:33.000000000 +0000
@@ -55,6 +55,7 @@
 hx = haxe.lang
 in = makefile.lang
 ini = desktop.lang
+islisp = islisp.lang
 java = java.lang
 javalog = javalog.lang
 javascript = javascript.lang
@@ -72,12 +73,14 @@
 lex = flex.lang
 lgt = logtalk.lang
 lhs = haskell_literate.lang
+lilypond = lilypond.lang
 lisp = lisp.lang
 ll = flex.lang
 log = log.lang
 logtalk = logtalk.lang
 lsm = lsm.lang
 lua = lua.lang
+ly = lilypond.lang
 m4 = m4.lang
 makefile = makefile.lang
 manifest = manifest.lang
@@ -111,6 +114,7 @@
 ps = postscript.lang
 py = python.lang
 python = python.lang
+r = asm.lang
 rb = ruby.lang
 rc = xml.lang
 ruby = ruby.lang
diff -Nru source-highlight-3.1.6/tests/Makefile.am source-highlight-3.1.7/tests/Makefile.am
--- source-highlight-3.1.6/tests/Makefile.am	2011-12-26 10:44:58.000000000 +0000
+++ source-highlight-3.1.7/tests/Makefile.am	2012-04-14 14:46:07.000000000 +0000
@@ -321,7 +321,8 @@
 test.opa test.opa.html \
 test.javalog test.javalog.html \
 test.upc test.upc.html \
-test.tml test.tml.html
+test.tml test.tml.html \
+test.ly test.ly.html
 
 LINERANGE1EXE=$(JAVA2HTML) --line-range="12-18","29-34" --line-number
 LINERANGE2EXE=$(JAVA2HTML) --line-range="12-18","29-34" --line-number --range-context=3
@@ -457,6 +458,7 @@
 check_opa \
 check_javalog \
 check_upc \
+check_lilypond \
 check_tml \
 check-output-dir \
 check_stop \
@@ -873,6 +875,11 @@
 	@echo expect no output from diff
 	$(DIFF) $(srcdir)/test.upc.html test.upc.out.html
 
+check_lilypond:
+	$(PROGNAME) --style-file $(top_srcdir)/src/lilypond.style -i $(srcdir)/test.ly -o test.ly.out.html
+	@echo expect no output from diff
+	$(DIFF) $(srcdir)/test.ly.html test.ly.out.html
+
 check_tml:
 	$(PROGNAME_STD) -i $(srcdir)/test.tml -o test.tml.out.html
 	@echo expect no output from diff
diff -Nru source-highlight-3.1.6/tests/Makefile.in source-highlight-3.1.7/tests/Makefile.in
--- source-highlight-3.1.6/tests/Makefile.in	2011-12-26 10:49:39.000000000 +0000
+++ source-highlight-3.1.7/tests/Makefile.in	2012-05-09 17:49:57.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -110,6 +110,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(source_highlightdocdir)"
 DATA = $(source_highlightdoc_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -913,7 +919,8 @@
 test.opa test.opa.html \
 test.javalog test.javalog.html \
 test.upc test.upc.html \
-test.tml test.tml.html
+test.tml test.tml.html \
+test.ly test.ly.html
 
 LINERANGE1EXE = $(JAVA2HTML) --line-range="12-18","29-34" --line-number
 LINERANGE2EXE = $(JAVA2HTML) --line-range="12-18","29-34" --line-number --range-context=3
@@ -1018,9 +1025,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(source_highlightdoc_DATA)'; test -n "$(source_highlightdocdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(source_highlightdocdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(source_highlightdocdir)" && rm -f $$files
+	dir='$(DESTDIR)$(source_highlightdocdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -1233,10 +1238,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1425,6 +1435,7 @@
 check_opa \
 check_javalog \
 check_upc \
+check_lilypond \
 check_tml \
 check-output-dir \
 check_stop \
@@ -1841,6 +1852,11 @@
 	@echo expect no output from diff
 	$(DIFF) $(srcdir)/test.upc.html test.upc.out.html
 
+check_lilypond:
+	$(PROGNAME) --style-file $(top_srcdir)/src/lilypond.style -i $(srcdir)/test.ly -o test.ly.out.html
+	@echo expect no output from diff
+	$(DIFF) $(srcdir)/test.ly.html test.ly.out.html
+
 check_tml:
 	$(PROGNAME_STD) -i $(srcdir)/test.tml -o test.tml.out.html
 	@echo expect no output from diff
diff -Nru source-highlight-3.1.6/tests/outlang.list source-highlight-3.1.7/tests/outlang.list
--- source-highlight-3.1.6/tests/outlang.list	2011-12-26 10:53:54.000000000 +0000
+++ source-highlight-3.1.7/tests/outlang.list	2012-04-14 16:24:38.000000000 +0000
@@ -1,5 +1,6 @@
 docbook = docbook.outlang
 esc = esc.outlang
+esc256 = esc256.outlang
 html = html.outlang
 html-css = htmlcss.outlang
 htmltable = htmltable.outlang
diff -Nru source-highlight-3.1.6/tests/output_dir/Makefile.in source-highlight-3.1.7/tests/output_dir/Makefile.in
--- source-highlight-3.1.6/tests/output_dir/Makefile.in	2011-12-23 09:28:31.000000000 +0000
+++ source-highlight-3.1.7/tests/output_dir/Makefile.in	2012-05-09 17:49:57.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -684,10 +684,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru source-highlight-3.1.6/tests/test.erl.html source-highlight-3.1.7/tests/test.erl.html
--- source-highlight-3.1.6/tests/test.erl.html	2011-12-16 17:10:14.000000000 +0000
+++ source-highlight-3.1.7/tests/test.erl.html	2012-04-14 17:01:26.000000000 +0000
@@ -2,17 +2,17 @@
 by Lorenzo Bettini
 http://www.lorenzobettini.it
 http://www.gnu.org/software/src-highlite -->
-
        -module(sudoku).
+
        -module(sudoku).
 -author(vmiklos@frugalware.org).
--vsn('2009-11-10').
--compile(export_all).
+-vsn('2009-11-10').
+-compile(export_all).
 
 % Return the value of Fun or an empty list based on the value of If.
 % @spec fun_or_empty(If::bool(), Fun::fun() -> [any()]) -> Ret::[any()]
 % Ret = Fun() if If is true, [] otherwise.
-fun_or_empty(If, Fun) ->
-	case If of
-		true -> Fun();
+fun_or_empty(If, Fun) ->
+	case If of
+		true -> Fun();
 		_ -> []
 	end.
 
@@ -21,29 +21,29 @@
 % 	Ret::any()
 % Table is a flatten list of lists, M is the length of a row,
 % representing a matrix, Ret is the cell in the Ith row and Jth column.
-field(I, J, Table, M) ->
-	P = (I-1)*M+J,
-	case P > length(Table) of
-		true -> 0;
-		_ -> lists:nth((I-1)*M+J, Table)
+field(I, J, Table, M) ->
+	P = (I-1)*M+J,
+	case P > length(Table) of
+		true -> 0;
+		_ -> lists:nth((I-1)*M+J, Table)
 	end.
 
 % Return a cell from a field.
 % @spec field(I::integer(), J::integer(), Table::[[any()]]) ->
 % 	Ret::any()
 % Ret is the cell in the Ith row and Jth column of Table.
-field(I, J, Table) ->
-	lists:nth(J, lists:nth(I, Table)).
+field(I, J, Table) ->
+	lists:nth(J, lists:nth(I, Table)).
 
 
 % Round up.
 % @spec ceil(X::float()) -> Ret::integer().
 % Ret is the value of X, rounded up to an integer.
-ceil(X) ->
-	T = trunc(X),
-	case X - T == 0 of
-		true -> T;
-		false -> T + 1
+ceil(X) ->
+	T = trunc(X),
+	case X - T == 0 of
+		true -> T;
+		false -> T + 1
 	end.
 
 % This is the same as lists:seq(), but it returns an empty list if the
@@ -51,7 +51,7 @@
 % just with R13.
 % @spec seq(N::integer(), M::integer()) -> Ret::[integer()].
 seq(_, 0) -> [];
-seq(N, M) -> lists:seq(N, M).
+seq(N, M) -> lists:seq(N, M).
 
 % Finds possible values for a cell.
 % @spec possible({N::integer(), Rules::[[s | w | integer()]],
@@ -62,45 +62,45 @@
 % L is a partial solution.
 % Ret is a list of possible values for the next cell if the list of
 % already filled ones is L.
-possible(_P = {N, Rules, M, K}, L) ->
-	X = (length(L) rem M)+1,
-	Y = (length(L) div M)+1,
-	Ok = lists:seq(1, M),
-	R = field(Y, X, Rules),
-	Integers = [I || I <- R, is_integer(I)],
+possible(_P = {N, Rules, M, K}, L) ->
+	X = (length(L) rem M)+1,
+	Y = (length(L) div M)+1,
+	Ok = lists:seq(1, M),
+	R = field(Y, X, Rules),
+	Integers = [I || I <- R, is_integer(I)],
 	% first exclude values based on the s, w and integer info rules
 	% and the values of both the already filled list and the
 	% Rules matrix
-	Swdeny = lists:append([
-		fun_or_empty(X > 1 andalso lists:member(w, R),
-			fun() -> X1 = field(Y, X-1, L, M), Ok -- [X1+N, X1-N] end),
-		fun_or_empty(X > 1 andalso not lists:member(w, R),
-			fun() -> X1 = field(Y, X-1, L, M), [X1+N, X1-N] end),
-		fun_or_empty(Y > 1 andalso lists:member(s, field(Y-1, X, Rules)),
-			fun() -> Y1 = field(Y-1, X, L, M), Ok -- [Y1+N, Y1-N] end),
-		fun_or_empty(Y > 1 andalso not lists:member(s, field(Y-1, X, Rules)),
-			fun() -> Y1 = field(Y-1, X, L, M), [Y1+N, Y1-N] end),
-		fun_or_empty(length(Integers) > 0, fun() -> Ok -- Integers end)
+	Swdeny = lists:append([
+		fun_or_empty(X > 1 andalso lists:member(w, R),
+			fun() -> X1 = field(Y, X-1, L, M), Ok -- [X1+N, X1-N] end),
+		fun_or_empty(X > 1 andalso not lists:member(w, R),
+			fun() -> X1 = field(Y, X-1, L, M), [X1+N, X1-N] end),
+		fun_or_empty(Y > 1 andalso lists:member(s, field(Y-1, X, Rules)),
+			fun() -> Y1 = field(Y-1, X, L, M), Ok -- [Y1+N, Y1-N] end),
+		fun_or_empty(Y > 1 andalso not lists:member(s, field(Y-1, X, Rules)),
+			fun() -> Y1 = field(Y-1, X, L, M), [Y1+N, Y1-N] end),
+		fun_or_empty(length(Integers) > 0, fun() -> Ok -- Integers end)
 	]),
 	% these exclude values based on row / column rules and the
 	% values of the Rules matrix
-	Rulesdeny = case [I || I <- R, is_integer(I)] =:= [] of
-		true -> lists:append(
-				lists:nth(Y, Rules) ++ % row
-				[lists:nth(X, I) || I <- Rules] ++ % column
-				[field(I, J, Rules) || % subcell
-					J <- lists:seq((ceil(X / K) - 1)* K + 1, (ceil(X / K) - 1)* K + K),
-					I <- lists:seq((ceil(Y / K) - 1)* K + 1, (ceil(Y / K) - 1)* K + K)]
+	Rulesdeny = case [I || I <- R, is_integer(I)] =:= [] of
+		true -> lists:append(
+				lists:nth(Y, Rules) ++ % row
+				[lists:nth(X, I) || I <- Rules] ++ % column
+				[field(I, J, Rules) || % subcell
+					J <- lists:seq((ceil(X / K) - 1)* K + 1, (ceil(X / K) - 1)* K + K),
+					I <- lists:seq((ceil(Y / K) - 1)* K + 1, (ceil(Y / K) - 1)* K + K)]
 			);
 		_ -> []
 	end,
 	% these exclude values based on row, column and subcell rules,
 	% based on the already filled values
-	Rowdeny = lists:nthtail((length(L) div M)*M, L),
-	Coldeny = [lists:nth(M*(I-1)+X, L) || I <- seq(1, Y-1)],
-	Subdeny = [lists:nth((I-1)*M+J, L) ||
-		J <- lists:seq((ceil(X / K) - 1)* K + 1, (ceil(X / K) - 1)* K + K),
-		I <- lists:seq((ceil(Y / K) - 1)* K + 1, (ceil(Y / K) - 1)* K + K),
-		(I-1)*M+J < length(L)+1],
-	Ok -- lists:append([Swdeny, Rulesdeny, Rowdeny, Coldeny, Subdeny]).
+	Rowdeny = lists:nthtail((length(L) div M)*M, L),
+	Coldeny = [lists:nth(M*(I-1)+X, L) || I <- seq(1, Y-1)],
+	Subdeny = [lists:nth((I-1)*M+J, L) ||
+		J <- lists:seq((ceil(X / K) - 1)* K + 1, (ceil(X / K) - 1)* K + K),
+		I <- lists:seq((ceil(Y / K) - 1)* K + 1, (ceil(Y / K) - 1)* K + K),
+		(I-1)*M+J < length(L)+1],
+	Ok -- lists:append([Swdeny, Rulesdeny, Rowdeny, Coldeny, Subdeny]).
 
        
diff -Nru source-highlight-3.1.6/tests/test.ly source-highlight-3.1.7/tests/test.ly
--- source-highlight-3.1.6/tests/test.ly	1970-01-01 00:00:00.000000000 +0000
+++ source-highlight-3.1.7/tests/test.ly	2012-04-14 14:43:32.000000000 +0000
@@ -0,0 +1,109 @@
+\version "2.14.2"
+
+#(define (naturalize-pitch p)
+  "Strings should be read"
+   (let ((o (ly:pitch-octave p))
+         (a (* 4 (ly:pitch-alteration p)))
+         ;; alteration, a, in quarter tone steps,
+         ;; for historical reasons
+         (n (ly:pitch-notename p)))
+     (cond
+      ((and (> a 1) (or (eq? n 6) (eq? n 2)))
+       (set! a (- a 2))
+       (set! n (+ n 1)))
+      ((and (< a -1) (or (eq? n 0) (eq? n 3)))
+       (set! a (+ a 2))
+       (set! n (- n 1))))
+     (cond
+      ((> a 2) (set! a (- a 4)) (set! n (+ n 1)))
+      ((< a -2) (set! a (+ a 4)) (set! n (- n 1))))
+     (if (< n 0) (begin (set! o (- o 1)) (set! n (+ n 7))))
+     (if (> n 6) (begin (set! o (+ o 1)) (set! n (- n 7))))
+     (ly:make-pitch o n (/ a 4))))
+
+\header {
+  title = "Maple Leaf Rag"
+  composer = "Scott Joplin"
+  piece = "Tempo di marcia"
+  tagline =
+    \markup {
+      \override #'(box-padding . 1.0) \override #'(baseline-skip . 2.7) \box
+      \center-column {
+        \small \line { Sheet music from \with-url #"http://www.MutopiaProject.org"
+          \line { \teeny www. \hspace #-0.5 MutopiaProject \hspace #-0.5 \teeny .org \hspace #0.5 } 
+        }
+      }
+    }
+}
+
+\paper {
+  top-margin = 15
+  ragged-right = ##t
+  system-system-spacing #'padding = #8
+  score-system-spacing =
+    #'((basic-distance . 12)
+       (minimum-distance . 6)
+       (padding . 1)
+       (stretchability . 12))
+}
+
+top =  \relative c' {
+ \override TextScript   #'padding = #2
+ 
+ \key as \major
+ \time 2/4
+ \clef treble
+ \partial 8
+ r8 \f |
+ \repeat volta 2 {
+  r16 as'  as, c 8 g,16 |
+  16 g, bes  ~ 4 |
+  r16 as,  as, c 8 g,16 |
+  16 g, bes  ~ 8 r16  |
+  r16 as, ces  r16  r16  |
+  r16 as, ces  r16  r8 |
+  \change Staff = "down"
+   \stemUp r16^\p as,,,-( ces as'-) r as-( ces as'-) \stemNeutral |
+  \change Staff = "up"
+  r16 as-( ces as'-) r as-( ces as'-) |
+  }
+}
+
+bottom =  \relative c {
+ \key as \major
+ \time 2/4
+ \clef bass
+ \partial 8
+ 8 |
+ \repeat volta 2 {
+      |
+      |
+      |
+      |
+  4 8  |
+  4 8 r |
+  \stemDown as,, r as' r \stemNeutral |
+  as' r as' r \clef treble |
+  }
+}
+
+\score {
+  \context PianoStaff <<
+  \context Staff = "up"
+   \applyMusic #unfold-repeats \top 
+  \context Staff = "down"
+   \applyMusic #unfold-repeats \bottom
+ >>
+ 
+  \midi {
+    \context {
+      \Score tempoWholesPerMinute = #(ly:make-moment 120 4)
+    }
+    \context {
+      \Voice
+      \remove Dynamic_performer
+    }
+  }
+  \layout{}
+}
+
diff -Nru source-highlight-3.1.6/tests/test.ly.html source-highlight-3.1.7/tests/test.ly.html
--- source-highlight-3.1.6/tests/test.ly.html	1970-01-01 00:00:00.000000000 +0000
+++ source-highlight-3.1.7/tests/test.ly.html	2012-04-14 15:05:13.000000000 +0000
@@ -0,0 +1,114 @@
+
+
        \version "2.14.2"
+
+#(define (naturalize-pitch p)
+  "Strings should be read"
+   (let ((o (ly:pitch-octave p))
+         (a (* 4 (ly:pitch-alteration p)))
+         ;; alteration, a, in quarter tone steps,
+         ;; for historical reasons
+         (n (ly:pitch-notename p)))
+     (cond
+      ((and (> a 1) (or (eq? n 6) (eq? n 2)))
+       (set! a (- a 2))
+       (set! n (+ n 1)))
+      ((and (< a -1) (or (eq? n 0) (eq? n 3)))
+       (set! a (+ a 2))
+       (set! n (- n 1))))
+     (cond
+      ((> a 2) (set! a (- a 4)) (set! n (+ n 1)))
+      ((< a -2) (set! a (+ a 4)) (set! n (- n 1))))
+     (if (< n 0) (begin (set! o (- o 1)) (set! n (+ n 7))))
+     (if (> n 6) (begin (set! o (+ o 1)) (set! n (- n 7))))
+     (ly:make-pitch o n (/ a 4))))
+
+\header {
+  title = "Maple Leaf Rag"
+  composer = "Scott Joplin"
+  piece = "Tempo di marcia"
+  tagline =
+    \markup {
+      \override #'(box-padding . 1.0) \override #'(baseline-skip . 2.7) \box
+      \center-column {
+        \small \line { Sheet music from \with-url #"http://www.MutopiaProject.org"
+          \line { \teeny www. \hspace #-0.5 MutopiaProject \hspace #-0.5 \teeny .org \hspace #0.5 } 
+        }
+      }
+    }
+}
+
+\paper {
+  top-margin = 15
+  ragged-right = ##t
+  system-system-spacing #'padding = #8
+  score-system-spacing =
+    #'((basic-distance . 12)
+       (minimum-distance . 6)
+       (padding . 1)
+       (stretchability . 12))
+}
+
+top =  \relative c' {
+ \override TextScript   #'padding = #2
+ 
+ \key as \major
+ \time 2/4
+ \clef treble
+ \partial 8
+ r8 \f |
+ \repeat volta 2 {
+  r16 as' <es' es,> as, c <es es,>8 g,16 |
+  <es' es,>16 g, bes <es es,> ~ <es es,>4 |
+  r16 as, <es' es,> as, c <es es,>8 g,16 |
+  <es' es,>16 g, bes <es es,> ~ <es es,>8 r16 <es es,> |
+  r16 as, ces <fes fes,> r16 <es es,> r16 <es es,> |
+  r16 as, ces <fes fes,> r16 <es es,> r8 |
+  \change Staff = "down"
+   \stemUp r16^\p as,,,-( ces as'-) r as-( ces as'-) \stemNeutral |
+  \change Staff = "up"
+  r16 as-( ces as'-) r as-( ces as'-) |
+  }
+}
+
+bottom =  \relative c {
+ \key as \major
+ \time 2/4
+ \clef bass
+ \partial 8
+ <es es,>8 |
+ \repeat volta 2 {
+  <as as,> <c as es> <c as es> <a a,> |
+  <bes bes,> <des g, es> <des g, es> <es, es,> |
+  <as as,> <c as es> <c as es> <a a,> |
+  <bes bes,> <des g, es> <des g, es> <es, es,> |
+  <fes fes,>4 <es es,>8 <es es,> |
+  <fes fes,>4 <es es,>8 r |
+  \stemDown as,, r as' r \stemNeutral |
+  as' r as' r \clef treble |
+  }
+}
+
+\score {
+  \context PianoStaff <<
+  \context Staff = "up"
+   \applyMusic #unfold-repeats \top 
+  \context Staff = "down"
+   \applyMusic #unfold-repeats \bottom
+ >>
+ 
+  \midi {
+    \context {
+      \Score tempoWholesPerMinute = #(ly:make-moment 120 4)
+    }
+    \context {
+      \Voice
+      \remove Dynamic_performer
+    }
+  }
+  \layout{}
+}
+
+
        
diff -Nru source-highlight-3.1.6/THANKS source-highlight-3.1.7/THANKS
--- source-highlight-3.1.6/THANKS	2011-12-26 10:40:40.000000000 +0000
+++ source-highlight-3.1.7/THANKS	2012-04-14 17:15:32.000000000 +0000
@@ -33,7 +33,7 @@
 Robert J. Clark
 John Constantine
 Marco Costalba
-Marc C�t�
+Marc Côté
 Marcus G. Daniels
 John E. Davis
 Maxim Dementiev
@@ -50,7 +50,7 @@
 Martin Gebert
 Grant McLean
 Josh Ghiloni
-Pierre-Fran�ois Giraud
+Pierre-François Giraud
 Jackie Goodwin
 Nathaniel Gray
 Paul W. Harvey
@@ -63,6 +63,7 @@
 Dirk Jagdmann
 Kristoforos Joanidis
 Peter Johansson
+Christian Jullien
 Manuel Kauers
 Ed Kelly
 Britton Kerin
@@ -82,7 +83,7 @@
 Hayato Mikami
 Horacio Montenegro
 Paulo Moura
-Tim M�ller
+Tim Müller
 Tiziano Muller
 Hugh S. Myers
 Noritsugu Nakamura
@@ -114,6 +115,8 @@
 Viraj Sinha
 Abe Skolnik
 Joel Smith
+Erik Søe Sørensen
+Trevor Spiteri
 Don Stauffer
 Danijel Tasov
 Jan Tatarik
diff -Nru source-highlight-3.1.6/TODO.txt source-highlight-3.1.7/TODO.txt
--- source-highlight-3.1.6/TODO.txt	2011-12-16 17:10:08.000000000 +0000
+++ source-highlight-3.1.7/TODO.txt	2012-06-30 12:15:11.000000000 +0000
@@ -144,4 +144,4 @@
 remember to update the version and library version in
 defines.pri
 
-include config.h in all source files to deal with gnulib?
+remember to update the version in .directive