Update version

Change-Id: I183be89626b04267767ff83d7c6c62b6cc3d6c9e Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7513 Add windows CI Change-Id: I2cd2a8680e945f5f7751cf50cadca368484dd8e4 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7589 Reviewed-by: Nils Diewald <nils@diewald-online.de> Reviewed-by: margaretha <margaretha@ids-mannheim.de> Bump com.google.guava:guava from 32.1.2-jre to 32.1.3-jre (closes #152) Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.2-jre to 32.1.3-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I355f5d5c57f998bc58cade3a05cded6b7f549529 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7685 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump jackson.version from 2.15.2 to 2.15.3 (closes #153) Bumps `jackson.version` from 2.15.2 to 2.15.3. Updates `com.fasterxml.jackson.core:jackson-core` from 2.15.2 to 2.15.3 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](FasterXML/jackson-core@jackson-core-2.15.2...jackson-core-2.15.3) Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.15.2 to 2.15.3 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.15.2 to 2.15.3 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I70e9187fcfd247bf52b79cb755d3b08f829d84db Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7686 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump log4j.version from 2.20.0 to 2.21.1 (closes #156) Bumps `log4j.version` from 2.20.0 to 2.21.1. Updates `org.apache.logging.log4j:log4j-api` from 2.20.0 to 2.21.1 Updates `org.apache.logging.log4j:log4j-core` from 2.20.0 to 2.21.1 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.20.0 to 2.21.1 Updates `org.apache.logging.log4j:log4j-jul` from 2.20.0 to 2.21.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-jul dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I7f5396f0c3edc6625a119d6aef40a183c5247a5b Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7687 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump org.apache.maven.plugins:maven-surefire-plugin from 3.1.2 to 3.2.1 (closes #157) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.1.2 to 3.2.1. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.1.2...surefire-3.2.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: Ied5c4d928b2af66cd011f0b188f39ea3e0df537a Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7688 Reviewed-by: Nils Diewald <nils@diewald-online.de> Issue #66: REG: missing #REG-Operator implemented: rebased. Added new tests. Moved general purpose methods to StringUtils.java. Change-Id: I42f12251a73511fff07b48e06f6018ba1e181433 Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2 (closes #158) Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](apache/maven-clean-plugin@maven-clean-plugin-3.3.1...maven-clean-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I8b41cc98cdd5f43671c09005b2682af965a80e85 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7750 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.1 to 3.3.2 (closes #158) Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.3.1 to 3.3.2. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](apache/maven-clean-plugin@maven-clean-plugin-3.3.1...maven-clean-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I6636ae98066d6df088f08db265dd5ac7c57882ee Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7742 Reviewed-by: Nils Diewald <nils@diewald-online.de> Issue #160: bad handling of the ',' in #BED(searchexpr,options) corrected. Change-Id: I159d252a25b6b2e526cea4d0d2d834258848d9b9 opBED: Korrektur von #BED(word,sa) ohne Leerzeichen vor dem Komma. Change-Id: If6289e2777d31b2319f807c969ec9381b468b891 opBED: some tests around #BED(Haus,sa) added. Change-Id: I159d252a25b6b2e526cea4d0d2d834258848d9b9 verbosity can be switched on/off on command line. Change-Id: Ie5c97453e654d4e04ae058f490ff3d47b1b34956 Prox: parsing %-w1 and %+w1 correctly. Change-Id: Ic8019628ef83fc7b9b3467fd1aa1bb4eafb9848c opPROX: correcting order of Prox options: WIP. Change-Id: I7976484475b2f9116c7df7feed43b777b05bc713 beliebige Reihenfolge der Abstands-Optionen: WIP. Change-Id: Icd84e7d65a15f35283995e93e3bd61eda19d657d Prox: beliebige Reihenfolge der Optionen: OK. Change-Id: I53309d91b506c1f7108fa3fd596c69e9f214be6a Prox: beliebige Reihenfolge der Optionen: OK. Change-Id: I256a0bd3d1629d1758f304726374298dfde0037d opPROX: grammar should accept any order of prox. options: WIP. Change-Id: I5641d33b85c9ed6d66ff6c59f1cdf02dfad281f8 PROX: return exact error messasge about prox options. Change-Id: Ifc3f1f7ef86ac699a3ce1671e790d09cd4ed54e1 PROX: emit a meaningfull error message: wip. Change-Id: Ia0fa8d2d7e08dbf3cbdcdbe542b531446b668bb9 PROX: emit a meaningfull error message: WIP. Change-Id: I0d78abab2c03a874f690187d9e33adc356fcf53b trying to write error message into an error node of the AST. Change-Id: I01f1827ddb74e44b16c4a79b0f9994f3d9c7132f write parsing error to AST. Change-Id: Ic2c5030225f59deff1d2d10f60d5fc4d818650a6 PROX: Fehlermeldung in KoralQuery schreiben funktioniert. Change-Id: I4227d6d0899c08017f859d9c044201352d4d4214 Prox... Change-Id: I4287658e0157593eb934fe1723df8ea1bb4fdc26 Error detection inside Prox done. Returning a precise error message through JSON: done. Change-Id: I2a1d079a03f6aece3283eb9805600e9dde9a3701 using addError() for error messages in PROX: WIP. Change-Id: Ibb00c2587085df265d03a0356d83c9e2d60d225c Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.1 to 3.2.2 (closes #159) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.1 to 3.2.2. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.2.1...surefire-3.2.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: Iddbe888cc89c659bfdb3dc3f321da2666046e3f4 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7790 Reviewed-by: Nils Diewald <nils@diewald-online.de> Issue #160: bad handling of the ',' in #BED(searchexpr,options) corrected. Change-Id: I159d252a25b6b2e526cea4d0d2d834258848d9b9 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7760 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump jackson.version from 2.15.3 to 2.16.0 (closes #161) Bumps `jackson.version` from 2.15.3 to 2.16.0. Updates `com.fasterxml.jackson.core:jackson-core` from 2.15.3 to 2.16.0 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](FasterXML/jackson-core@jackson-core-2.15.3...jackson-core-2.16.0) Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.15.3 to 2.16.0 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.15.3 to 2.16.0 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I3c9ad7b444159ec96707113803628a18d6f43048 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7927 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump log4j.version from 2.21.1 to 2.22.0 (closes #162) Bumps `log4j.version` from 2.21.1 to 2.22.0. Updates `org.apache.logging.log4j:log4j-api` from 2.21.1 to 2.22.0 Updates `org.apache.logging.log4j:log4j-core` from 2.21.1 to 2.22.0 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.21.1 to 2.22.0 Updates `org.apache.logging.log4j:log4j-jul` from 2.21.1 to 2.22.0 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: org.apache.logging.log4j:log4j-jul dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I9ef8bbf4eb7e7a36917f29dccb08139738c41042 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7928 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.2 to 3.2.3 (closes #163) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.2 to 3.2.3. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.2.2...surefire-3.2.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: If6ff4a298c92a1456886549edada48876f2220c6 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7929 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump com.google.guava:guava from 32.1.3-jre to 33.0.0-jre (closes #164) Bumps [com.google.guava:guava](https://github.com/google/guava) from 32.1.3-jre to 33.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: Ic1e9e2a74d4fa4948903d9e918d7353edf56ede5 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7930 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump org.apache.maven.plugins:maven-compiler-plugin (closes #166) Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I1456811832c5d08510c4fb36388a70d675518c23 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7931 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump log4j.version from 2.22.0 to 2.22.1 (closes #168) Bumps `log4j.version` from 2.22.0 to 2.22.1. Updates `org.apache.logging.log4j:log4j-api` from 2.22.0 to 2.22.1 Updates `org.apache.logging.log4j:log4j-core` from 2.22.0 to 2.22.1 Updates `org.apache.logging.log4j:log4j-slf4j-impl` from 2.22.0 to 2.22.1 Updates `org.apache.logging.log4j:log4j-jul` from 2.22.0 to 2.22.1 --- updated-dependencies: - dependency-name: org.apache.logging.log4j:log4j-api dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-slf4j-impl dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.apache.logging.log4j:log4j-jul dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I3ed2e1b01bd60abae3031ae42bbb66c40e608714 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7997 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump jackson.version from 2.16.0 to 2.16.1 (closes #169) Bumps `jackson.version` from 2.16.0 to 2.16.1. Updates `com.fasterxml.jackson.core:jackson-core` from 2.16.0 to 2.16.1 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](FasterXML/jackson-core@jackson-core-2.16.0...jackson-core-2.16.1) Updates `com.fasterxml.jackson.core:jackson-annotations` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson/commits) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.16.0 to 2.16.1 - [Commits](https://github.com/FasterXML/jackson/commits) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: If197bb856a44c1c57ccd409c0d8c347be8809f71 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7998 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump org.slf4j:slf4j-api from 2.0.9 to 2.0.11 (closes #170) Bumps org.slf4j:slf4j-api from 2.0.9 to 2.0.11. --- updated-dependencies: - dependency-name: org.slf4j:slf4j-api dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I67cc7b25bfbb365e7ebbfb886d838e9a78338563 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7999 Reviewed-by: Nils Diewald <nils@diewald-online.de> Bump org.apache.maven.plugins:maven-surefire-plugin from 3.2.3 to 3.2.5 (closes #171) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.2.3 to 3.2.5. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-3.2.3...surefire-3.2.5) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Change-Id: I62ba16e9fa99233b9ceb00c0f09d77b55b601cee Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/8000 Reviewed-by: Nils Diewald <nils@diewald-online.de> Update groupID for maven release Change-Id: I8f7165f069d97835891e249b3a177d2865b3f2e7 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7502 Reviewed-by: margaretha <margaretha@ids-mannheim.de> Prepare new release Change-Id: I3c8729f8441656802a1322d876c1ece42659bba6 Reviewed-on: https://korap.ids-mannheim.de/gerrit/c/KorAP/Koral/+/7995 Reviewed-by: margaretha <margaretha@ids-mannheim.de> Prox: reporting exact error messages: works. Change-Id: I5bd0ea053dc08bfb792b8ea0c12a346b095fcaa2 PROX: Tests with RecognitionExceptions removed. All Error Codes in StatusCodes.java. Change-Id: Id6355ddf859f35b8d0f20b4ce53c0f3da2122b03 Prox: error messages for wrong prox. options. Change-Id: Iac430c5bba3dfe30606a8079060f4a6c5bdb4781 Prox: debug output deactivated. Change-Id: I1880bd5bfdaeaea9c17b50921b7b8c4f1cfd40ed Prox: deleted debug output. Change-Id: If82218a29aa4ac9dd53dbbaba7283d6ee0d755b2 Prox: Test added: WiP. Change-Id: Iae2fa09238d82e30dc2130efd102560e5a48fb6b Prox: 1 working tests added. Change-Id: Ie911f5c3f957a2f9479622c4e4feff0f7cba54b7 Prox: 3 more tests added. Change-Id: Ic0c1791945e19a71a07aa611acfd72c5449fc508
KorAP · Jan 18, 2024 · 6c4136b · 6c4136b
1 parent 56dcb86
commit 6c4136b
Show file tree

Hide file tree

Showing 18 changed files with 1,439 additions and 112 deletions.
diff --git a/.github/workflows/ci_test.yml → .github/workflows/linux_ci.yml b/.github/workflows/ci_test.yml → .github/workflows/linux_ci.yml
diff --git a/.github/workflows/windows_ci.yml b/.github/workflows/windows_ci.yml
@@ -0,0 +1,21 @@
+name: CI Windows
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    steps:
+      - name: Set git to use LF
+        run: |
+          git config --global core.autocrlf false
+          git config --global core.eol lf
+      - name: Checkout Koral
+        uses: actions/checkout@v2
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Build and install Koral
+        run: mvn --file pom.xml install
diff --git a/Changes b/Changes
@@ -1,5 +1,11 @@
+0.42 2024-01-11
+    - [feature] Support #REG in C2 (bodmer)
+    - [bugfix] Fix comma in #BED in C2 (bodmer)
+
 0.41 2023-09-13
+    - [feature] Finish support for CQP (irimia)
     - [bugfix] Disallow empty regex in PQ+ (diewald)
+    - [cleanup] Change of groupID.
 
 0.40 2023-07-26
     - [feature] Initial support for CQP

diff --git a/README.md b/README.md
@@ -132,7 +132,7 @@ J. Bingel and N. Diewald, "KoralQuery – a General Corpus Query Protocol," in P
 ## Authorship
 
 Koral and KoralQuery were developed by Joachim Bingel,
-Nils Diewald, Michael Hanl and Eliza Margaretha at the
+Nils Diewald, Michael Hanl, Eliza Margaretha, and Franck Bodmer at the
 [Leibniz Institute for the German Language (IDS)](https://www.ids-mannheim.de/),
 member of the [Leibniz Association](https://www.leibniz-gemeinschaft.de).
 
@@ -142,7 +142,7 @@ The ANTLR grammars for parsing ANNIS QL and COSMAS II QL were developed by
 Thomas Krause (HU Berlin) and Franck Bodmer (IDS Mannheim), respectively.
 Minor adaptations of those grammars were implemented by the Koral authors.
 
-The authors wish to thank Piotr Bański, Franck Bodmer, Elena Frick and
+The authors wish to thank Piotr Bański, Elena Frick and
 Carsten Schnober for their valuable input.
 
 ## License

diff --git a/pom.xml b/pom.xml
@@ -2,9 +2,9 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>de.ids_mannheim.korap</groupId>
+	<groupId>de.ids-mannheim.korap.koral</groupId>
 	<artifactId>Koral</artifactId>
-	<version>0.41.0</version>
+	<version>0.42.0</version>
 	<packaging>jar</packaging>
 	<name>Koral</name>
 	<url>https://korap.ids-mannheim.de</url>
@@ -39,11 +39,11 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>		
-		<jackson.version>2.15.2</jackson.version>
+		<jackson.version>2.16.1</jackson.version>
 		<antlr4.version>4.9.3</antlr4.version>
 		<antlr3.version>3.5.3</antlr3.version>
 		<java.version>11</java.version>
-		<log4j.version>2.20.0</log4j.version>
+		<log4j.version>2.22.1</log4j.version>
 	</properties>
 
 	<repositories>
@@ -83,7 +83,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
-			<version>32.1.2-jre</version>
+			<version>33.0.0-jre</version>
 		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -145,7 +145,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>2.0.9</version>
+			<version>2.0.11</version>
 		</dependency>
 		<dependency>
 			<groupId>eu.clarin.sru.fcs</groupId>
@@ -160,7 +160,7 @@
 		  <plugin>
 			  <groupId>org.apache.maven.plugins</groupId>
 			  <artifactId>maven-clean-plugin</artifactId>
-		    <version>3.3.1</version>
+		    <version>3.3.2</version>
 		    <configuration>
 		      <filesets>
 		        <fileset>
@@ -177,6 +177,7 @@
 		          	<exclude>**/c2ps_opIN.java</exclude>
 		          	<exclude>**/c2ps_opOV.java</exclude>
 		          	<exclude>**/c2ps_opPROX.java</exclude>
+		          	<exclude>**/c2ps_opREG.java</exclude>
 		          	<exclude>**/c2ps_opWF.java</exclude>
 		          	<exclude>**/c2ps_optCase.java</exclude>
 		          	<exclude>**/.gitignore</exclude>
@@ -190,7 +191,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.1.2</version>
+				<version>3.2.5</version>
 				<configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
 					<excludes>
@@ -201,7 +202,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.11.0</version>
+				<version>3.12.1</version>
 				<configuration>
 					<!-- <verbose>true</verbose>
 		          	<fork>true</fork> -->

diff --git a/src/main/antlr/cosmas/c2ps.g b/src/main/antlr/cosmas/c2ps.g
@@ -1,16 +1,26 @@
- // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
-//												//
-// 	COSMAS II zeilenorientierten Suchanfragesprache (C2 plain syntax)			//
-// 	globale Grammatik (ruft lokale c2ps_x.g Grammatiken auf).				//
-//	17.12.12/FB										//
-//      v-0.6											//
-// TODO:											//
-// - se1: Einsetzen des Default-Operators in den kumulierten AST.				//
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+//												
+// 	COSMAS II zeilenorientierten Suchanfragesprache (C2 plain syntax)	
+// 	globale Grammatik (ruft lokale c2ps_x.g Grammatiken auf).			
+//	17.12.12/FB										
+//      v-0.6										
+// TODO:											
+// - se1: Einsetzen des Default-Operators in den kumulierten AST.		
+//
+//  v0.7 - 25.07.23/FB
+//    - added: #REG(x)
+//  v0.8 - 06.11.23/FB
+//    - accepts #BED(searchword, sa) : comma attached to searchword.
+//    - more generally: comma at end of searchword, which is not enclosed by "..." is
+//      excluded from searchword now.
+//    - a comma inside a searchword is accepted if enclosed by "...".
+//
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 grammar c2ps;
 
 options { output=AST; backtrack=true; k=5;}
+// tokens that will appear as node names in the resulting AST:
 tokens  {C2PQ; OPBED; OPTS; OPBEG; OPEND; OPNHIT; OPALL; OPLEM; OPPROX;
 	 ARG1; ARG2; 
 	 OPWF; OPLEM; OPANNOT;
@@ -21,6 +31,7 @@ tokens  {C2PQ; OPBED; OPTS; OPBEG; OPEND; OPNHIT; OPALL; OPLEM; OPPROX;
 	 OPNOT;
 	 OPEXPR1;
 	 OPMORPH; OPELEM;
+	 OPREG;
 	}
 
 @header {package de.ids_mannheim.korap.query.parse.cosmas;}
@@ -63,19 +74,50 @@ WS	:	(' '|'\r'|'\n')+ {skip();};
 
 fragment DISTVALUE
 	:	 ('0' .. '9')+ (':' ('0'..'9')+)? ;
-
+
+fragment DISTTYPE // 30.11.23/FB
+	: 	('w'|'s'|'p'|'t');
+
+fragment DISTDIR // 30.11.23/FB
+	: 	('+'|'-');
+
+/* old version (before 30.11.23/FB)
 fragment DIST
 	:	('+'|'-')? (DISTVALUE ('w'|'s'|'p'|'t') | ('w'|'s'|'p'|'t') DISTVALUE);
-
+*/
+
+// accept these 3 options in any order.
+// afterwards, we will have to check if any of them is missing.
+// 30.11.23/FB
+
+fragment DIST // 30.11.23/FB
+	:	(DISTDIR | DISTTYPE | DISTVALUE )+;
+
 fragment GROUP
 	:	('min' | 'max');
 
-OP_PROX	:	('/' | '%') DIST (',' DIST)* (',' GROUP)? ;
+// version (12.01.24/FB):
+// accept correct and incorrect chars till the next blank, that way the incorrect chars
+// are submitted to the sub-grammer c2ps_opPROX where they are detected and an appropriate 
+// error message is inserted:
+OP_PROX		:	('/' | '%') DIST (~' ')*; 
+
+// old version: accepts only correctly formulated options, so the incorrect
+// chars/options are hard to detect:
+// OP_PROX	:	('/' | '%') DIST (',' DIST)* (',' GROUP)?  ;
 
 OP_IN	:	'#IN' | '#IN(' OP_IN_OPTS? ')' ; 
 
 OP_OV	:	'#OV' | '#OV(' OP_OV_OPTS? ')' ;
 
+// #REG(abc['"]) or #REG('abc\'s') or #REG("abc\"s"):
+
+OP_REG	: '#REG(' ' '* '\'' ('\\\''|~'\'')+  '\'' (' ')* ')'	
+			| 
+		  '#REG(' ' '* '"' ('\\"'|~'"')+ '"' (' ')* ')'
+		  	|
+		  '#REG(' ' '* ~('\''|'"'|' ') (~(')'))* ')';
+
 // EAVEXP wird hier eingesetzt fÃ¼r eine beliebige Sequenz von Zeichen bis zu ')'.
 fragment OP_IN_OPTS
 	:	EAVEXPR ;
@@ -111,8 +153,23 @@ SEARCHLEMMA
 	:	'&' SEARCHWORD1 ; // rewrite rules funktionieren im lexer nicht: -> ^(OPLEM $SEARCHWORD1.text); 
 
 // SEARCHWORD2: schluckt Blanks. Diese mÃ¼ssen nachtrÃ¤glich als Wortdelimiter erkannt werden.
+
+// current syntax, drawback is:
+// e.g. aber, -> SEARCHWORD1 = "aber,"
+// but correct should be -> SEARCHWORD1 = "aber"  
+//SEARCHWORD1
+//	:	~('"' | ' ' | '#' | ')' | '(' )+ ;
+
+// new syntax (06.11.23/FB):
+// accept for searchword1 either a single ',' or exclude trailing ',' from searchword1:
+// E.g. Haus, -> searchword1=Haus.
+// For a ',' inside a search word, see searchword2. 
+// exclude trailing "," from searchword1.
 SEARCHWORD1
-	:	~('"' | ' ' | '#' | ')' | '(' )+ ;
+	:	(',' | ~('"' | ' ' | '#' | ')' | '(' | ',')+)  ;
+
+// searchword2 accepts a ',' inside a searchword enclosed by "...".
+// E.g. "Haus,tür": OK.
 
 SEARCHWORD2
 	:	'"' (~('"') | '\\"')+ '"' ;
@@ -226,7 +283,7 @@ searchLabel
 op2	:	(opPROX | opIN | opOV | opAND | opOR | opNOT) ;
 
 // AST with Options for opPROX is returned by c2ps_opPROX.check():
-opPROX	:	OP_PROX -> ^(OPPROX {c2ps_opPROX.check($OP_PROX.text, $OP_PROX.index)} );
+opPROX	:	OP_PROX -> ^(OPPROX {c2ps_opPROX.check($OP_PROX.text, $OP_PROX.pos)} );
 
 opIN	: 	OP_IN -> {c2ps_opIN.check($OP_IN.text, $OP_IN.index)};
 
@@ -241,7 +298,7 @@ opNOT	:	('nicht' | 'NICHT' | 'not' | 'NOT') -> ^(OPNOT);
 // OP1: Suchoperatoren mit 1 Argument:
 // -----------------------------------
 
-op1	:	opBEG | opEND | opNHIT | opALL | opBED; 
+op1	:	opBEG | opEND | opNHIT | opALL | opBED | opREG; 
 
 // #BED(serchExpr, B).
 // B muss nachtrÃ¤glich in einer lokalen Grammatik Ã¼berprÃ¼ft werden.
@@ -259,3 +316,5 @@ opEND	:	( '#END(' | '#RECHTS(' ) searchExpr ')'  -> ^(OPEND searchExpr) ;
 opNHIT	:	( '#NHIT(' | '#INKLUSIVE(' ) searchExpr ')' -> ^(OPNHIT searchExpr) ;
 
 opALL	:	( '#ALL(' | '#EXKLUSIVE(' ) searchExpr ')'  -> ^(OPALL searchExpr) ;
+
+opREG	:	OP_REG -> ^(OPREG {c2ps_opREG.encode($OP_REG.text, OPREG)}) ;