libtextstyle: Fix test-term-ostream-xterm test failure on TrueOS and Trident.

The xterm description on these platforms includes support for italics.

Reported by Nelson H. F. Beebe.

* libtextstyle/gnulib-local/tests/test-term-ostream-xterm-freebsd-italic.out:
New file.
* libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh: Use it as possible
expected result.
* libtextstyle/gnulib-local/modules/term-ostream-tests (Files): Add it.

diff --git a/libtextstyle/gnulib-local/modules/term-ostream-tests b/libtextstyle/gnulib-local/modules/term-ostream-tests
index f6613bcb77758a398dcb5898a24cdebf6d7c11a0..691a38041c2f2d56b0d372c585d312ffbd35b469 100644 (file)
--- a/libtextstyle/gnulib-local/modules/term-ostream-tests
+++ b/libtextstyle/gnulib-local/modules/term-ostream-tests
@@ -6,6 +6,7 @@ tests/test-term-ostream-xterm-xf86-v32.out
 tests/test-term-ostream-xterm-basic.out
 tests/test-term-ostream-xterm-basic-italic.out
 tests/test-term-ostream-xterm-freebsd101.out
+tests/test-term-ostream-xterm-freebsd-italic.out
 tests/test-term-ostream-xterm-8bit.out
 tests/test-term-ostream-xterm-linux-debian.out
 tests/test-term-ostream-xterm-linux-mandriva.out

diff --git a/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-freebsd-italic.out b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-freebsd-italic.out
new file mode 100644 (file)
index 0000000..1db36d5
--- /dev/null
+++ b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm-freebsd-italic.out
@@ -0,0 +1,131 @@
+Colors (foreground/background):
+       |black  |blue   |green  |cyan   |red    |magenta|yellow |white  |default
+black  |\e[30m\e[40m Words \e[39;49m|\e[30m\e[44m Words \e[39;49m|\e[30m\e[42m Words \e[39;49m|\e[30m\e[46m Words \e[39;49m|\e[30m\e[41m Words \e[39;49m|\e[30m\e[45m Words \e[39;49m|\e[30m\e[43m Words \e[39;49m|\e[30m\e[47m Words \e[39;49m|\e[30m Words \e[39;49m
+blue   |\e[34m\e[40m Words \e[39;49m|\e[34m\e[44m Words \e[39;49m|\e[34m\e[42m Words \e[39;49m|\e[34m\e[46m Words \e[39;49m|\e[34m\e[41m Words \e[39;49m|\e[34m\e[45m Words \e[39;49m|\e[34m\e[43m Words \e[39;49m|\e[34m\e[47m Words \e[39;49m|\e[34m Words \e[39;49m
+green  |\e[32m\e[40m Words \e[39;49m|\e[32m\e[44m Words \e[39;49m|\e[32m\e[42m Words \e[39;49m|\e[32m\e[46m Words \e[39;49m|\e[32m\e[41m Words \e[39;49m|\e[32m\e[45m Words \e[39;49m|\e[32m\e[43m Words \e[39;49m|\e[32m\e[47m Words \e[39;49m|\e[32m Words \e[39;49m
+cyan   |\e[36m\e[40m Words \e[39;49m|\e[36m\e[44m Words \e[39;49m|\e[36m\e[42m Words \e[39;49m|\e[36m\e[46m Words \e[39;49m|\e[36m\e[41m Words \e[39;49m|\e[36m\e[45m Words \e[39;49m|\e[36m\e[43m Words \e[39;49m|\e[36m\e[47m Words \e[39;49m|\e[36m Words \e[39;49m
+red    |\e[31m\e[40m Words \e[39;49m|\e[31m\e[44m Words \e[39;49m|\e[31m\e[42m Words \e[39;49m|\e[31m\e[46m Words \e[39;49m|\e[31m\e[41m Words \e[39;49m|\e[31m\e[45m Words \e[39;49m|\e[31m\e[43m Words \e[39;49m|\e[31m\e[47m Words \e[39;49m|\e[31m Words \e[39;49m
+magenta|\e[35m\e[40m Words \e[39;49m|\e[35m\e[44m Words \e[39;49m|\e[35m\e[42m Words \e[39;49m|\e[35m\e[46m Words \e[39;49m|\e[35m\e[41m Words \e[39;49m|\e[35m\e[45m Words \e[39;49m|\e[35m\e[43m Words \e[39;49m|\e[35m\e[47m Words \e[39;49m|\e[35m Words \e[39;49m
+yellow |\e[33m\e[40m Words \e[39;49m|\e[33m\e[44m Words \e[39;49m|\e[33m\e[42m Words \e[39;49m|\e[33m\e[46m Words \e[39;49m|\e[33m\e[41m Words \e[39;49m|\e[33m\e[45m Words \e[39;49m|\e[33m\e[43m Words \e[39;49m|\e[33m\e[47m Words \e[39;49m|\e[33m Words \e[39;49m
+white  |\e[37m\e[40m Words \e[39;49m|\e[37m\e[44m Words \e[39;49m|\e[37m\e[42m Words \e[39;49m|\e[37m\e[46m Words \e[39;49m|\e[37m\e[41m Words \e[39;49m|\e[37m\e[45m Words \e[39;49m|\e[37m\e[43m Words \e[39;49m|\e[37m\e[47m Words \e[39;49m|\e[37m Words \e[39;49m
+default|\e[40m Words \e[39;49m|\e[44m Words \e[39;49m|\e[42m Words \e[39;49m|\e[46m Words \e[39;49m|\e[41m Words \e[39;49m|\e[45m Words \e[39;49m|\e[43m Words \e[39;49m|\e[47m Words \e[39;49m| Words 
+
+Colors (hue/saturation):
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[43m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[42m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[46m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[44m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[45m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+\e[41m                                                            \e[47m     \e[39;49m
+
+Weights:
+normal, \e[1mbold, \e[mdefault 
+
+Postures:
+normal, \e[3mitalic, \e[23mdefault 
+
+Text decorations:
+normal, \e[4munderlined, \e[24mdefault 
+

diff --git a/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh
index 05a0c84159613071bbc3efcad45713d2f2650fef..a3a2b12ecdd4f3b4cdaa0f95182d54057a04dae8 100755 (executable)
--- a/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh
+++ b/libtextstyle/gnulib-local/tests/test-term-ostream-xterm.sh
@@ -24,6 +24,7 @@ LC_ALL=C tr -d '\r' < out1 > out
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-basic.out          out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-basic-italic.out   out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-freebsd101.out     out > /dev/null \
+|| ${DIFF} ${srcdir}/test-term-ostream-xterm-freebsd-italic.out out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-8bit.out           out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-linux-debian.out   out > /dev/null \
 || ${DIFF} ${srcdir}/test-term-ostream-xterm-linux-mandriva.out out > /dev/null \