braille: add option to pick hyph rule according to current locale

and make it the default for second translation table.

diff --git a/Makefile.am b/Makefile.am
index d93e986d8b95fc1981fafc052d1e25ff65f3cff0..6d2e32a4883cb0e7a419fd92b0c8ed6a454ed8a0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -318,16 +318,23 @@ genppdcfiles = \
 pkgppdc_DATA = $(genppdcfiles)
 
 GENERATED_LIBLOUIS = \
-       filter/braille/filters/liblouis2.defs \
        filter/braille/filters/liblouis3.defs \
        filter/braille/filters/liblouis4.defs
 GENERATED_DEFS = \
        filter/braille/filters/liblouis1.defs \
+       filter/braille/filters/liblouis2.defs \
        $(GENERATED_LIBLOUIS)
 
 filter/braille/filters/liblouis1.defs: filter/braille/filters/liblouis1.defs.gen
        $< > $@
 
+filter/braille/filters/liblouis2.defs: filter/braille/filters/liblouis1.defs
+       sed -e "s/Braille transcription/Additional Braille transcription (2)/" \
+           -e "s/^  \\*Choice /  Choice /" \
+           -e "s/^  Choice \"HyphLocale\//  *Choice \"HyphLocale\//" \
+           -e s/LibLouis/LibLouis2/ \
+           < $< > $@
+
 $(GENERATED_LIBLOUIS): filter/braille/filters/liblouis%.defs: filter/braille/filters/liblouis1.defs
        sed -e "s/Braille transcription/Additional Braille transcription ($*)/" \
            -e "s/^  \\*Choice /  Choice /" \

diff --git a/filter/braille/drivers/common/fr-braille.po b/filter/braille/drivers/common/fr-braille.po
index 3f0181d4fae25dbc7abe520fe1de3865a38cf1b4..dccfa6b10995147b7fb440ed491ae66c943b5b67 100644 (file)
--- a/filter/braille/drivers/common/fr-braille.po
+++ b/filter/braille/drivers/common/fr-braille.po
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2017 Samuel Thibault <samuel.thibault@ens-lyon.org>
+# Copyright (c) 2015, 2017-2018 Samuel Thibault <samuel.thibault@ens-lyon.org>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -67,6 +67,9 @@ msgstr "Par défaut pour la langue grade 2"
 msgid "Default for language grade 3"
 msgstr "Par défaut pour la langue grade 3"
 
+msgid "Default hyphenation rules for language"
+msgstr "Règles de césure par défaut pour la langue"
+
 msgid "Text dot distance"
 msgstr "Distance points texte"
 

diff --git a/filter/braille/filters/cups-braille.sh.in b/filter/braille/filters/cups-braille.sh.in
index bc6c5d74738c40b4e7bc3d51fa0af9362ca0f97f..fa29ceeee686f6c54320a40306ac3aa8e16a28e8 100644 (file)
--- a/filter/braille/filters/cups-braille.sh.in
+++ b/filter/braille/filters/cups-braille.sh.in
@@ -403,6 +403,16 @@ getOptionLibLouis () {
       printf None
       exit 1
       ;;
+    HyphLocale)
+      if [ -f "$TABLESDIR/hyph_$LOCALE.dic" ]; then
+       printf "%s" "hyph_$LOCALE.dic"
+      elif [ -f "$TABLESDIR/hyph_$LANGUAGE.dic" ]; then
+       printf "%s" "hyph_$LANGUAGE.dic"
+      else
+        printf "WARN: Could not find $OPTION hyphenation table with locale %s\n" "$LOCALE" >&2
+       printf None
+      fi
+      ;;
     *)
       [ -f "$TABLESDIR/$VALUE".utb ] && VALUE="$VALUE".utb
       [ -f "$TABLESDIR/$VALUE".ctb ] && VALUE="$VALUE".ctb

diff --git a/filter/braille/filters/liblouis1.defs.gen.in b/filter/braille/filters/liblouis1.defs.gen.in
index aab3ff38877f7d9eeeb57c2db4c110033056d334..ae7480327d6885f3f01887c4699b5146c8b201be 100644 (file)
--- a/filter/braille/filters/liblouis1.defs.gen.in
+++ b/filter/braille/filters/liblouis1.defs.gen.in
@@ -34,6 +34,7 @@ echo '  Choice "Locale-g0/Default for language grade 0" ""'
 echo '  Choice "Locale-g1/Default for language grade 1" ""'
 echo '  Choice "Locale-g2/Default for language grade 2" ""'
 echo '  Choice "Locale-g3/Default for language grade 3" ""'
+echo '  Choice "HyphLocale/Default hyphenation rules for language" ""'
 
 (
   for i in $TABLESDIR/*.utb $TABLESDIR/*.ctb