Update to v0.5.1

Author: HubTou

README.md

@@ -11,8 +11,8 @@ conjuguer — conjugaison des verbes Francais
 \[-c|--columns NUM\]
 \[-d|--dictionary PATH\]
 \[-n|--nocolor\]
-\[-D|--DELA\]
 \[-A|--ABU\]
+\[-D|--DELA\]
 \[--debug\]
 \[--help|-?\]
 \[--locale LANG\]
@@ -33,14 +33,16 @@ The dictionary will be selected from the *DICTPATH* environment variable,
 or obtained from the *-d|--dictionary* option if used.
 The dictionary type is automatically detected.
 
+You can convert entries from a dictionary format to the other, using the *-A|--ABU* and *-D|--DELA* options.
+
 ### OPTIONS
 Options | Use
 ------- | ---
 -c\|--columns NUM|Choose number of columns to display between 1, 2 or 4
 -d\|--dictionary PATH|Select a specific dictionary
 -n\|--nocolor|Disable color output
--D\|--DELA|Enable DELA format output
 -A\|--ABU|Enable ABU format output
+-D\|--DELA|Enable DELA format output
 --debug|Enable debug mode
 --help\|-?|Print usage and a short help message and exit
 --locale LANG|Override environment to select another language
@@ -92,6 +94,8 @@ The results are only as good (or bad) as what's included in the dictionary used.
 The data in both the ABU and DELA dictionaries obviously contains errors, often on the same verbs...
 I do not know yet the proportion of correct conjugations.
 
+When converting from a dictionary format to the other, you'll lose semantics information (such a +z1, +AE, etc.).
+
 ## BUGS
 There are probably lots of peculiarities that would need specific processing,
 the verbs conjugated with the "être" auxiliary when used with a pronoun for example.

man/conjuguer.1

@@ -9,8 +9,8 @@
 .Op Fl c|--columns Ar NUM
 .Op Fl d|--dictionary Ar PATH
 .Op Fl n|--nocolor
-.Op Fl D|--DELA
 .Op Fl A|--ABU
+.Op Fl D|--DELA
 .Op Fl -debug
 .Op Fl -help|-?
 .Op Fl -locale Ar LANG
@@ -38,6 +38,12 @@ The dictionary will be selected from the
 environment variable, or obtained from the
 .Fl d|--dictionary
 option if used. The dictionary type is automatically detected.
+.Pp
+You can convert entries from a dictionary format to the other, using the
+.Fl A|--ABU
+and
+.Fl D|--DELA
+options.
 .Ss OPTIONS
 .Op Fl c|--columns Ar NUM
 Choose number of columns to display between 1, 2 or 4
@@ -48,12 +54,12 @@ Select a specific dictionary
 .Op Fl n|--nocolor
 Disable color output
 .Pp
-.Op Fl D|--DELA
-Enable DELA format output
-.Pp
 .Op Fl A|--ABU
 Enable ABU format output
 .Pp
+.Op Fl D|--DELA
+Enable DELA format output
+.Pp
 .Op Fl -debug
 Enable debug mode
 .Pp
@@ -121,6 +127,8 @@ for stripping ANSI sequences in strings.
 The results are only as good (or bad) as what's included in the dictionary used.
 The data in both the ABU and DELA dictionaries obviously contains errors, often on the same verbs...
 I do not know yet the proportion of correct conjugations.
+.Pp
+When converting from a dictionary format to the other, you'll lose semantics information (such a +z1, +AE, etc.).
 .Sh BUGS
 There are probably lots of peculiarities that would need specific processing,
 the verbs conjugated with the "etre" auxiliary when used with a pronoun for example.

setup.cfg

@@ -3,7 +3,7 @@ name = pnu_conjuguer
 description = conjugaison des verbes Français
 long_description = file: README.md
 long_description_content_type = text/markdown
-version = 0.5.0
+version = 0.5.1
 license = BSD 3-Clause License
 license_files = License
 author = Hubert Tournier

src/conjuguer/main.py

@@ -21,7 +21,7 @@
 from .blank import blank_verb
 
 # Version string used by the what(1) and ident(1) commands:
-ID = "@(#) $Id: conjuguer - conjugaison des verbes Français v0.5.0 (October 3, 2021) by Hubert Tournier $"
+ID = "@(#) $Id: conjuguer - conjugaison des verbes Français v0.5.1 (October 10, 2021) by Hubert Tournier $"
 
 # Default parameters. Can be overcome by environment variables, then command line options
 parameters = {
@@ -106,7 +106,7 @@ def display_help():
     print(_("usage: conjuguer [--debug] [--help|-?] [--locale LANG] [--version]"), file=sys.stderr)
     print(
         "       "
-        + _("[-c|--columns NUMBER] [-n|--nocolor] [-D|--DELA] [-A|--ABU]"),
+        + _("[-c|--columns NUMBER] [-n|--nocolor] [-A|--ABU] [-D|--DELA]"),
         file=sys.stderr
     )
     print("       " + _("[-d|--dictionary PATH]"), file=sys.stderr)
@@ -121,8 +121,8 @@ def display_help():
     )
     print("  " + _("-d|--dictionary PATH  Select a specific dictionary"), file=sys.stderr)
     print("  " + _("-n|--nocolor          Disable color output"), file=sys.stderr)
-    print("  " + _("-D|--DELA             Enable DELA format output"), file=sys.stderr)
     print("  " + _("-A|--ABU              Enable ABU format output"), file=sys.stderr)
+    print("  " + _("-D|--DELA             Enable DELA format output"), file=sys.stderr)
     print("  " + _("--debug               Enable debug mode"), file=sys.stderr)
     print(
         "  " + _("--help|-?             Print usage and this help message and exit"),
@@ -531,6 +531,9 @@ def fill_verb_from_abu_dictionary_data(verb, conjugations, auxiliary):
             number = ""
             person = ""
             gender = ""
+            if len(part) == 1:
+                number = "s"
+                gender = "m"
             if len(part) >= 2:
                 if part[1] == "SG":
                     number = "s"
@@ -1008,6 +1011,15 @@ def print_ABU_inflections(verb):
         print("{}	{}	Ver{}".format(key, verb["Infinitif"]["Présent"], inflected_verb[key]))
 
 
+################################################################################
+def escape_DELA_special_characters(verb):
+    """Escape "-", "," and "." characters with a backslash"""
+    verb = verb.replace("-", "\\-")
+    verb = verb.replace(",", "\\,")
+    verb = verb.replace(".", "\\.")
+    return verb
+
+
 ################################################################################
 def print_DELA_inflections(verb):
     """Print a verb conjugations in DELA format"""
@@ -1034,9 +1046,20 @@ def print_DELA_inflections(verb):
 
     for key in inflected_verb.keys():
         if key == verb["Infinitif"]["Présent"]:
-            print("{},.V{}".format(key, inflected_verb[key]))
+            print(
+                "{},.V{}".format(
+                    escape_DELA_special_characters(key),
+                    inflected_verb[key]
+                )
+            )
         else:
-            print("{},{}.V{}".format(key, verb["Infinitif"]["Présent"], inflected_verb[key]))
+            print(
+                "{},{}.V{}".format(
+                    escape_DELA_special_characters(key),
+                    escape_DELA_special_characters(verb["Infinitif"]["Présent"]),
+                    inflected_verb[key]
+                )
+            )
 
 
 ################################################################################

src/conjuguer/po/conjuguer.pot

@@ -7,10 +7,10 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: conjuguer 0.5.0\n"
+"Project-Id-Version: conjuguer 0.5.1\n"
 "Report-Msgid-Bugs-To: hubert.tournier@gmail.com\n"
 "POT-Creation-Date: 2021-09-19 10:30:+0200\n"
-"PO-Revision-Date: 2021-10-03 23:26:+0200\n"
+"PO-Revision-Date: 2021-10-10 08:32:+0200\n"
 "Last-Translator: Hubert Tournier <hubert.tournier@gmail.com>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -24,7 +24,7 @@ msgstr ""
 msgid "usage: conjuguer [--debug] [--help|-?] [--locale LANG] [--version]"
 msgstr ""
 
-msgid "[-c|--columns NUMBER] [-n|--nocolor] [-D|--DELA] [-A|--ABU]"
+msgid "[-c|--columns NUMBER] [-n|--nocolor] [-A|--ABU] [-D|--DELA]"
 msgstr ""
 
 msgid "[-d|--dictionary PATH]"

src/conjuguer/po/en/conjuguer.po

@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: conjuguer 0.5.0\n"
+"Project-Id-Version: conjuguer 0.5.1\n"
 "Report-Msgid-Bugs-To: hubert.tournier@gmail.com\n"
 "POT-Creation-Date: 2021-09-19 10:30:+0200\n"
-"PO-Revision-Date: 2021-10-03 23:27+0200\n"
+"PO-Revision-Date: 2021-10-10 08:34+0200\n"
 "Last-Translator: Hubert Tournier <hubert.tournier@gmail.com>\n"
 "Language-Team: English\n"
 "Language: en\n"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "usage: conjuguer [--debug] [--help|-?] [--locale LANG] [--version]"
 msgstr "usage: conjuguer [--debug] [--help|-?] [--locale LANG] [--version]"
 
-msgid "[-c|--columns NUMBER] [-n|--nocolor] [-D|--DELA] [-A|--ABU]"
-msgstr "[-c|--columns NUMBER] [-n|--nocolor] [-D|--DELA] [-A|--ABU]"
+msgid "[-c|--columns NUMBER] [-n|--nocolor] [-A|--ABU] [-D|--DELA]"
+msgstr "[-c|--columns NUMBER] [-n|--nocolor] [-A|--ABU] [-D|--DELA]"
 
 msgid "[-d|--dictionary PATH]"
 msgstr "[-d|--dictionary PATH]"

src/conjuguer/po/fr/conjuguer.po

@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: conjuguer 0.5.0\n"
+"Project-Id-Version: conjuguer 0.5.1\n"
 "Report-Msgid-Bugs-To: hubert.tournier@gmail.com\n"
 "POT-Creation-Date: 2021-09-19 10:30:+0200\n"
-"PO-Revision-Date: 2021-10-03 23:28+0200\n"
+"PO-Revision-Date: 2021-10-10 08:34+0200\n"
 "Last-Translator: Hubert Tournier <hubert.tournier@gmail.com>\n"
 "Language-Team: French <traduc@traduc.org>\n"
 "Language: fr\n"
@@ -23,8 +23,8 @@ msgstr ""
 msgid "usage: conjuguer [--debug] [--help|-?] [--locale LANG] [--version]"
 msgstr "usage: conjuguer [--debug] [--help|-?] [--locale LANGUE] [--version]"
 
-msgid "[-c|--columns NUMBER] [-n|--nocolor] [-D|--DELA] [-A|--ABU]"
-msgstr "[-c|--columns NOMBRE] [-n|--nocolor] [-D|--DELA] [-A|--ABU]"
+msgid "[-c|--columns NUMBER] [-n|--nocolor] [-A|--ABU] [-D|--DELA]"
+msgstr "[-c|--columns NOMBRE] [-n|--nocolor] [-A|--ABU] [-D|--DELA]"
 
 msgid "[-d|--dictionary PATH]"
 msgstr "[-d|--dictionary CHEMIN]"