Allow - in term. But - in ranges must be surrounded by whitespace

diff --git a/ccl/bib1 b/ccl/bib1
index 41a46cf..afa776a 100644 (file)
--- a/ccl/bib1
+++ b/ccl/bib1
@@ -1,4 +1,4 @@
-# $Id: bib1,v 1.11 2002-05-17 08:46:01 adam Exp $
+# $Id: bib1,v 1.12 2002-10-14 19:45:36 adam Exp $
 # CCL qualifiers and their mappings
 #
 # Each line takes the form:
@@ -27,6 +27,7 @@
 #    n       Set truncation explicitly to "none" if no ? is given.
 
 # This rule is for CCL tokens where no fields are specified
+#term u=1016 t=l,r s=pw,al
 term u=1016 t=l,r s=pw,al
 # Common short-hand access points.
 au   u=1    s=pw t=l,r         # author
@@ -100,8 +101,8 @@ exp:category exp1,1=1
 
 # These special directives defines names of keywords for parser
 @and og *             # either 'or' or *
-@or eller   +         # either 'eller' or +
-@not ikke -           # and so on..
+@or eller           # either 'eller' or +
+@not ikke            # and so on..
 @set s set
 @case 0                      # case insenstive (1 for case sensitive)
 @truncation * ?

diff --git a/ccl/ccltoken.c b/ccl/ccltoken.c
index afbac9c..b749a9d 100644 (file)
--- a/ccl/ccltoken.c
+++ b/ccl/ccltoken.c
@@ -44,7 +44,7 @@
 /* CCL - lexical analysis
  * Europagate, 1995
  *
- * $Id: ccltoken.c,v 1.19 2002-06-06 12:54:24 adam Exp $
+ * $Id: ccltoken.c,v 1.20 2002-10-14 19:45:36 adam Exp $
  *
  * Old Europagate Log:
  *
@@ -277,9 +277,9 @@ struct ccl_token *ccl_parser_tokenize (CCL_parser cclp, const char *command)
                cp++;
            break;
        default:
-           if (!strchr ("(),%!><=- \t\n\r", cp[-1]))
+           if (!strchr ("(),%!><= \t\n\r", cp[-1]))
            {
-               while (*cp && !strchr ("(),%!><=- \t\n\r", *cp))
+               while (*cp && !strchr ("(),%!><= \t\n\r", *cp))
                {
                    cp++;
                    ++ last->len;