Skip to content

Commit 9f876f4

Browse files
author
Johannes Heinecke
committed
new option --help and --version
documentation continued (html and code)
1 parent b7423c1 commit 9f876f4

File tree

12 files changed

+266
-256
lines changed

12 files changed

+266
-256
lines changed

CHANGES.md

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changes
22

3+
## Version 2.30.1
4+
* new option --help and --version
5+
* line number search added in help page
6+
* show commit in `help`
7+
* documentation continued (html and code)
8+
39
## Version 2.30.0
410
* search sentences with line number
511
* new tests
@@ -11,7 +17,7 @@
1117
* error with large columns in table view corrected
1218

1319
## Version 2.29.2
14-
* corrected bug: "<" and ">" in comments are now correctly displayed
20+
* corrected bug: `<` and `>` in comments are now correctly displayed
1521

1622
## Version 2.29.1
1723
* Fatal error if gui/ does not contain necessary html, css, js files and jquery libraries
@@ -148,8 +154,8 @@
148154
* new option --shortcutTimeout to set the maximal time (milliseconds) between to keys of a shortcut sequence
149155

150156
## Version 2.17.4
151-
* shortcuts sequence must be taped with max 300ms between keys. This permits having short and long shortcuts (e.g. A, and AV)
152-
* bug correction in complex search: child(child(...))
157+
* shortcuts sequence must be taped with max 300ms between keys. This permits having short and long shortcuts (e.g. `A`, and `AV`)
158+
* bug correction in complex search: `child(child(...))`
153159

154160
## Version 2.17.3
155161
* more file statistics, doc updated
@@ -186,7 +192,7 @@
186192
* new tests
187193

188194
## Version 2.15.1
189-
* corrected confusion: ConlluEditor deals with **MWT** (multiword tokens) and not with _MTW_s...
195+
* corrected confusion: ConlluEditor deals with **MWT** (multiword tokens) and not with *MTW*
190196

191197
## Version 2.15.0
192198
* added a script to find similar or identical sentences in a single or multiple CoNLL-U files
@@ -254,7 +260,7 @@
254260
* bug in maven tests corrected (using `--saveAfter 1` in tests to have output file written immediately)
255261

256262
## Version 2.10.1
257-
* shortcuts can have any length, shortcuts to set _Feature=Value_ pairs
263+
* shortcuts can have any length, shortcuts to set *Feature=Value* pairs
258264
* new tests
259265

260266
## Version 2.10.0
@@ -331,7 +337,7 @@
331337
* new tests, tests updates
332338

333339
## Version 2.4.2
334-
* option "auto-adapt" which sets the horizontal width of words to the size needed
340+
* option `auto-adapt` which sets the horizontal width of words to the size needed
335341
* added test whether we are on MacOS in start script
336342

337343
## Version 2.4.1
@@ -384,7 +390,7 @@
384390
* bug corrected: missing write
385391

386392
## Version 1.14.5
387-
* bug corrected: NullPointerException at multitokens created with "compose <start> <length>"
393+
* bug corrected: NullPointerException at multitokens created with `compose <start> <length>`
388394

389395
## Version 1.14.4
390396
* factorisation in ConllWord class
@@ -407,7 +413,7 @@
407413
* add xpos and extra columns to LaTeX output
408414

409415
## Version 1.13.0
410-
* can display columns > 10, if present (new button "extra cols")
416+
* can display columns > 10, if present (new button `extra cols`)
411417
* verbosity in test
412418
* tests updated for the extra columns
413419
* corrected bug for right2left display of sentences with empty words

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
#FROM openjdk:17-alpine
21
FROM amazoncorretto:24-jdk
32

4-
ARG VERSION=2.30.0
5-
# docker build --build-arg VERSION=2.30.0 -t jheinecke/conllueditor:2.30.0 .
6-
# docker build --build-arg VERSION=2.30.0 -t jheinecke/conllueditor:latest .
3+
ARG VERSION=2.30.1
4+
# docker build --build-arg VERSION=2.30.1 -t jheinecke/conllueditor:2.30.1 .
5+
# docker build --build-arg VERSION=2.30.1 -t jheinecke/conllueditor:latest .
76
# docker run -t --rm --name conllueditor -p 5555:5555 --user 1000:1000 -v </absolute/path/to/datadir>:/data --env filename=tt.conllu jheinecke/conllueditor:latest
8-
# docker push jheinecke/conllueditor:2.30.0
7+
# docker push jheinecke/conllueditor:2.30.1
98
# docker push jheinecke/conllueditor:latest
109

1110
# docker exec -it conllueditor /bin/sh

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The editor provides the following functionalities:
2626
* finding similar or identical sentence in a list of CoNLL-U files, see section [Find Similar Sentences](#find-similar-sentences)
2727
* [configuring the UI](#ui-configuration) on order to hide unneeded functionalities which otherwise clutter the UI
2828

29-
Current version: 2.30.0 (see [change history](CHANGES.md))
29+
Current version: 2.30.1 (see [change history](CHANGES.md))
3030

3131
ConlluEditor can also be used as front-end to display the results of dependency parsing in the same way as the editor.
3232
* dependency tree/dependency hedge
@@ -397,7 +397,7 @@ The search field on the top right permits to search a sentence by givening a lin
397397
The sentences in which this line number occurs is displayed. If the line number is not a comment line, the word which is on the line is highlighted.
398398
This can be useful to find lines output by the various UD validators.
399399
If sentences are modified at change length (by splitting a word or joining two words, or by adding or deleting comment lines, the line numbers are adapted.
400-
Type in line number in field on the top right and click `line number`:
400+
Type in line number in field on the top right and click `go to line`:
401401

402402
![Search by line number](doc/search_line_number.png)
403403

bin/conlluedit.sh

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ else
2929
fi
3030

3131

32-
echo 1>&2 "jar: $NEWESTJAR"
32+
echo 1>&2 "using: $(readlink -f $NEWESTJAR)"
3333

3434

3535
if [[ "$1" =~ ^Xmx[0-9]g$ ]]; then
@@ -47,6 +47,4 @@ fi
4747

4848
java -Xmx4g -cp $NEWESTJAR com.orange.labs.editor.ConlluEditor ${ROOTDIR} "$@"
4949

50-
51-
5250
#

0 commit comments

Comments
 (0)