fix latex escaping

* src/ltlvisit/print.cc: Property output the double
quotes in latex mode, not only sclatex.
* src/misc/escape.cc: Fix LaTeX escape to work in math mode.
* src/tests/latex.test: Add a test.
* wrap/python/tests/formulas.ipynb: Adjust expected output
* NEWS: Mention the fix.
This commit is contained in:
Alexandre Duret-Lutz 2015-08-13 17:25:00 +02:00
parent 21ff2d0415
commit 2eab0344b9
5 changed files with 14 additions and 9 deletions

View file

@ -416,8 +416,8 @@ namespace spot
{
// Spin 6 supports atomic propositions such as (a == 0)
// as long as they are enclosed in parentheses.
if (kw_ == sclatex_kw || kw_ == sclatex_kw)
escape_latex(os_ << "``\\mathit{", str) << "\\textrm{''}}";
if (kw_ == sclatex_kw || kw_ == latex_kw)
escape_latex(os_ << "``\\mathit{", str) << "}\\textrm{''}";
else if (kw_ != spin_kw)
os_ << '"' << str << '"';
else if (!full_parent_)

View file

@ -54,13 +54,13 @@ namespace spot
switch (i)
{
case '~':
os << "\\textasciitilde";
os << "\\text{\\textasciitilde}";
break;
case '^':
os << "\\textasciicircum";
os << "\\text{\\textasciicircum}";
break;
case '\\':
os << "\\textbackslash";
os << "\\text{\\textbackslash}";
break;
case '&':
case '%':

View file

@ -29,7 +29,7 @@ set -e
(kpsewhich txfonts.sty) || exit 77
(kpsewhich amsmath.sty) || exit 77
cat >input <<EOF
cat >input <<\EOF
XGFa <-> FGX(!b & !c) | (b ^ a)
a U b W c R (d & e) M f
{a;b[=2];((c:d*) && f*);e[*2..]}<>-> {((a | [*0])*;b[+]) & (c1[->2])}[]-> h
@ -37,6 +37,7 @@ a U b W c R (d & e) M f
!{a;b*;c}! -> d
{a*;(b;c)[:*3..4];(c;d)[:+];d}!
G(uglyname->Fuglierlongname42)
"#foo/$bar$" U "baz~yes^no"
EOF
(