From 348ad24f16c739f2ae492176dbfc78c452e0af09 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 13 Nov 2017 01:17:47 +0100 Subject: [PATCH] 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. --- filter/braille/filters/musicxmltobrf.in | 2 +- filter/braille/filters/texttobrf.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/filter/braille/filters/musicxmltobrf.in b/filter/braille/filters/musicxmltobrf.in index 91a092159..ff1c3521d 100644 --- 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 0fe6ed910..9df9b0e02 100755 --- 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 -- 2.47.2