corrected terminology: MWT not MTW

Author: jheinecke

CHANGES.md

@@ -1,4 +1,7 @@
 # Changes
+## Version 2.15.1
+* corrected confusion: ConlluEditor deals with MWT (multiword tokens) and not with MTWs...
+
 ## Version 2.15.0
 * added a script to find similar or identical sentences in a single or multiple CoNLL-U files
 
@@ -72,7 +75,7 @@
 * new default for saving: without the option `--saveAfter` the conllu file is saved whenever a new sentence is chosen (next, prec, ...)
   the old behaviour (save every modification immediately) can be achieved using the option `--saveAfter 1`
 * shortcuts can be defined for two keys
-* `mod compose startid length [form]` optional form of the new MTW
+* `mod compose startid length [form]` optional form of the new MWT
 
 ## Version 2.9.1
 * correction: replace `\n` in `MISC:SpacesAfter=` by space in `# text = ` metadata line
@@ -92,20 +95,20 @@
 
 ## Version 2.8.0
 * add `--compare` option to Docker image
-* make `MISC` autocompletion work when editing MTW
-* new command to transform existing word in MTW
+* make `MISC` autocompletion work when editing MWT
+* new command to transform existing word in MWT
 * new tests
 
 ## Version 2.7.5
 * Warning improved
-* bug corrected in MTW creation (delete Space(s)After from MTW member tokens and add value from last memeber token to the MTW token
-* put concatenated forms of created MTW to the FORM column of the MTW
+* bug corrected in MWT creation (delete Space(s)After from MWT member tokens and add value from last memeber token to the MWT token
+* put concatenated forms of created MWT to the FORM column of the MWT
 
 ## Version 2.7.4
 * Error if edited file is not controlled under git AND there is already a backup-file (.2) in order to avoid overwriting the output of a preceding editing
 
 ## Version 2.7.3
-* bug corrected when inserting new MTW and serializing MTWs with Space(s)After to CoNLL-U
+* bug corrected when inserting new MWT and serializing MWTs with Space(s)After to CoNLL-U
 
 ## Version 2.7.2
 * search: find word on multiple criteria
@@ -137,7 +140,7 @@
 
 ## Version 2.4.3
 * multi word token larger, bug for variable size corrected
-* fixing issue #7 (if two words overlapping with a MTW are joined, the MTW will be deleted)
+* fixing issue #7 (if two words overlapping with a MWT are joined, the MWT will be deleted)
 * fixing issue #6 (joining/splitting sentences sets correctly `# text =` metadata)
 * new tests, tests updates
 

README.md

@@ -14,7 +14,7 @@ The editor provides the following functionalities:
 * search: forms, lemmas, UPOS, XPOS, deprels, sentences IDs and comments, sequences of any of these,
       searching for subtrees, importing subtrees from current sentence, sd-parse support
 * edit non-CoNLL-U columns in a subset of [CoNLL-U plus files](http://universaldependencies.org/ext-format.html)
-* create multitoken words from existing words or add a MTW to contract two ore more existing words
+* create multiword tokens from existing words or add a MWT to contract two ore more existing words
 * git support
 * export of dependency graphs as svg or LaTeX (for the [tikz-dependency](https://ctan.org/pkg/tikz-dependency) package or
   the [doc/deptree.sty](doc/deptree.sty) class, see [documentation](doc/deptree-doc.pdf))
@@ -25,7 +25,7 @@ The editor provides the following functionalities:
 * adding Translit= values to the MISC column (transliterating the FORM column) see section [Transliteration](#transliteration)
 * finding similar or identical sentence in a list of CoNLL-U files, see section [Find Similar Sentences](#find-similar-sentences)
 
-Current version: 2.15.0 (see [change history](CHANGES.md))
+Current version: 2.15.1 (see [change history](CHANGES.md))
 
 ConlluEditor can also be used as front-end to display the results of dependency parsing in the same way as the editor.
 * dependency tree/dependency hedge
@@ -312,13 +312,13 @@ tree/graph to open a dialogue which allows to edit or delete the token (i.e. the
 ### Commands to be used with `modify` button:
 
 * `split id [splitpos]` 	split a word in two (it will be copied to a new node and attached to the same head). If `splitpos` is given, the characters of Form and Lemma left of splitpos will remain in the original word, the rest will be the new word
-* `join id` 	merge word with id with the following. If the merged word overlap in any way with a multitoken word (MTW), the MTW will be deleted
+* `join id` 	merge word with id with the following. If the merged word overlap in any way with a multiword token (MWT), the existing MWT will be deleted
 * `insert id form [lemma [upos [xpos]]]` 	add a new word after word with id
-* `delete id` 	delete word with id. Any overlapping MTW will also be deleted
+* `delete id` 	delete word with id. Any overlapping MWT will also be deleted
 * `sentsplit id` 	split current sentence at word id (id will be in the second sentence). Dependency and Enhanced Dependency relations between the words before and after the split will be deleted.
 * `sentjoin` 	merge current sentence with following
-* `compose id length` 	create a multitoken word (MTW). The inserted `n-m` line will contain the form of the word with `id`. In order to edit or delete a multitoken word, click on the multitoken bar at the bottom of the dependency tree or graph. Setting an end value of 0 deletes the multitoken word.
-* `tomtw id form1 form2 [form3 ...]` 	Transform an existing word into a MTW. The new MTW keeps the form of the word transformed. All other columns are copied to the first member word, except the form which is `form1` from the command line. `form2` etc are used to initialize the form (and lemma) column of the other members of the MTW. All members are initially attached to the first member using the fixed depedency relation.
+* `compose id length` 	create a multiword token (MWT). The inserted `n-m` line will contain the form of the word with `id`. In order to edit or delete a multiword token, click on the multiword bar at the bottom of the dependency tree or graph. Setting an end value of 0 deletes the multiword token.
+* `tomwt id form1 form2 [form3 ...]` 	Transform an existing word into a MWT. The new MWT keeps the form of the word transformed. All other columns are copied to the first member word, except the form which is `form1` from the command line. `form2` etc are used to initialize the form (and lemma) column of the other members of the MWT. All members are initially attached to the first member using the fixed depedency relation.
 * `emptyinsert id form [lemma [upos [xpos]]]` 	add a new empty word after word with `id`. The new empty word gets the id `id.1`, if it is the first empty word at thihs position. If there is already an empty word, the new one will have the id `id.2` etc.
 * `emptydelete id.subid` 	delete empty word with id `id.subid`.
 

doc/deptree-doc.pdf

@@ -140,8 +140,8 @@ \section{Customisation}
 \item \verb:\setwordfont{\sf}: font for word nodes (form and POS, unless the latter is overriden)
 \item \verb:\setposfont{\sf}: font for POS in word nodes
 \item \verb:\setbottomwordfont{\sf}: font for words on the bottom line
-\item \verb:\setmtwfont{\it\scriptsize}: font for multiword token (bottom line)
-\item \verb:\setmtwlabelcolor{blue!10}: background colour for multiword token
+\item \verb:\setmwtfont{\it\scriptsize}: font for multiword token (bottom line)
+\item \verb:\setmwtlabelcolor{blue!10}: background colour for multiword token
 \end{itemize}
 
 The \verb:set*font: commands accept any font command, including new
@@ -161,8 +161,8 @@ \section{Customisation}
 \setwordfont{\large\sf}
 \setposfont{\rm\small}
 \setbottomwordfont{\footnotesize\sf}
-\setmtwfont{\it\scriptsize}
-\setmtwlabelcolor{blue!10}
+\setmwtfont{\it\scriptsize}
+\setmwtlabelcolor{blue!10}
 \end{verbatim}
 \caption{customization}\label{def2}
 \end{figure}
@@ -177,8 +177,8 @@ \section{Customisation}
 \setwordfont{\large\sf}
 \setposfont{\rm\small}
 \setbottomwordfont{\footnotesize\sf}
-\setmtwfont{\it\scriptsize}
-\setmtwlabelcolor{blue!10}
+\setmwtfont{\it\scriptsize}
+\setmwtlabelcolor{blue!10}
 
 
 

doc/deptree-doc.tex

@@ -8,14 +8,14 @@
 \def\@deprelcolor{black} % line
 \def\@depreltextcolor{black} % text
 \def\@deprellabelcolor{gray} % frame
-\def\@mtwlabelcolor{black!7} % frame
+\def\@mwtlabelcolor{black!7} % frame
 \def\@deprelbgcolor{black!5}
 \def\@depreltextfont{\footnotesize} 
 \def\@wordfont{}
 \def\@wordcolor{black}
 \def\@bottomwordfont{\small} 
 \def\@posfont{} 
-\def\@mtwfont{\scriptsize} 
+\def\@mwtfont{\scriptsize} 
 % define styles for arrows, words and dep labels
 \tikzstyle{dottedline} = [draw, dashed, color=gray]
 \tikzstyle{line} = [draw, very thick, color=\@deprelcolor, -latex']
@@ -69,8 +69,8 @@
                   rounded corners]
 
 \tikzstyle{wglabel} = [draw=black,
-                       font=\@mtwfont,
-                       fill=\@mtwlabelcolor,
+                       font=\@mwtfont,
+                       fill=\@mwtlabelcolor,
                        rounded corners]
 
 
@@ -85,8 +85,8 @@
 \def\setwordcolor#1{\def\@wordcolor{#1}}
 \def\setbottomwordfont#1{\def\@bottomwordfont{#1}}
 \def\setposfont#1{\def\@posfont{#1}}
-\def\setmtwfont#1{\def\@mtwfont{#1}}
-\def\setmtwlabelcolor#1{\def\@mtwlabelcolor{#1}}
+\def\setmwtfont#1{\def\@mwtfont{#1}}
+\def\setmwtlabelcolor#1{\def\@mwtlabelcolor{#1}}
 
 \def\@bottom{0}
 \def\setbottom#1{\def\@bottom{#1}}

doc/deptree.sty

@@ -1,6 +1,6 @@
 /** This library is under the 3-Clause BSD License
 
- Copyright (c) 2018-2021, Orange S.A.
+ Copyright (c) 2018-2022, Orange S.A.
 
  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:
@@ -28,7 +28,7 @@
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
  @author Johannes Heinecke
- @version 2.14.2 as of 29th December 2021
+ @version 2.15.1 as of 8th February 2022
  */
 
 
@@ -319,7 +319,7 @@ function getServerInfo() {
                 function extractLast(term) {
                     return split(term).pop();
                 }
-                // use class here to make MISC-autocompletion work in editMTW and wordedit
+                // use class here to make MISC-autocompletion work in editMWT and wordedit
                 $(".classmisc") //$("#cmisc")
                 .on("keydown", function(event) {
                     if (event.keyCode === $.ui.keyCode.TAB && $(this).autocomplete("instance").menu.active) {
@@ -693,7 +693,7 @@ function getWordLengthsOfTree(item, maxlen) {
 }
 
 var conllwords = {}; // all words of current sentence
-var mtws = {}; // all multitoke words of current sentence
+var mwts = {}; // all multiword tokens of current sentence
 var clickedNodes = [];
 var unprocessedkeystrokes = []; // process multi key shortcuts
 var deprels = [];
@@ -1103,25 +1103,25 @@ function ModifyTree(evt) {
             $("#enhdeprelEdit").modal();
         } else if (id[0] == "mwe") {
             //alert("MT MWE: " + id + " " + target);
-            $("#currentMTWfrom").val(id[1]);
-            $("#currentMTWto").val(id[2]);
-            $("#currentMTWform").val(id[3]);
+            $("#currentMWTfrom").val(id[1]);
+            $("#currentMWTto").val(id[2]);
+            $("#currentMWTform").val(id[3]);
 
             var mc = "";
 
-            if (mtws[id[1]].misc != undefined) {
-                    for (e = 0; e < mtws[id[1]].misc.length; ++e) {
-                        var mch = mtws[id[1]].misc[e];
+            if (mwts[id[1]].misc != undefined) {
+                    for (e = 0; e < mwts[id[1]].misc.length; ++e) {
+                        var mch = mwts[id[1]].misc[e];
                         if (e > 0)
                             mc += "#"; //\n";
                         mc += mch.name + "=" + mch.val;
                     }
                 } else
                     mc = "_";
-            $("#currentMTWmisc").val(mc)
+            $("#currentMWTmisc").val(mc)
 
 
-            $("#editMTW").modal();
+            $("#editMWT").modal();
 
             $("#mods").val("");
 
@@ -1438,11 +1438,11 @@ function formatPhrase(item) {
         }
 
         // create similar table for MWE
-        mtws = {};
+        mwts = {};
         for (wid in conllwords) {
             cw = conllwords[wid];
             if (cw.mwe != undefined) {
-                mtws[wid] = cw.mwe;
+                mwts[wid] = cw.mwe;
             }
         }
     }
@@ -1622,15 +1622,15 @@ $(document).ready(function () {
 
     });
 
-    /* delete clicked MTW form */
+    /* delete clicked MWT form */
     $('#editMWtoken').click(function () {
-        misc = $("#currentMTWmisc").val(); //.replace(/\n+/, ",");
-        sendmodifs({"cmd": "mod editmtw "
-                    + $("#currentMTWfrom").val()
-                    + " " + $("#currentMTWto").val()
-                    + " " + $("#currentMTWform").val()
+        misc = $("#currentMWTmisc").val(); //.replace(/\n+/, ",");
+        sendmodifs({"cmd": "mod editmwt "
+                    + $("#currentMWTfrom").val()
+                    + " " + $("#currentMWTto").val()
+                    + " " + $("#currentMWTform").val()
                     + " " + misc});
-        $('#editMTW').modal('hide');
+        $('#editMWT').modal('hide');
     });