* integrated java+lisp support patch (EXPERIMENTAL)

9 files changed, 449 insertions, 96 deletions

diff --git a/configure b/configure
index 00d36ee..2111851 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for idutils 4.1rc3.
+# Generated by GNU Autoconf 2.59 for idutils 4.1rc4.
 #
 # Report bugs to <bug-idutils@gnu.org>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='idutils'
 PACKAGE_TARNAME='idutils'
-PACKAGE_VERSION='4.1rc3'
-PACKAGE_STRING='idutils 4.1rc3'
+PACKAGE_VERSION='4.1rc4'
+PACKAGE_STRING='idutils 4.1rc4'
 PACKAGE_BUGREPORT='bug-idutils@gnu.org'
 
 ac_unique_file="config.h.in"
@@ -790,7 +790,7 @@ if test "$ac_init_help" = "long"; then
   # 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 idutils 4.1rc3 to adapt to many kinds of systems.
+\`configure' configures idutils 4.1rc4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -856,7 +856,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of idutils 4.1rc3:";;
+     short | recursive ) echo "Configuration of idutils 4.1rc4:";;
    esac
   cat <<\_ACEOF
 
@@ -997,7 +997,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-idutils configure 4.1rc3
+idutils configure 4.1rc4
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1011,7 +1011,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by idutils $as_me 4.1rc3, which was
+It was created by idutils $as_me 4.1rc4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1673,7 +1673,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='idutils'
- VERSION='4.1rc3'
+ VERSION='4.1rc4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18854,7 +18854,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by idutils $as_me 4.1rc3, which was
+This file was extended by idutils $as_me 4.1rc4, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18917,7 +18917,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-idutils config.status 4.1rc3
+idutils config.status 4.1rc4
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index bdaf62a..2f0b131 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([idutils], [4.1rc3], [bug-idutils@gnu.org])
+AC_INIT([idutils], [4.1rc4], [bug-idutils@gnu.org])
 AC_GNU_SOURCE
 
 AM_INIT_AUTOMAKE
diff --git a/doc/version.texi b/doc/version.texi
index 5dcd64f..4c3bcdf 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 6 January 2006
 @set UPDATED-MONTH January 2006
-@set EDITION 4.1rc3
-@set VERSION 4.1rc3
+@set EDITION 4.1rc4
+@set VERSION 4.1rc4
diff --git a/libidu/id-lang.map b/libidu/id-lang.map
index 00a55a7..7edb860 100644
--- a/libidu/id-lang.map
+++ b/libidu/id-lang.map
@@ -52,6 +52,8 @@
 *.cpp			C++
 *.cxx			C++
 
+*.java			Java
+
 ChangeLog*		Cdoc
 
 *.[sS]			asm --comment=;
@@ -71,7 +73,10 @@ ChangeLog*		Cdoc
 # portable object (i18n)
 *.po			po
 
-*.el			elisp
+*.el			lisp
+*.elc			lisp
+*.lisp			lisp
+*.scm			lisp
 
 *.am			make
 Makefile		make
diff --git a/libidu/scanners.c b/libidu/scanners.c
index 3ede033..07255cc 100644
--- a/libidu/scanners.c
+++ b/libidu/scanners.c
@@ -55,6 +55,7 @@ static struct token *get_token_c (FILE *in_FILE, void const *args, int *flags);
 static void *parse_args_c (char **argv, int argc);
 static void help_me_c (void);
 static void help_me_cpp (void);
+static void help_me_java (void);
 
 static struct token *get_token_asm (FILE *in_FILE, void const *args, int *flags);
 static void *parse_args_asm (char **argv, int argc);
@@ -68,14 +69,19 @@ static struct token *get_token_perl (FILE *in_FILE, void const *args, int *flags
 static void *parse_args_perl (char **argv, int argc);
 static void help_me_perl (void);
 
+static struct token *get_token_lisp (FILE *in_FILE, void const *args, int *flags);
+static void *parse_args_lisp (char **argv, int argc);
+static void help_me_lisp (void);
 
 struct language languages_0[] =
 {
   { "C", parse_args_c, get_token_c, help_me_c },
   { "C++", parse_args_c, get_token_c, help_me_cpp },
+  { "Java", parse_args_c, get_token_c, help_me_java },
   { "asm", parse_args_asm, get_token_asm, help_me_asm },
   { "text", parse_args_text, get_token_text, help_me_text },
-  { "perl", parse_args_perl, get_token_perl, help_me_perl }
+  { "perl", parse_args_perl, get_token_perl, help_me_perl },
+  { "lisp", parse_args_lisp, get_token_lisp, help_me_lisp }
 };
 struct language const *languages_N = &languages_0[cardinalityof (languages_0)];
 
@@ -327,8 +333,11 @@ clear_ushort_ctype (unsigned short *ctype, char const *chars, int type)
 static void
 set_uchar_ctype (unsigned char *ctype, char const *chars, int type)
 {
-  unsigned char *rct = &ctype[1];
-  unsigned char const *uc = (unsigned char const *) chars;
+  unsigned char *rct; 
+  unsigned char const *uc; 
+
+  rct = &ctype[1];
+  uc = (unsigned char const *) chars;
 
   while (*uc)
     rct[*uc++] |= type;
@@ -337,18 +346,21 @@ set_uchar_ctype (unsigned char *ctype, char const *chars, int type)
 static void
 clear_uchar_ctype (unsigned char *ctype, char const *chars, int type)
 {
-  unsigned char *rct = &ctype[1];
-  unsigned char const *uc = (unsigned char const *) chars;
+  unsigned char *rct;
+  unsigned char const *uc;
+
+  rct = &ctype[1];
+  uc = (unsigned char const *) chars;
 
   while (*uc)
     rct[*uc++] &= ~type;
 }
 
-/*************** C & C++ ****************************************************/
+/*************** C, C++ & Java ***********************************************/
 
 #define I1	0x0001		/* 1st char of an identifier [a-zA-Z_] */
 #define DG	0x0002		/* decimal digit [0-9] */
-#define NM	0x0004		/* extra chars in a hex or long number [a-fA-FxXlL] */
+#define NM	0x0004		/* extra chars in a hex or long number [a-fA-FxXlLuU.] */
 #define C1	0x0008		/* C comment introduction char: / */
 #define C2	0x0010		/* C comment termination  char: * */
 #define Q1	0x0020		/* single quote: ' */
@@ -389,16 +401,16 @@ static unsigned short ctype_c[257] =
 /*020*/ 0,	0,	0,	0,	0,	0,	0,	0,
 /*030*/ 0,	0,	0,	0,	0,	0,	0,	0,
 /*040*/ 0,	0,	Q2,	0,	0,	0,	0,	Q1,
-/*050*/ 0,	0,	C2,	0,	0,	0,	0,	C1,
+/*050*/ 0,	0,	C2,	0,	0,	0,	NM,	C1,
 /*060*/ DG,	DG,	DG,	DG,	DG,	DG,	DG,	DG,
 /*070*/ DG,	DG,	0,	0,	0,	0,	0,	0,
 /*100*/ 0,	I1|NM,	I1|NM,	I1|NM,	I1|NM,	I1|NM,	I1|NM,	I1,
 /*110*/ I1,	I1,	I1,	I1,	I1|NM,	I1,	I1,	I1,
-/*120*/ I1,	I1,	I1,	I1,	I1,	I1,	I1,	I1,
+/*120*/ I1,	I1,	I1,	I1,	I1,	I1|NM,	I1,	I1,
 /*130*/ I1|NM,	I1,	I1,	0,	ES,	0,	0,	I1,
 /*140*/ 0,	I1|NM,	I1|NM,	I1|NM,	I1|NM,	I1|NM,	I1|NM,	I1,
 /*150*/ I1,	I1,	I1,	I1,	I1|NM,	I1,	I1,	I1,
-/*160*/ I1,	I1,	I1,	I1,	I1,	I1,	I1,	I1,
+/*160*/ I1,	I1,	I1,	I1,	I1,	I1|NM,	I1,	I1,
 /*170*/ I1|NM,	I1,	I1,	0,	0,	0,	0,	0,
   /* FIXME: latin-1 */
 };
@@ -441,6 +453,17 @@ C++ language:\n\
 "));
 }
 
+static void
+help_me_java (void)
+{
+  printf (_("\
+Java language:\n\
+  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the result\n\
+  -i,--ignore=CHARS      Allow CHARS in single-token strings, toss the result\n\
+  -u,--strip-underscore  Strip a leading underscore from single-token strings\n\
+"));
+}
+
 static void *
 parse_args_c (char **argv, int argc)
 {
@@ -1508,3 +1531,253 @@ top:
 #undef ISNEWLINE
 #undef ISEOF
 #undef ISBORING
+
+/*************** Lisp *******************************************************/
+
+#define DG    0x01		/* [0-9] */
+#define LT    0x02		/* [a-zA-Z] */
+#define I1    0x04		/* LT | [!$%&*:/<=>?^_~] */
+#define Id    0x08		/* LT | I1 | DG | [-+.@] */
+#define RA    0x10		/* [bodxieBODXIE] */
+#define NM    0x20		/* [-@#.0-9a-fA-FesfdlESFDL] */
+#define EF    0x40		/* (eof) */
+
+#define is_DIGIT(c)	((rct)[c] & DG)
+#define is_LETTER(c)	((rct)[c] & LT)
+#define is_IDENT1(c)	((rct)[c] & (LT | I1))
+#define is_IDENT(c)	((rct)[c] & (LT | I1 | DG | Id))
+#define is_RADIX(c)	((rct)[c] & RA)
+#define is_NUMBER(c)	((rct)[c] & (DG | RA | NM))
+
+static unsigned char ctype_lisp[257] =
+{
+  EF,
+/*      0       1       2       3       4       5       6       7   */
+/*    -----   -----   -----   -----   -----   -----   -----   ----- */
+/*000*/ 0,	0,	0,	0,	0,	0,	0,	0,
+/*010*/ 0,	0,	0,	0,	0,	0,	0,	0,
+/*020*/ 0,	0,	0,	0,	0,	0,	0,	0,
+/*030*/ 0,	0,	0,	0,	0,	0,	0,	0,
+/*040*/ 0,	I1,	0,	NM,	I1,	I1,	I1,	0,
+/*050*/ 0,	0,	I1,	Id,	0,	Id|NM,	Id|NM,	I1,
+/*060*/ DG,	DG,	DG,	DG,	DG,	DG,	DG,	DG,
+/*070*/ DG,	DG,	I1,	0,	I1,	I1,	I1,	I1,
+/*100*/ Id|NM,	LT|NM,	LT|RA,	LT|NM,	LT|RA,	LT|RA,	LT|NM,	LT,
+/*110*/ LT,	LT|RA,	LT,	LT,	LT|NM,	LT,	LT,	LT|RA,
+/*120*/ LT,	LT,	LT,	LT|NM,	LT,	LT,	LT,	LT,
+/*130*/ LT|RA,	LT,	LT,	0,	0,	0,	I1,	I1,
+/*140*/ 0,	LT|NM,	LT|RA,	LT|NM,	LT|RA,	LT|RA,	LT|NM,	LT,
+/*150*/ LT,	LT|RA,	LT,	LT,	LT|NM,	LT,	LT,	LT|RA,
+/*160*/ LT,	LT,	LT,	LT|NM,	LT,	LT,	LT,	LT,
+/*170*/ LT|RA,	LT,	LT,	0,	0,	0,	I1,	0
+  /* FIXME: latin-1 */
+};
+
+static void
+help_me_lisp (void)
+{
+  printf (_("\
+Lisp language:\n\
+"));
+}
+
+static void *
+parse_args_lisp (char **argv, int argc)
+{
+  return NULL;
+}
+
+/* Grab the next identifier from the lisp source file. This
+   state machine is built for speed, not elegance.  */
+
+static struct token *
+get_token_lisp (FILE *in_FILE, void const *args, int *flags)
+{
+  unsigned char const *rct = &ctype_lisp[1];
+  unsigned char *id = scanner_buffer;
+  int c;
+
+  obstack_blank (&tokens_obstack, OFFSETOF_TOKEN_NAME);
+  
+ top:
+  c = getc (in_FILE);
+ recheck:
+  switch (c)
+    {
+    case EOF:
+      obstack_free (&tokens_obstack, obstack_finish (&tokens_obstack));
+      return 0;
+      
+    case '(': case ')':
+    case '\'': case '`':		/* quote, quasiquote */
+      goto top;
+      
+    case ',':				/* unquote */
+      c = getc (in_FILE);
+      if (c == '@')			/* unquote-splicing */
+	goto top;
+      goto recheck;
+      
+    case ';':				/* comment */
+      do {
+	c = getc (in_FILE);
+      } while ( (c != EOF) && (c != '\n'));
+      goto top;
+      
+    case '"':				/* string with or without ansi-C escapes */
+    string:
+      do {
+	c = getc (in_FILE);
+	if (c == '\\')
+	  {
+	    c = getc (in_FILE);
+	    continue;
+	  }
+      } while ( (c != EOF) && (c != '"'));
+      goto top;
+      
+    case '.':
+    case '+': case '-':
+      id = scanner_buffer;
+      *id++ = c;
+      c = getc (in_FILE);
+      if (is_DIGIT (c) ||
+	  (scanner_buffer[0] != '.' && (c == '.' || c == 'i' || c == 'I')))
+	goto number;
+      if (c != EOF)
+	ungetc (c, in_FILE);
+      goto ident;
+      
+    case '#':
+      id = scanner_buffer;
+      *id++ = c;
+      
+      c = getc (in_FILE);
+      if (c == EOF)
+	goto top;
+      else if (is_RADIX (c))
+	goto number;
+      else if (c == '\\')	/* #\... literal Character */
+	{
+	  *id++ = c;
+	  c = getc (in_FILE);
+	  *id++ = c;
+	  if (is_LETTER (c))
+	    {
+	      while (is_LETTER (c = getc (in_FILE)))
+		*id++ = c;
+	      if (c != EOF)
+		ungetc (c, in_FILE);
+	    }
+	  *flags = TOK_LITERAL;
+	  obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer);
+	  return (struct token *) obstack_finish (&tokens_obstack);
+	}
+      else if (c == '(')	/* # (...) vector vi%) */
+	goto top;
+      else if (c == '"')	/* #"..." Bigloo: string with ansi-C escape */
+	goto string;
+      else if (c == '!')	/* #!... Kawa key/eof/null/... */
+	{
+	  while (is_LETTER (c = getc (in_FILE)))
+	    *id++ = c;
+	  if (c != EOF)
+	    ungetc (c, in_FILE);
+	  *flags = TOK_LITERAL;
+	  obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer);
+	  return (struct token *) obstack_finish (&tokens_obstack);
+	}
+      else if (c == '|')	/* #|...|# Guile/Kawa multi-lines comment */
+	{
+	  do {
+	    c = getc (in_FILE);
+	    if (c == '|')
+	      {
+		while ( (c = getc (in_FILE)) == '|')
+		  ;
+		if (c == '#')
+		  break;
+	      }
+	  } while (c != EOF);
+	  goto top;
+	}
+      else if (c == '@')	/* #@LENGTH ...^_ EMACS byte-code comment */
+	{
+	  do {
+	    c = getc (in_FILE);
+	  } while ( (c != EOF) && (c != '\037'));
+	  goto top;
+	}
+      else if (c == '[')	/* #[ ... ] EMACS byte-code object */
+	goto top;
+      /* Ignore invalide #-construct */
+      goto top;
+      
+    case '[': case ']':		/* EMACS vector aka # (...) in Scheme */
+      /* EMACS vector object vs Kawa ident */
+      /* rational: Kawa ident could not start with [ nor with ] */
+      goto top;
+      
+    default:
+      if (is_IDENT1 (c))
+	{
+	  id = scanner_buffer;
+	  *id++ = c;
+	ident:
+	  /* Emacs end-of-vector vs Kawa ident: allow [] as a part of an ident. */
+	  for (;;)
+	    {
+	      while (is_IDENT (c = getc (in_FILE)))
+		*id++ = c;
+	      if (c == '[')
+		{
+		  c = getc (in_FILE);
+		  if (c == ']')
+		    {
+		      *id++ = '[';
+		      *id++ = ']';
+		      continue;
+		    }
+		  if (c != EOF)
+		    ungetc (c, in_FILE);
+		  ungetc ('[', in_FILE);
+		}
+	      break;
+	    }
+	  if (c != EOF)
+	    ungetc (c, in_FILE);
+	  *flags = TOK_NAME | TOK_LITERAL;
+	  obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer);
+	  return (struct token *) obstack_finish (&tokens_obstack);
+	}
+      else if (is_DIGIT (c))
+	{
+	  id = scanner_buffer;
+	number:
+	  *id++ = c;
+	  while (is_NUMBER (c = getc (in_FILE)))
+	    *id++ = c;
+	  if (c != EOF)
+	    ungetc (c, in_FILE);
+	  *flags = TOK_NUMBER | TOK_LITERAL;
+	  obstack_grow0 (&tokens_obstack, scanner_buffer, id - scanner_buffer);
+	  return (struct token *) obstack_finish (&tokens_obstack);
+	}
+    }
+  goto top;
+  
+}
+#undef DG
+#undef LT
+#undef I1
+#undef Id
+
+#undef RA
+#undef NM
+
+#undef is_DIGIT
+#undef is_LETTER
+#undef is_IDENT1
+#undef is_IDENT
+#undef is_RADIX
+#undef is_NUMBER
diff --git a/po/de.po b/po/de.po
index 12dc34c..738965a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2006-01-29 17:10+0100\n"
+"POT-Creation-Date: 2006-02-15 07:30+0100\n"
 "PO-Revision-Date: 1996-03-23 22:34 MET\n"
 "Last-Translator: Karl Eichwalder <ke@ke.Central.DE>\n"
 "Language-Team: German <de@li.org>\n"
@@ -73,45 +73,45 @@ msgstr ""
 msgid "unsupported size in io_write (): %d"
 msgstr "Nicht unterstützte Größe (`size') in \"io_write ()\": %d"
 
-#: libidu/scanners.c:102
+#: libidu/scanners.c:108
 #, fuzzy, c-format
 msgid "unrecognized language: `%s'"
 msgstr "Kein Scanner für die Sprache '%s'"
 
-#: libidu/scanners.c:148
+#: libidu/scanners.c:154
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:202 libidu/scanners.c:271
+#: libidu/scanners.c:208 libidu/scanners.c:277
 msgid "can't allocate language args: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:210
+#: libidu/scanners.c:216
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:265
+#: libidu/scanners.c:271
 #, fuzzy, c-format
 msgid "can't open language map file `%s'"
 msgstr "Kein Scanner für die Sprache '%s'"
 
-#: libidu/scanners.c:267
+#: libidu/scanners.c:273
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:277
+#: libidu/scanners.c:283
 #, fuzzy, c-format
 msgid "can't read language map file `%s'"
 msgstr "Kein Scanner für die Sprache '%s'"
 
-#: libidu/scanners.c:280
+#: libidu/scanners.c:286
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:425
+#: libidu/scanners.c:437
 #, c-format
 msgid ""
 "C language:\n"
@@ -123,7 +123,7 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:436
+#: libidu/scanners.c:448
 #, c-format
 msgid ""
 "C++ language:\n"
@@ -135,19 +135,31 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193
-#: libidu/scanners.c:1457
+#: libidu/scanners.c:459
+#, c-format
+msgid ""
+"Java language:\n"
+"  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the "
+"result\n"
+"  -i,--ignore=CHARS      Allow CHARS in single-token strings, toss the "
+"result\n"
+"  -u,--strip-underscore  Strip a leading underscore from single-token "
+"strings\n"
+msgstr ""
+
+#: libidu/scanners.c:742 libidu/scanners.c:1013 libidu/scanners.c:1216
+#: libidu/scanners.c:1480
 #, c-format
 msgid "junk: `%c'"
 msgstr "\"junk\": '%c'"
 
-#: libidu/scanners.c:721 libidu/scanners.c:992 libidu/scanners.c:1195
-#: libidu/scanners.c:1459
+#: libidu/scanners.c:744 libidu/scanners.c:1015 libidu/scanners.c:1218
+#: libidu/scanners.c:1482
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "\"junk\": '\\%03o'"
 
-#: libidu/scanners.c:825
+#: libidu/scanners.c:848
 #, c-format
 msgid ""
 "Assembly language:\n"
@@ -158,7 +170,7 @@ msgid ""
 "  -n,--no-cpp            Don't handle C pre-processor directives\n"
 msgstr ""
 
-#: libidu/scanners.c:1096
+#: libidu/scanners.c:1119
 #, c-format
 msgid ""
 "Text language:\n"
@@ -168,7 +180,7 @@ msgid ""
 "delimiters\n"
 msgstr ""
 
-#: libidu/scanners.c:1301
+#: libidu/scanners.c:1324
 #, c-format
 msgid ""
 "Perl language:\n"
@@ -179,6 +191,11 @@ msgid ""
 "  -d,--dtags  Include documentation tags\n"
 msgstr ""
 
+#: libidu/scanners.c:1579
+#, c-format
+msgid "Lisp language:\n"
+msgstr ""
+
 #: libidu/walker.c:113
 #, c-format
 msgid "can't read directory `%s' (`.' from `%s')"
diff --git a/po/fr.po b/po/fr.po
index f0587ae..a1a5780 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU mkid 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2006-01-29 17:10+0100\n"
+"POT-Creation-Date: 2006-02-15 07:30+0100\n"
 "PO-Revision-Date: 1996-03-23 22:34 MET\n"
 "Last-Translator: Unknown <unknown@unknown.fr>\n"
 "Language-Team: French <fr@li.org>\n"
@@ -84,45 +84,45 @@ msgstr ""
 msgid "unsupported size in io_write (): %d"
 msgstr "Paramtre taille pass  io_write () non suport: %d"
 
-#: libidu/scanners.c:102
+#: libidu/scanners.c:108
 #, fuzzy, c-format
 msgid "unrecognized language: `%s'"
 msgstr "Pas d'analyseur lexical pour le langag `%s'"
 
-#: libidu/scanners.c:148
+#: libidu/scanners.c:154
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:202 libidu/scanners.c:271
+#: libidu/scanners.c:208 libidu/scanners.c:277
 msgid "can't allocate language args: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:210
+#: libidu/scanners.c:216
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:265
+#: libidu/scanners.c:271
 #, fuzzy, c-format
 msgid "can't open language map file `%s'"
 msgstr "Pas d'analyseur lexical pour le langag `%s'"
 
-#: libidu/scanners.c:267
+#: libidu/scanners.c:273
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:277
+#: libidu/scanners.c:283
 #, fuzzy, c-format
 msgid "can't read language map file `%s'"
 msgstr "Pas d'analyseur lexical pour le langag `%s'"
 
-#: libidu/scanners.c:280
+#: libidu/scanners.c:286
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:425
+#: libidu/scanners.c:437
 #, c-format
 msgid ""
 "C language:\n"
@@ -134,7 +134,7 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:436
+#: libidu/scanners.c:448
 #, c-format
 msgid ""
 "C++ language:\n"
@@ -146,19 +146,31 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193
-#: libidu/scanners.c:1457
+#: libidu/scanners.c:459
+#, c-format
+msgid ""
+"Java language:\n"
+"  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the "
+"result\n"
+"  -i,--ignore=CHARS      Allow CHARS in single-token strings, toss the "
+"result\n"
+"  -u,--strip-underscore  Strip a leading underscore from single-token "
+"strings\n"
+msgstr ""
+
+#: libidu/scanners.c:742 libidu/scanners.c:1013 libidu/scanners.c:1216
+#: libidu/scanners.c:1480
 #, c-format
 msgid "junk: `%c'"
 msgstr "dchet: `%c'"
 
-#: libidu/scanners.c:721 libidu/scanners.c:992 libidu/scanners.c:1195
-#: libidu/scanners.c:1459
+#: libidu/scanners.c:744 libidu/scanners.c:1015 libidu/scanners.c:1218
+#: libidu/scanners.c:1482
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "dchet: `\\%03o'"
 
-#: libidu/scanners.c:825
+#: libidu/scanners.c:848
 #, c-format
 msgid ""
 "Assembly language:\n"
@@ -169,7 +181,7 @@ msgid ""
 "  -n,--no-cpp            Don't handle C pre-processor directives\n"
 msgstr ""
 
-#: libidu/scanners.c:1096
+#: libidu/scanners.c:1119
 #, c-format
 msgid ""
 "Text language:\n"
@@ -179,7 +191,7 @@ msgid ""
 "delimiters\n"
 msgstr ""
 
-#: libidu/scanners.c:1301
+#: libidu/scanners.c:1324
 #, c-format
 msgid ""
 "Perl language:\n"
@@ -190,6 +202,11 @@ msgid ""
 "  -d,--dtags  Include documentation tags\n"
 msgstr ""
 
+#: libidu/scanners.c:1579
+#, c-format
+msgid "Lisp language:\n"
+msgstr ""
+
 #: libidu/walker.c:113
 #, c-format
 msgid "can't read directory `%s' (`.' from `%s')"
diff --git a/po/nl.po b/po/nl.po
index e9a78fd..10ac2c3 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.2\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2006-01-29 17:10+0100\n"
+"POT-Creation-Date: 2006-02-15 07:30+0100\n"
 "PO-Revision-Date: 1998-09-30 13:31+02:00\n"
 "Last-Translator: Ivo Timmermans <zarq@iname.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -73,45 +73,45 @@ msgstr "onbekend I/O type: %d"
 msgid "unsupported size in io_write (): %d"
 msgstr "niet-ondersteunde afmeting in io_write(): %d"
 
-#: libidu/scanners.c:102
+#: libidu/scanners.c:108
 #, c-format
 msgid "unrecognized language: `%s'"
 msgstr "niet herkende taal: `%s'"
 
-#: libidu/scanners.c:148
+#: libidu/scanners.c:154
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr "kan geen objectstapel voor taalargumenten vrijmaken: geheugen vol"
 
-#: libidu/scanners.c:202 libidu/scanners.c:271
+#: libidu/scanners.c:208 libidu/scanners.c:277
 msgid "can't allocate language args: memory exhausted"
 msgstr "kan geen geheugen vrijmaken voor taalargumenten: geheugen vol"
 
-#: libidu/scanners.c:210
+#: libidu/scanners.c:216
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr "taalnaam verwacht na `%s' in bestand `%s'"
 
-#: libidu/scanners.c:265
+#: libidu/scanners.c:271
 #, c-format
 msgid "can't open language map file `%s'"
 msgstr "kan taalbestand `%s' niet openen"
 
-#: libidu/scanners.c:267
+#: libidu/scanners.c:273
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr "kan grootte van mapbestand `%s' niet krijgen"
 
-#: libidu/scanners.c:277
+#: libidu/scanners.c:283
 #, c-format
 msgid "can't read language map file `%s'"
 msgstr "kan taalbestand `%s' niet lezen"
 
-#: libidu/scanners.c:280
+#: libidu/scanners.c:286
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr "kan niet het hele taalbestand `%s' lezen"
 
-#: libidu/scanners.c:425
+#: libidu/scanners.c:437
 #, c-format
 msgid ""
 "C language:\n"
@@ -130,7 +130,7 @@ msgstr ""
 "  -u,--strip-underscore Haal een voorgaand laag liggend streepje (`_')\n"
 "                        weg van reeksen van een eenheid\n"
 
-#: libidu/scanners.c:436
+#: libidu/scanners.c:448
 #, fuzzy, c-format
 msgid ""
 "C++ language:\n"
@@ -149,19 +149,38 @@ msgstr ""
 "  -u,--strip-underscore Haal een voorgaand laag liggend streepje (`_')\n"
 "                        weg van reeksen van een eenheid\n"
 
-#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193
-#: libidu/scanners.c:1457
+#: libidu/scanners.c:459
+#, fuzzy, c-format
+msgid ""
+"Java language:\n"
+"  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the "
+"result\n"
+"  -i,--ignore=CHARS      Allow CHARS in single-token strings, toss the "
+"result\n"
+"  -u,--strip-underscore  Strip a leading underscore from single-token "
+"strings\n"
+msgstr ""
+"C taal:\n"
+"  -k,--keep=TEKENS      Sta TEKENS toe in reeksen van een eenheid, behoud\n"
+"                        resultaat\n"
+"  -i,--ignore=TEKENS    Sta TEKENS toe in reeksen van een eenheid, gooi\n"
+"                        resultaat weg\n"
+"  -u,--strip-underscore Haal een voorgaand laag liggend streepje (`_')\n"
+"                        weg van reeksen van een eenheid\n"
+
+#: libidu/scanners.c:742 libidu/scanners.c:1013 libidu/scanners.c:1216
+#: libidu/scanners.c:1480
 #, c-format
 msgid "junk: `%c'"
 msgstr "onzin: `%c'"
 
-#: libidu/scanners.c:721 libidu/scanners.c:992 libidu/scanners.c:1195
-#: libidu/scanners.c:1459
+#: libidu/scanners.c:744 libidu/scanners.c:1015 libidu/scanners.c:1218
+#: libidu/scanners.c:1482
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "onzin: `\\%03o'"
 
-#: libidu/scanners.c:825
+#: libidu/scanners.c:848
 #, c-format
 msgid ""
 "Assembly language:\n"
@@ -180,7 +199,7 @@ msgstr ""
 "eenheden\n"
 "  -n,--no-cpp            Behandel geen C pre-processor aanwijzingen\n"
 
-#: libidu/scanners.c:1096
+#: libidu/scanners.c:1119
 #, c-format
 msgid ""
 "Text language:\n"
@@ -195,7 +214,7 @@ msgstr ""
 "  -x,--exclude=TEKEN-KLASSE  Behandel tekens van TEKEN-KLASSE als "
 "eenheidscheiding\n"
 
-#: libidu/scanners.c:1301
+#: libidu/scanners.c:1324
 #, fuzzy, c-format
 msgid ""
 "Perl language:\n"
@@ -211,6 +230,11 @@ msgstr ""
 "  -x,--exclude=TEKEN-KLASSE  Behandel tekens van TEKEN-KLASSE als "
 "eenheidscheiding\n"
 
+#: libidu/scanners.c:1579
+#, c-format
+msgid "Lisp language:\n"
+msgstr ""
+
 #: libidu/walker.c:113
 #, c-format
 msgid "can't read directory `%s' (`.' from `%s')"
diff --git a/po/pl.po b/po/pl.po
index 8bd5a93..bb56cd9 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: id-utils 3.0.8\n"
 "Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n"
-"POT-Creation-Date: 2006-01-29 17:10+0100\n"
+"POT-Creation-Date: 2006-02-15 07:30+0100\n"
 "PO-Revision-Date: 1997-03-26 23:59 +0100\n"
 "Last-Translator: Wojciech Marek Ga³±zka <wgalazka@chem.uw.edu.pl>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -73,45 +73,45 @@ msgstr ""
 msgid "unsupported size in io_write (): %d"
 msgstr "Nie obs³ugiwany rozmiar w io_write (): %d\n"
 
-#: libidu/scanners.c:102
+#: libidu/scanners.c:108
 #, fuzzy, c-format
 msgid "unrecognized language: `%s'"
 msgstr "Brak skanera dla jêzyka `%s'\n"
 
-#: libidu/scanners.c:148
+#: libidu/scanners.c:154
 msgid "can't allocate language args obstack: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:202 libidu/scanners.c:271
+#: libidu/scanners.c:208 libidu/scanners.c:277
 msgid "can't allocate language args: memory exhausted"
 msgstr ""
 
-#: libidu/scanners.c:210
+#: libidu/scanners.c:216
 #, c-format
 msgid "language name expected following `%s' in file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:265
+#: libidu/scanners.c:271
 #, fuzzy, c-format
 msgid "can't open language map file `%s'"
 msgstr "Brak skanera dla jêzyka `%s'\n"
 
-#: libidu/scanners.c:267
+#: libidu/scanners.c:273
 #, c-format
 msgid "can't get size of map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:277
+#: libidu/scanners.c:283
 #, fuzzy, c-format
 msgid "can't read language map file `%s'"
 msgstr "Brak skanera dla jêzyka `%s'\n"
 
-#: libidu/scanners.c:280
+#: libidu/scanners.c:286
 #, c-format
 msgid "can't read entire language map file `%s'"
 msgstr ""
 
-#: libidu/scanners.c:425
+#: libidu/scanners.c:437
 #, c-format
 msgid ""
 "C language:\n"
@@ -123,7 +123,7 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:436
+#: libidu/scanners.c:448
 #, c-format
 msgid ""
 "C++ language:\n"
@@ -135,19 +135,31 @@ msgid ""
 "strings\n"
 msgstr ""
 
-#: libidu/scanners.c:719 libidu/scanners.c:990 libidu/scanners.c:1193
-#: libidu/scanners.c:1457
+#: libidu/scanners.c:459
+#, c-format
+msgid ""
+"Java language:\n"
+"  -k,--keep=CHARS        Allow CHARS in single-token strings, keep the "
+"result\n"
+"  -i,--ignore=CHARS      Allow CHARS in single-token strings, toss the "
+"result\n"
+"  -u,--strip-underscore  Strip a leading underscore from single-token "
+"strings\n"
+msgstr ""
+
+#: libidu/scanners.c:742 libidu/scanners.c:1013 libidu/scanners.c:1216
+#: libidu/scanners.c:1480
 #, c-format
 msgid "junk: `%c'"
 msgstr "¶mieæ: `%c'"
 
-#: libidu/scanners.c:721 libidu/scanners.c:992 libidu/scanners.c:1195
-#: libidu/scanners.c:1459
+#: libidu/scanners.c:744 libidu/scanners.c:1015 libidu/scanners.c:1218
+#: libidu/scanners.c:1482
 #, c-format
 msgid "junk: `\\%03o'"
 msgstr "¶mieæ: `\\%03o'"
 
-#: libidu/scanners.c:825
+#: libidu/scanners.c:848
 #, c-format
 msgid ""
 "Assembly language:\n"
@@ -158,7 +170,7 @@ msgid ""
 "  -n,--no-cpp            Don't handle C pre-processor directives\n"
 msgstr ""
 
-#: libidu/scanners.c:1096
+#: libidu/scanners.c:1119
 #, c-format
 msgid ""
 "Text language:\n"
@@ -168,7 +180,7 @@ msgid ""
 "delimiters\n"
 msgstr ""
 
-#: libidu/scanners.c:1301
+#: libidu/scanners.c:1324
 #, c-format
 msgid ""
 "Perl language:\n"
@@ -179,6 +191,11 @@ msgid ""
 "  -d,--dtags  Include documentation tags\n"
 msgstr ""
 
+#: libidu/scanners.c:1579
+#, c-format
+msgid "Lisp language:\n"
+msgstr ""
+
 #: libidu/walker.c:113
 #, c-format
 msgid "can't read directory `%s' (`.' from `%s')"