From ca6d526ba1d6f62ca928d6ac978a4dc4b9fbb0db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= <spitz@lyx.org>
Date: Mon, 6 Apr 2009 08:10:50 +0000
Subject: [PATCH] * BufferParams.cpp: 	- move loading of the xetex packages
 xunicode and xltxtra 	  to the end of the preamble

Now the UserGuide compiles with XeTeX!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29120 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/BufferParams.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 649f3b4c4b..f540cb543b 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1089,10 +1089,6 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	if (useXetex) {
 		os << "\\usepackage{fontspec}\n";
 		texrow.newline();
-		os << "\\usepackage{xunicode}\n";
-		texrow.newline();
-		os << "\\usepackage{xltxtra}\n";
-		texrow.newline();
 	}
 
 	// font selection must be done before loading fontenc.sty
@@ -1453,6 +1449,16 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	}
 
 	os << lyxpreamble;
+
+	// these packages (xunicode, for that matter) need to be loaded at least
+	// after amsmath, amssymb, esint and the other packages that provide 
+	// special glyphs
+	if (useXetex) {
+		os << "\\usepackage{xunicode}\n";
+		texrow.newline();
+		os << "\\usepackage{xltxtra}\n";
+		texrow.newline();
+	}
 	return use_babel;
 }