Implement GUI for LuaTeX. File format change due to the renaming of the \use_xetex buffer param.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36500 a592a061-630c-0410-9148-cb99ea01b6c8
2024-11-22 10:00:33 +00:00 · 2010-11-26 09:42:03 +00:00 · 2010-11-26 09:42:03 +00:00 · 2dc2e4770b
commit 2dc2e4770b
parent 7073502308
9 changed files with 215 additions and 167 deletions
--- a/development/FORMAT
+++ b/development/FORMAT
@ -11,6 +11,11 @@ adjustments are made to tex2lyx and bugs are fixed in lyx2lyx.

 -----------------------

+2010-11-28 Jürgen Spitzmüller <spitz@lyx.org>
+	* Format incremented to 409:
+	  Rename buffer param \use_xetex to \use_non_tex_fonts.
+
+
 2010-11-21 Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 	* Format incremented to 408 (r36424)
 	  New inset for sub/superscripts:
--- a/lib/lyx2lyx/lyx_2_0.py
+++ b/lib/lyx2lyx/lyx_2_0.py
@ -2361,6 +2361,28 @@ def revert_script(document):
        add_to_preamble(document, ['\\usepackage{subscript}'])


+def convert_use_xetex(document):
+    " convert \\use_xetex to \\use_non_tex_fonts "
+    i = 0
+    i = find_token(document.header, "\\use_xetex", 0)
+    if i == -1:
+        document.warning("Malformed document. No \\use_xetex param!")
+    else:
+        val = get_value(document.header, "\\use_xetex", 0)
+        document.header[i] = "\\use_non_tex_fonts " + val
+
+
+def revert_use_xetex(document):
+    " revert \\use_non_tex_fonts to \\use_xetex "
+    i = 0
+    i = find_token(document.header, "\\use_non_tex_fonts", 0)
+    if i == -1:
+        document.warning("Malformed document. No \\use_non_tex_fonts param!")
+    else:
+        val = get_value(document.header, "\\use_non_tex_fonts", 0)
+        document.header[i] = "\\use_xetex " + val
+
+
 ##
 # Conversion hub
 #
@ -2428,10 +2450,12 @@ convert = [[346, []],
           [405, []],
           [406, [convert_passthru]],
           [407, []],
-           [408, []]
+           [408, []],
+           [409, [convert_use_xetex]]
 ]

-revert =  [[407, [revert_script]],
+revert =  [[408, [revert_use_xetex]],
+           [407, [revert_script]],
           [406, [revert_multirowOffset]],
           [405, [revert_passthru]],
           [404, []],
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@ -128,7 +128,7 @@ namespace {

 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-int const LYX_FORMAT = 408; // gb add script inset
+int const LYX_FORMAT = 409; // spitz use_xetex -> use_non_tex_fonts

 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@ -3043,7 +3043,7 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
 {
 	OutputParams runparams(&params().encoding());
 	runparams.nice = true;
-	runparams.flavor = params().useXetex ? 
+	runparams.flavor = params().useNonTeXFonts ? 
 		OutputParams::XETEX : OutputParams::LATEX;
 	runparams.linelen = lyxrc.plaintext_linelen;
 	// No side effect of file copying and image conversion
@ -3322,7 +3322,7 @@ string Buffer::bufferFormat() const
 {
 	string format = params().documentClass().outputFormat();
 	if (format == "latex") {
-		if (params().useXetex)
+		if (params().useNonTeXFonts)
 			return "xetex";
 		if (params().encoding().package() == Encoding::japanese)
 			return "platex";
@ -3340,7 +3340,7 @@ string Buffer::getDefaultOutputFormat() const
 	Formats formats = exportableFormats(true);
 	if (isDocBook()
 	    || isLiterate()
-	    || params().useXetex
+	    || params().useNonTeXFonts
 	    || params().encoding().package() == Encoding::japanese) {
 		if (formats.empty())
 			return string();
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@ -379,7 +379,7 @@ BufferParams::BufferParams()
 	fontsSans = "default";
 	fontsTypewriter = "default";
 	fontsDefaultFamily = "default";
-	useXetex = false;
+	useNonTeXFonts = false;
 	fontsSC = false;
 	fontsOSF = false;
 	fontsSansScale = 100;
@ -627,8 +627,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
 		fontsTypewriter = lex.getString();
 	} else if (token == "\\font_default_family") {
 		lex >> fontsDefaultFamily;
-	} else if (token == "\\use_xetex") {
-		lex >> useXetex;
+	} else if (token == "\\use_non_tex_fonts") {
+		lex >> useNonTeXFonts;
 	} else if (token == "\\font_sc") {
 		lex >> fontsSC;
 	} else if (token == "\\font_osf") {
@ -951,7 +951,7 @@ void BufferParams::writeFile(ostream & os) const
 	   << "\n\\font_sans " << fontsSans
 	   << "\n\\font_typewriter " << fontsTypewriter
 	   << "\n\\font_default_family " << fontsDefaultFamily
-	   << "\n\\use_xetex " << convert<string>(useXetex)
+	   << "\n\\use_non_tex_fonts " << convert<string>(useNonTeXFonts)
 	   << "\n\\font_sc " << convert<string>(fontsSC)
 	   << "\n\\font_osf " << convert<string>(fontsOSF)
 	   << "\n\\font_sf_scale " << fontsSansScale
@ -1339,7 +1339,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	texrow.newline();
 	// end of \documentclass defs

-	if (useXetex) {
+	if (useNonTeXFonts) {
 		os << "\\usepackage{fontspec}\n";
 		texrow.newline();
 	}
@ -1348,7 +1348,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 	string const fonts =
 		loadFonts(fontsRoman, fontsSans,
 			  fontsTypewriter, fontsSC, fontsOSF,
-			  fontsSansScale, fontsTypewriterScale, useXetex);
+			  fontsSansScale, fontsTypewriterScale, useNonTeXFonts);
 	if (!fonts.empty()) {
 		os << from_ascii(fonts);
 		texrow.newline();
@ -2553,7 +2553,7 @@ string const BufferParams::loadFonts(string const & rm,
 				     string const & sf, string const & tt,
 				     bool const & sc, bool const & osf,
 				     int const & sfscale, int const & ttscale,
-				     bool const & xetex) const
+				     bool const & use_systemfonts) const
 {
 	/* The LaTeX font world is in a flux. In the PSNFSS font interface,
 	   several packages have been replaced by others, that might not
@ -2573,7 +2573,7 @@ string const BufferParams::loadFonts(string const & rm,

 	ostringstream os;

-	if (xetex) {
+	if (use_systemfonts) {
 		if (rm != "default") {
 			os << "\\setmainfont[Mapping=tex-text";
 			if (osf)
@ -2721,7 +2721,11 @@ string const BufferParams::loadFonts(string const & rm,

 Encoding const & BufferParams::encoding() const
 {
-	if (useXetex)
+	// FIXME: actually, we should check for the flavor
+	// or runparams.isFullyUnicode() here.
+	// useNonTeXFonts happens to match the flavors, but
+	// this may well likely change!
+	if (useNonTeXFonts)
 		return *(encodings.fromLaTeXName("utf8-plain"));
 	if (inputenc == "auto" || inputenc == "default")
 		return *language->encoding();
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@ -215,8 +215,8 @@ public:
 	std::string fontsTypewriter;
 	/// the default family (rm, sf, tt)
 	std::string fontsDefaultFamily;
-	/// use the XeTeX processor
-	bool useXetex;
+	/// use the fonts of the OS (OpenType, True Type) directly
+	bool useNonTeXFonts;
 	/// use expert Small Caps
 	bool fontsSC;
 	/// use Old Style Figures
@ -374,7 +374,7 @@ public:
 				     std::string const & sf, std::string const & tt,
 				     bool const & sc, bool const & osf,
 				     int const & sfscale, int const & ttscale,
-				     bool const & xetex) const;
+				     bool const & use_nonlatexfonts) const;

 	/// get the appropriate cite engine (natbib handling)
 	CiteEngine citeEngine() const;
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@ -726,10 +726,6 @@ GuiDocument::GuiDocument(GuiView & lv)
 	// output
 	outputModule = new UiWidget<Ui::OutputUi>;

-	connect(outputModule->xetexCB, SIGNAL(clicked()),
-		this, SLOT(change_adaptor()));
-	connect(outputModule->xetexCB, SIGNAL(toggled(bool)),
-		this, SLOT(xetexChanged(bool)));
 	connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
 	connect(outputModule->mathimgSB, SIGNAL(valueChanged(double)),
@ -750,6 +746,10 @@ GuiDocument::GuiDocument(GuiView & lv)

 	// fonts
 	fontModule = new UiWidget<Ui::FontUi>;
+	connect(fontModule->osFontsCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(fontModule->osFontsCB, SIGNAL(toggled(bool)),
+		this, SLOT(osFontsChanged(bool)));
 	connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
 	connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
@ -1585,38 +1585,39 @@ void GuiDocument::deleteBoxBackgroundColor()
 }


-void GuiDocument::xetexChanged(bool xetex)
+void GuiDocument::osFontsChanged(bool nontexfonts)
 {
+	bool const tex_fonts = !nontexfonts;
 	updateFontlist();
 	updateDefaultFormat();
-	langModule->encodingCO->setEnabled(!xetex &&
+	langModule->encodingCO->setEnabled(tex_fonts &&
 		!langModule->defaultencodingRB->isChecked());
-	langModule->defaultencodingRB->setEnabled(!xetex);
-	langModule->otherencodingRB->setEnabled(!xetex);
+	langModule->defaultencodingRB->setEnabled(tex_fonts);
+	langModule->otherencodingRB->setEnabled(tex_fonts);

-	fontModule->fontsDefaultCO->setEnabled(!xetex);
-	fontModule->fontsDefaultLA->setEnabled(!xetex);
-	fontModule->cjkFontLE->setEnabled(!xetex);
-	fontModule->cjkFontLA->setEnabled(!xetex);
+	fontModule->fontsDefaultCO->setEnabled(tex_fonts);
+	fontModule->fontsDefaultLA->setEnabled(tex_fonts);
+	fontModule->cjkFontLE->setEnabled(tex_fonts);
+	fontModule->cjkFontLA->setEnabled(tex_fonts);
 	string font;
-	if (!xetex)
+	if (tex_fonts)
 		font = tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
 	bool scaleable = providesScale(font);
 	fontModule->scaleSansSB->setEnabled(scaleable);
 	fontModule->scaleSansLA->setEnabled(scaleable);
-	if (!xetex)
+	if (tex_fonts)
 		font = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
 	scaleable = providesScale(font);
 	fontModule->scaleTypewriterSB->setEnabled(scaleable);
 	fontModule->scaleTypewriterLA->setEnabled(scaleable);
-	if (!xetex)
+	if (tex_fonts)
 		font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
 	fontModule->fontScCB->setEnabled(providesSC(font));
 	fontModule->fontOsfCB->setEnabled(providesOSF(font));
 	
-	fontModule->fontencLA->setEnabled(!xetex);
-	fontModule->fontencCO->setEnabled(!xetex);
-	if (xetex)
+	fontModule->fontencLA->setEnabled(tex_fonts);
+	fontModule->fontencCO->setEnabled(tex_fonts);
+	if (!tex_fonts)
 		fontModule->fontencLE->setEnabled(false);
 	else
 		fontencChanged(fontModule->fontencCO->currentIndex());
@ -1648,7 +1649,7 @@ void GuiDocument::updateFontlist()
 	fontModule->fontsTypewriterCO->clear();

 	// With XeTeX, we have access to all system fonts, but not the LaTeX fonts
-	if (outputModule->xetexCB->isChecked()) {
+	if (fontModule->osFontsCB->isChecked()) {
 		fontModule->fontsRomanCO->addItem(qt_("Default"));
 		fontModule->fontsSansCO->addItem(qt_("Default"));
 		fontModule->fontsTypewriterCO->addItem(qt_("Default"));
@ -1692,7 +1693,7 @@ void GuiDocument::fontencChanged(int item)

 void GuiDocument::romanChanged(int item)
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return;
 	string const font = tex_fonts_roman[item];
 	fontModule->fontScCB->setEnabled(providesSC(font));
@ -1702,7 +1703,7 @@ void GuiDocument::romanChanged(int item)

 void GuiDocument::sansChanged(int item)
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return;
 	string const font = tex_fonts_sans[item];
 	bool scaleable = providesScale(font);
@ -1713,7 +1714,7 @@ void GuiDocument::sansChanged(int item)

 void GuiDocument::ttChanged(int item)
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return;
 	string const font = tex_fonts_monospaced[item];
 	bool scaleable = providesScale(font);
@ -2073,7 +2074,8 @@ void GuiDocument::updateDefaultFormat()
 		return;
 	// make a copy in order to consider unapplied changes
 	Buffer * tmpbuf = buffer().clone();
-	tmpbuf->params().useXetex = outputModule->xetexCB->isChecked();
+	tmpbuf->params().useNonTeXFonts =
+		fontModule->osFontsCB->isChecked();
 	int idx = latexModule->classCO->currentIndex();
 	if (idx >= 0) {
 		string const classname = classes_model_.getIDString(idx);
@ -2389,8 +2391,8 @@ void GuiDocument::applyView()
 	bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData(
 		outputModule->defaultFormatCO->currentIndex()).toString());

-	bool const xetex = outputModule->xetexCB->isChecked();
-	bp_.useXetex = xetex;
+	bool const nontexfonts = fontModule->osFontsCB->isChecked();
+	bp_.useNonTeXFonts = nontexfonts;

 	bp_.output_sync = outputModule->outputsyncCB->isChecked();
 	bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText());
@ -2405,7 +2407,7 @@ void GuiDocument::applyView()
 	bp_.html_math_img_scale = outputModule->mathimgSB->value();

 	// fonts
-	if (xetex) {
+	if (nontexfonts) {
 		if (fontModule->fontsRomanCO->currentIndex() == 0)
 			bp_.fontsRoman = "default";
 		else
@ -2452,7 +2454,7 @@ void GuiDocument::applyView()

 	bp_.fontsOSF = fontModule->fontOsfCB->isChecked();

-	if (xetex)
+	if (nontexfonts)
 		bp_.fontsDefaultFamily = "default";
 	else
 		bp_.fontsDefaultFamily = GuiDocument::fontfamilies[
@ -2825,9 +2827,9 @@ void GuiDocument::paramsToDialog()
 	if (index == -1)
 		index = 0;
 	outputModule->defaultFormatCO->setCurrentIndex(index);
-	outputModule->xetexCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX);
-	outputModule->xetexCB->setChecked(
-		bp_.baseClass()->outputType() == lyx::LATEX && bp_.useXetex);
+	fontModule->osFontsCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX);
+	fontModule->osFontsCB->setChecked(
+		bp_.baseClass()->outputType() == lyx::LATEX && bp_.useNonTeXFonts);

 	outputModule->outputsyncCB->setChecked(bp_.output_sync);
 	outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro));
@ -2840,7 +2842,7 @@ void GuiDocument::paramsToDialog()
 	updateFontsize(documentClass().opt_fontsize(),
 			bp_.fontsize);

-	if (bp_.useXetex) {
+	if (bp_.useNonTeXFonts) {
 		fontModule->fontencLA->setEnabled(false);
 		fontModule->fontencCO->setEnabled(false);
 		fontModule->fontencLE->setEnabled(false);
@ -3366,7 +3368,7 @@ bool GuiDocument::isFontAvailable(string const & font) const

 bool GuiDocument::providesOSF(string const & font) const
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		// FIXME: we should check if the fonts really
 		// have OSF support. But how?
 		return true;
@ -3380,7 +3382,7 @@ bool GuiDocument::providesOSF(string const & font) const

 bool GuiDocument::providesSC(string const & font) const
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return false;
 	if (font == "palatino")
 		return isFontAvailable("mathpazo");
@ -3392,7 +3394,7 @@ bool GuiDocument::providesSC(string const & font) const

 bool GuiDocument::providesScale(string const & font) const
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return true;
 	return font == "helvet" || font == "luximono"
 		|| font == "berasans"  || font == "beramono";
--- a/src/frontends/qt4/GuiDocument.h
+++ b/src/frontends/qt4/GuiDocument.h
@ -115,7 +115,7 @@ private Q_SLOTS:
 	void deleteNoteFontColor();
 	void changeBoxBackgroundColor();
 	void deleteBoxBackgroundColor();
-	void xetexChanged(bool);
+	void osFontsChanged(bool);
 	void branchesRename(docstring const &, docstring const &);
 private:
 	/// validate listings parameters and return an error message, if any
--- a/src/frontends/qt4/ui/FontUi.ui
+++ b/src/frontends/qt4/ui/FontUi.ui
@ -5,15 +5,38 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>404</width>
-    <height>256</height>
+    <width>407</width>
+    <height>285</height>
   </rect>
  </property>
  <property name="windowTitle">
   <string>FontUi</string>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+   <item row="0" column="0" colspan="2">
+    <widget class="QCheckBox" name="osFontsCB">
+     <property name="toolTip">
+      <string>Use OpenType- and TrueType fonts directly (requires XeTeX or LuaTeX)</string>
+     </property>
+     <property name="text">
+      <string>&amp;Use non-TeX fonts (via XeTeX/LuaTeX)</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2" colspan="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>59</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="1" column="0">
    <widget class="QLabel" name="fontsDefaultLA">
     <property name="text">
      <string>&amp;Default Family:</string>
@ -23,14 +46,14 @@
     </property>
    </widget>
   </item>
-   <item row="0" column="1">
+   <item row="1" column="1">
    <widget class="QComboBox" name="fontsDefaultCO">
     <property name="toolTip">
      <string>Select the default family for the document</string>
     </property>
    </widget>
   </item>
-   <item row="0" column="2">
+   <item row="1" column="3">
    <widget class="QLabel" name="BaseSizeLA">
     <property name="text">
      <string>&amp;Base Size:</string>
@ -40,14 +63,14 @@
     </property>
    </widget>
   </item>
-   <item row="0" column="3">
+   <item row="1" column="4">
    <widget class="QComboBox" name="fontsizeCO">
     <property name="toolTip">
      <string/>
     </property>
    </widget>
   </item>
-   <item row="1" column="0">
+   <item row="2" column="0">
    <widget class="QLabel" name="fontencLA">
     <property name="text">
      <string>LaTe&amp;X font encoding:</string>
@ -57,17 +80,17 @@
     </property>
    </widget>
   </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
    <widget class="QComboBox" name="fontencCO"/>
   </item>
-   <item row="1" column="2" colspan="2">
+   <item row="2" column="3" colspan="2">
    <widget class="QLineEdit" name="fontencLE">
     <property name="toolTip">
      <string>Specify the font encoding (e.g., T1).</string>
     </property>
    </widget>
   </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
    <widget class="QLabel" name="fontsRomanLA">
     <property name="text">
      <string>&amp;Roman:</string>
@ -77,14 +100,14 @@
     </property>
    </widget>
   </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
    <widget class="QComboBox" name="fontsRomanCO">
     <property name="toolTip">
      <string>Select the roman (serif) typeface</string>
     </property>
    </widget>
   </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
    <widget class="QLabel" name="fontsSansLA">
     <property name="text">
      <string>&amp;Sans Serif:</string>
@ -94,14 +117,14 @@
     </property>
    </widget>
   </item>
-   <item row="3" column="1">
+   <item row="4" column="1">
    <widget class="QComboBox" name="fontsSansCO">
     <property name="toolTip">
      <string>Select the Sans Serif (grotesque) typeface</string>
     </property>
    </widget>
   </item>
-   <item row="3" column="2">
+   <item row="4" column="3">
    <widget class="QLabel" name="scaleSansLA">
     <property name="text">
      <string>S&amp;cale (%):</string>
@ -111,7 +134,7 @@
     </property>
    </widget>
   </item>
-   <item row="3" column="3">
+   <item row="4" column="4">
    <widget class="QSpinBox" name="scaleSansSB">
     <property name="toolTip">
      <string>Scale the Sans Serif font to match the base font's dimensions</string>
@ -124,7 +147,7 @@
     </property>
    </widget>
   </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
    <widget class="QLabel" name="fontsTypewriterLA">
     <property name="text">
      <string>&amp;Typewriter:</string>
@ -134,14 +157,14 @@
     </property>
    </widget>
   </item>
-   <item row="4" column="1">
+   <item row="5" column="1">
    <widget class="QComboBox" name="fontsTypewriterCO">
     <property name="toolTip">
      <string>Select the typewriter (monospaced) typeface</string>
     </property>
    </widget>
   </item>
-   <item row="4" column="2">
+   <item row="5" column="3">
    <widget class="QLabel" name="scaleTypewriterLA">
     <property name="text">
      <string>Sc&amp;ale (%):</string>
@ -151,7 +174,7 @@
     </property>
    </widget>
   </item>
-   <item row="4" column="3">
+   <item row="5" column="4">
    <widget class="QSpinBox" name="scaleTypewriterSB">
     <property name="toolTip">
      <string>Scale the Typewriter font to match the base font's dimensions</string>
@ -164,7 +187,7 @@
     </property>
    </widget>
   </item>
-   <item row="5" column="0">
+   <item row="6" column="0">
    <widget class="QLabel" name="cjkFontLA">
     <property name="text">
      <string>C&amp;JK:</string>
@ -174,14 +197,14 @@
     </property>
    </widget>
   </item>
-   <item row="5" column="1">
+   <item row="6" column="1">
    <widget class="QLineEdit" name="cjkFontLE">
     <property name="toolTip">
      <string>Input the font to be used for Chinese, Japanese or Korean (CJK) script</string>
     </property>
    </widget>
   </item>
-   <item row="6" column="1">
+   <item row="7" column="1" colspan="2">
    <widget class="QCheckBox" name="fontScCB">
     <property name="toolTip">
      <string>Use a real small caps shape, if the font provides one</string>
@ -191,7 +214,7 @@
     </property>
    </widget>
   </item>
-   <item row="7" column="1">
+   <item row="8" column="1" colspan="2">
    <widget class="QCheckBox" name="fontOsfCB">
     <property name="toolTip">
      <string>Use old style instead of lining figures</string>
@ -201,7 +224,7 @@
     </property>
    </widget>
   </item>
-   <item row="8" column="1">
+   <item row="9" column="1" colspan="2">
    <spacer name="verticalSpacer">
     <property name="orientation">
      <enum>Qt::Vertical</enum>
--- a/src/frontends/qt4/ui/OutputUi.ui
+++ b/src/frontends/qt4/ui/OutputUi.ui
@ -12,8 +12,8 @@
  <property name="windowTitle">
   <string>Form</string>
  </property>
-  <layout class="QVBoxLayout" name="verticalLayout" >
-   <item>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
    <widget class="QGroupBox" name="outputFormatGB">
     <property name="title">
      <string>Output Format</string>
@ -28,7 +28,7 @@
      <property name="spacing">
       <number>6</number>
      </property>
-      <item row="1" column="0" >
+      <item row="0" column="0">
       <layout class="QHBoxLayout">
        <property name="spacing">
         <number>6</number>
@ -58,20 +58,10 @@
        </item>
       </layout>
      </item>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="xetexCB" >
-        <property name="toolTip" >
-         <string>Use the XeTeX processing engine</string>
-        </property>
-        <property name="text" >
-         <string>Use &amp;XeTeX</string>
-        </property>
-       </widget>
-      </item>
     </layout>
    </widget>
   </item>
-   <item>
+   <item row="1" column="0">
    <widget class="QGroupBox" name="outputsyncCB">
     <property name="toolTip">
      <string>Enable forward/reverse search between editor and output (e.g., SyncTeX)</string>
@ -116,7 +106,7 @@
     </layout>
    </widget>
   </item>
-   <item>
+   <item row="2" column="0">
    <widget class="QGroupBox" name="xhtmlGB">
     <property name="title">
      <string>XHTML Output Options</string>
@ -228,7 +218,7 @@
     </layout>
    </widget>
   </item>
-   <item>
+   <item row="3" column="0">
    <spacer name="verticalSpacer">
     <property name="orientation">
      <enum>Qt::Vertical</enum>