braille: make sure liblouis emits pure BRF output

We need to make sure to use the brf table first, in case the table being
used defines other display encodings.

diff --git a/filter/braille/filters/musicxmltobrf.in b/filter/braille/filters/musicxmltobrf.in
index 91a09215972439a5f1a2562343b844739a20f62c..ff1c3521d1fc3cd19d01bd54163505e7f356d05d 100644 (file)
--- a/filter/braille/filters/musicxmltobrf.in
+++ b/filter/braille/filters/musicxmltobrf.in
@@ -40,7 +40,7 @@ checkTool FreeDots FreeDots "translating musicxml files"
 checkTool lou_translate liblouis "translating musicxml files"
 
 CONVERT="FreeDots -nw -w $TEXTWIDTH /dev/stdin"
-TRANSLATE="lou_translate $LIBLOUIS_TABLES,braille-patterns.cti"
+TRANSLATE="lou_translate en-us-brf.dis,$LIBLOUIS_TABLES,braille-patterns.cti"
 
 cd $TMPDIR
 echo "INFO: Translating MusicXML" >&2

diff --git a/filter/braille/filters/texttobrf.in b/filter/braille/filters/texttobrf.in
index 0fe6ed9109fe8f35369448a5f0d8cce598d95b27..9df9b0e0274492014bbdb4f8799d155db5eac630 100755 (executable)
--- a/filter/braille/filters/texttobrf.in
+++ b/filter/braille/filters/texttobrf.in
@@ -154,13 +154,13 @@ then
        exit 1
        ;;
     esac
-    RENDER_CALL="$LIBLOUIS_TOOL -CliteraryTextTable=$LIBLOUIS_TABLES,braille-patterns.cti $LIBLOUIS_CONFIG"
+    RENDER_CALL="$LIBLOUIS_TOOL -CliteraryTextTable=en-us-brf.dis,$LIBLOUIS_TABLES,braille-patterns.cti $LIBLOUIS_CONFIG"
   elif type lou_translate > /dev/null
   then
     # Only liblouis, but better than nothing
     setupTextRendering
     printf "WARN: The liblouisutdml package is required for translating braille better\n" >&2
-    TRANSLATE="lou_translate $LIBLOUIS_TABLES,braille-patterns.cti"
+    TRANSLATE="lou_translate en-us-brf.dis,$LIBLOUIS_TABLES,braille-patterns.cti"
   else
     printf "ERROR: The liblouisutdml package is required for translating braille\n" >&2
     exit 1