Add --strip option to languagetool

Author: Nopey

cmake-scripts/BuildLanguages.cmake

@@ -82,7 +82,7 @@ foreach(LANG ${OMF_LANGS})
         DEPENDS "${TXT2}" "${BASE_TXT}" "${BASE_DAT}"
         BYPRODUCTS "${LNG}"
         COMMAND ${CMAKE_COMMAND} -E echo_append "${LANG}, "
-        COMMAND ${OMF_COMMAND_WRAPPER} "$<TARGET_FILE:languagetool>" --import "${BASE_TXT}" --import "${TXT2}" --base "${BASE_DAT}" --base-count "${OMF_STR_COUNT}" --output "${LNG}" --check-count ${Lang_Count}
+        COMMAND ${OMF_COMMAND_WRAPPER} "$<TARGET_FILE:languagetool>" --import "${BASE_TXT}" --import "${TXT2}" --base "${BASE_DAT}" --base-count "${OMF_STR_COUNT}" --strip --output "${LNG}" --check-count ${Lang_Count}
     )
     install(FILES "${LNG}" DESTINATION "${LANGUAGE_INSTALL_PATH}")
 endforeach()
@@ -94,7 +94,7 @@ foreach(LANG ${OPENOMF_LANGS})
         DEPENDS "${TXT}"
         BYPRODUCTS "{LNG}"
         COMMAND ${CMAKE_COMMAND} -E echo_append "${LANG}, "
-        COMMAND ${OMF_COMMAND_WRAPPER} "$<TARGET_FILE:languagetool>" --import "${TXT}" --output "${LNG}" --check-count ${Lang_Count}
+        COMMAND ${OMF_COMMAND_WRAPPER} "$<TARGET_FILE:languagetool>" --import "${TXT}" --strip --output "${LNG}" --check-count ${Lang_Count}
     )
     install(FILES "${LNG}" DESTINATION "${LANGUAGE_INSTALL_PATH}")
 endforeach()

src/utils/str.c

@@ -197,7 +197,7 @@ static size_t _strip_size(const str *src, bool left) {
     const char *ptr = str_c(src);
     for(size_t i = 0; i < src->len; i++) {
         pos = left ? i : src->len - i - 1;
-        if(!isspace(ptr[pos])) {
+        if(!isspace((unsigned char)ptr[pos])) {
             return pos;
         }
     }

tools/languagetool/main.c

@@ -380,11 +380,12 @@ int main(int argc, char *argv[]) {
     struct arg_int *base_count =
         arg_int0(NULL, "base-count", "<file>", "Check and ensure base language has this many strings");
     struct arg_int *str = arg_int0("s", "string", "<value>", "display language string number");
+    struct arg_lit *strip = arg_lit0(NULL, "strip", "strip leading and trailing whitespace");
     struct arg_file *output = arg_file0("o", "output", "<file>", "compile output language file");
     struct arg_int *check_count =
         arg_int0("c", "check-count", "<NUM>", "Check that language file has this many entries, or bail.");
     struct arg_end *end = arg_end(20);
-    void *argtable[] = {help, vers, file, input, base, base_count, output, str, check_count, end};
+    void *argtable[] = {help, vers, file, input, base, base_count, strip, output, str, check_count, end};
     const char *progname = "languagetool";
 
     bool language_is_utf8 = false;
@@ -432,10 +433,7 @@ int main(int argc, char *argv[]) {
         goto exit_0;
     }
 
-    if(file->count > 1) {
-        fprintf(stderr, "Too many input files provided! please supply one --file.\n");
-        goto exit_0;
-    } else if(file->count > 1 && input->count > 1) {
+    if(file->count > 1 && input->count > 1) {
         fprintf(stderr, "--import and --file arguments are incompatible.\n");
         goto exit_0;
     } else if(file->count + input->count < 1) {
@@ -446,16 +444,10 @@ int main(int argc, char *argv[]) {
     if(base->count > 0 && input->count == 0) {
         fprintf(stderr, "Unexpected --base argument: it is meaningless without --import.\n");
         goto exit_0;
-    } else if(base->count > 1) {
-        fprintf(stderr, "Too many --base arguments: please supply only one.\n");
-        goto exit_0;
     }
     if(base_count->count > 0 && base->count == 0) {
         fprintf(stderr, "Unexpected --base-count argument: it is meaningless without --base.\n");
         goto exit_0;
-    } else if(base_count->count > 1) {
-        fprintf(stderr, "Too many --base-count arguments: please supply only one.\n");
-        goto exit_0;
     }
 
     int ret;
@@ -529,6 +521,16 @@ int main(int argc, char *argv[]) {
         goto exit_0;
     }
 
+    if(strip->count) {
+        struct str s;
+        for(unsigned int id = 0; id < language.count; id++) {
+            str_from_c(&s, language.strings[id].data);
+            str_strip(&s);
+            memcpy(language.strings[id].data, str_c(&s), str_size(&s) + 1);
+            str_free(&s);
+        }
+    }
+
     // Print
     const sd_lang_string *ds;
     if(str->count > 0) {