diff options
author | Julien Nabet <serval2412@yahoo.fr> | 2017-01-23 21:30:11 +0100 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2017-01-26 18:53:18 +0000 |
commit | 68155a68578a0f4066c1c566c2d378bbae05c216 (patch) | |
tree | 1d2d697e23a350a5f35b4539aef31c55ae0c4403 | |
parent | loplugin:useuniqueptr (diff) | |
download | core-68155a68578a0f4066c1c566c2d378bbae05c216.tar.gz core-68155a68578a0f4066c1c566c2d378bbae05c216.zip |
tdf#105483: let's put lowercase Greek letter in italic
and let uppercase one in non italic
See comments from tdf#52225 in addition to initial description of this one
+ adapt QA tests associated (keep on to test "0" case)
Change-Id: Ia84685fc5d336dd96b97d02c0e81f92e7966a6f1
Reviewed-on: https://gerrit.libreoffice.org/33480
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
-rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Math.xcs | 2 | ||||
-rw-r--r-- | starmath/qa/cppunit/test_node.cxx | 10 | ||||
-rw-r--r-- | starmath/qa/extras/mmlexport-test.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/officecfg/registry/schema/org/openoffice/Office/Math.xcs b/officecfg/registry/schema/org/openoffice/Office/Math.xcs index c89c7795129a..75d88ece69f0 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Math.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Math.xcs @@ -412,7 +412,7 @@ </info> </maxInclusive> </constraints> - <value>0</value> + <value>2</value> </prop> <prop oor:name="ScaleNormalBracket" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: Math/StandardFormat --> diff --git a/starmath/qa/cppunit/test_node.cxx b/starmath/qa/cppunit/test_node.cxx index fbeca91dbdc1..68396b78eb95 100644 --- a/starmath/qa/cppunit/test_node.cxx +++ b/starmath/qa/cppunit/test_node.cxx @@ -105,10 +105,10 @@ void NodeTest::testTdf52225() } while (false) SmFormat aFormat = mxDocShell->GetFormat(); - CPPUNIT_ASSERT_EQUAL(sal_Int16(0), aFormat.GetGreekCharStyle()); // default format + CPPUNIT_ASSERT_EQUAL(sal_Int16(2), aFormat.GetGreekCharStyle()); // default format = 2 CHECK_GREEK_SYMBOL("%ALPHA", 0x0391, false); CHECK_GREEK_SYMBOL("%iALPHA", 0x0391, true); - CHECK_GREEK_SYMBOL("%alpha", 0x03b1, false); + CHECK_GREEK_SYMBOL("%alpha", 0x03b1, true); CHECK_GREEK_SYMBOL("%ialpha", 0x03b1, true); // mode 1 @@ -119,12 +119,12 @@ void NodeTest::testTdf52225() CHECK_GREEK_SYMBOL("%beta", 0x03b2, true); CHECK_GREEK_SYMBOL("%ibeta", 0x03b2, true); - // mode 2 - aFormat.SetGreekCharStyle(2); + // mode 0 + aFormat.SetGreekCharStyle(0); mxDocShell->SetFormat(aFormat); CHECK_GREEK_SYMBOL("%GAMMA", 0x0393, false); CHECK_GREEK_SYMBOL("%iGAMMA", 0x0393, true); - CHECK_GREEK_SYMBOL("%gamma", 0x03b3, true); + CHECK_GREEK_SYMBOL("%gamma", 0x03b3, false); CHECK_GREEK_SYMBOL("%igamma", 0x03b3, true); #undef CHECK_GREEK_SYMBOL diff --git a/starmath/qa/extras/mmlexport-test.cxx b/starmath/qa/extras/mmlexport-test.cxx index b63b22f9b48d..b3cb3aa38e3f 100644 --- a/starmath/qa/extras/mmlexport-test.cxx +++ b/starmath/qa/extras/mmlexport-test.cxx @@ -132,13 +132,13 @@ void MathMLExportTest::testTdf101022() } \ while (false) - CHECK_MATHVARIANT(false, false); // default mode 0 + CHECK_MATHVARIANT(false, true); // default mode 2 mxDocShell->SetGreekCharStyle(1); // mode 1 CHECK_MATHVARIANT(true, true); - mxDocShell->SetGreekCharStyle(2); // mode 2 - CHECK_MATHVARIANT(false, true); + mxDocShell->SetGreekCharStyle(0); // mode 0 + CHECK_MATHVARIANT(false, false); #undef CHECK_MATHVARIANT } |