From 7a27ce678d98d9e300584b30b08cab6981926890 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Sat, 20 Nov 2010 14:53:34 +0000 Subject: [PATCH] * XeTeX: OldStyleNumbers argument must be specified as \setmainfont option (bug 7041). git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36408 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferParams.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 17e7bf769e..e5c701ac9d 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -2547,9 +2547,12 @@ string const BufferParams::loadFonts(string const & rm, ostringstream os; if (xetex) { - if (rm != "default") - os << "\\setmainfont[Mapping=tex-text]{" - << parseFontName(rm) << "}\n"; + if (rm != "default") { + os << "\\setmainfont[Mapping=tex-text"; + if (osf) + os << ",Numbers=OldStyle"; + os << "]{" << parseFontName(rm) << "}\n"; + } if (sf != "default") { string const sans = parseFontName(sf); if (sfscale != 100) @@ -2572,8 +2575,6 @@ string const BufferParams::loadFonts(string const & rm, os << "\\setmonofont[Mapping=tex-text]{" << mono << "}\n"; } - if (osf) - os << "\\defaultfontfeatures{Numbers=OldStyle}\n"; return os.str(); } -- 2.39.2