anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36500 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2010-11-26 09:42:03 +00:00
parent 7073502308
commit 2dc2e4770b
9 changed files with 215 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/FORMAT
View File

@ -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> 2010-11-21 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* Format incremented to 408 (r36424) * Format incremented to 408 (r36424)
New inset for sub/superscripts: New inset for sub/superscripts:

28
lib/lyx2lyx/lyx_2_0.py
View File

@ -2361,6 +2361,28 @@ def revert_script(document):
add_to_preamble(document, ['\\usepackage{subscript}']) 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 # Conversion hub
# #
@ -2428,10 +2450,12 @@ convert = [[346, []],
[405, []], [405, []],
[406, [convert_passthru]], [406, [convert_passthru]],
[407, []], [407, []],
[408, []] [408, []],
[409, [convert_use_xetex]]
] ]
revert = [[407, [revert_script]], revert = [[408, [revert_use_xetex]],
[407, [revert_script]],
[406, [revert_multirowOffset]], [406, [revert_multirowOffset]],
[405, [revert_passthru]], [405, [revert_passthru]],
[404, []], [404, []],

8
src/Buffer.cpp
View File

@ -128,7 +128,7 @@ namespace {
// Do not remove the comment below, so we get merge conflict in // Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own. // 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<string, bool> DepClean;
typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache; 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()); OutputParams runparams(&params().encoding());
runparams.nice = true; runparams.nice = true;
runparams.flavor = params().useXetex ? runparams.flavor = params().useNonTeXFonts ?
OutputParams::XETEX : OutputParams::LATEX; OutputParams::XETEX : OutputParams::LATEX;
runparams.linelen = lyxrc.plaintext_linelen; runparams.linelen = lyxrc.plaintext_linelen;
// No side effect of file copying and image conversion // No side effect of file copying and image conversion
@ -3322,7 +3322,7 @@ string Buffer::bufferFormat() const
{ {
string format = params().documentClass().outputFormat(); string format = params().documentClass().outputFormat();
if (format == "latex") { if (format == "latex") {
if (params().useXetex) if (params().useNonTeXFonts)
return "xetex"; return "xetex";
if (params().encoding().package() == Encoding::japanese) if (params().encoding().package() == Encoding::japanese)
return "platex"; return "platex";
@ -3340,7 +3340,7 @@ string Buffer::getDefaultOutputFormat() const
Formats formats = exportableFormats(true); Formats formats = exportableFormats(true);
if (isDocBook() if (isDocBook()
|| isLiterate() || isLiterate()
|| params().useXetex || params().useNonTeXFonts
|| params().encoding().package() == Encoding::japanese) { || params().encoding().package() == Encoding::japanese) {
if (formats.empty()) if (formats.empty())
return string(); return string();

22
src/BufferParams.cpp
View File

@ -379,7 +379,7 @@ BufferParams::BufferParams()
fontsSans = "default"; fontsSans = "default";
fontsTypewriter = "default"; fontsTypewriter = "default";
fontsDefaultFamily = "default"; fontsDefaultFamily = "default";
useXetex = false; useNonTeXFonts = false;
fontsSC = false; fontsSC = false;
fontsOSF = false; fontsOSF = false;
fontsSansScale = 100; fontsSansScale = 100;
@ -627,8 +627,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
fontsTypewriter = lex.getString(); fontsTypewriter = lex.getString();
} else if (token == "\\font_default_family") { } else if (token == "\\font_default_family") {
lex >> fontsDefaultFamily; lex >> fontsDefaultFamily;
} else if (token == "\\use_xetex") { } else if (token == "\\use_non_tex_fonts") {
lex >> useXetex; lex >> useNonTeXFonts;
} else if (token == "\\font_sc") { } else if (token == "\\font_sc") {
lex >> fontsSC; lex >> fontsSC;
} else if (token == "\\font_osf") { } else if (token == "\\font_osf") {
@ -951,7 +951,7 @@ void BufferParams::writeFile(ostream & os) const
<< "\n\\font_sans " << fontsSans << "\n\\font_sans " << fontsSans
<< "\n\\font_typewriter " << fontsTypewriter << "\n\\font_typewriter " << fontsTypewriter
<< "\n\\font_default_family " << fontsDefaultFamily << "\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_sc " << convert<string>(fontsSC)
<< "\n\\font_osf " << convert<string>(fontsOSF) << "\n\\font_osf " << convert<string>(fontsOSF)
<< "\n\\font_sf_scale " << fontsSansScale << "\n\\font_sf_scale " << fontsSansScale
@ -1339,7 +1339,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
texrow.newline(); texrow.newline();
// end of \documentclass defs // end of \documentclass defs
if (useXetex) { if (useNonTeXFonts) {
os << "\\usepackage{fontspec}\n"; os << "\\usepackage{fontspec}\n";
texrow.newline(); texrow.newline();
} }
@ -1348,7 +1348,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
string const fonts = string const fonts =
loadFonts(fontsRoman, fontsSans, loadFonts(fontsRoman, fontsSans,
fontsTypewriter, fontsSC, fontsOSF, fontsTypewriter, fontsSC, fontsOSF,
fontsSansScale, fontsTypewriterScale, useXetex); fontsSansScale, fontsTypewriterScale, useNonTeXFonts);
if (!fonts.empty()) { if (!fonts.empty()) {
os << from_ascii(fonts); os << from_ascii(fonts);
texrow.newline(); texrow.newline();
@ -2553,7 +2553,7 @@ string const BufferParams::loadFonts(string const & rm,
string const & sf, string const & tt, string const & sf, string const & tt,
bool const & sc, bool const & osf, bool const & sc, bool const & osf,
int const & sfscale, int const & ttscale, 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, /* The LaTeX font world is in a flux. In the PSNFSS font interface,
several packages have been replaced by others, that might not several packages have been replaced by others, that might not
@ -2573,7 +2573,7 @@ string const BufferParams::loadFonts(string const & rm,
ostringstream os; ostringstream os;
if (xetex) { if (use_systemfonts) {
if (rm != "default") { if (rm != "default") {
os << "\\setmainfont[Mapping=tex-text"; os << "\\setmainfont[Mapping=tex-text";
if (osf) if (osf)
@ -2721,7 +2721,11 @@ string const BufferParams::loadFonts(string const & rm,
Encoding const & BufferParams::encoding() const 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")); return *(encodings.fromLaTeXName("utf8-plain"));
if (inputenc == "auto" || inputenc == "default") if (inputenc == "auto" || inputenc == "default")
return *language->encoding(); return *language->encoding();

6
src/BufferParams.h
View File

@ -215,8 +215,8 @@ public:
std::string fontsTypewriter; std::string fontsTypewriter;
/// the default family (rm, sf, tt) /// the default family (rm, sf, tt)
std::string fontsDefaultFamily; std::string fontsDefaultFamily;
/// use the XeTeX processor /// use the fonts of the OS (OpenType, True Type) directly
bool useXetex; bool useNonTeXFonts;
/// use expert Small Caps /// use expert Small Caps
bool fontsSC; bool fontsSC;
/// use Old Style Figures /// use Old Style Figures
@ -374,7 +374,7 @@ public:
std::string const & sf, std::string const & tt, std::string const & sf, std::string const & tt,
bool const & sc, bool const & osf, bool const & sc, bool const & osf,
int const & sfscale, int const & ttscale, int const & sfscale, int const & ttscale,
bool const & xetex) const; bool const & use_nonlatexfonts) const;
/// get the appropriate cite engine (natbib handling) /// get the appropriate cite engine (natbib handling)
CiteEngine citeEngine() const; CiteEngine citeEngine() const;

70
src/frontends/qt4/GuiDocument.cpp
View File

@ -726,10 +726,6 @@ GuiDocument::GuiDocument(GuiView & lv)
// output // output
outputModule = new UiWidget<Ui::OutputUi>; 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)), connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor())); this, SLOT(change_adaptor()));
connect(outputModule->mathimgSB, SIGNAL(valueChanged(double)), connect(outputModule->mathimgSB, SIGNAL(valueChanged(double)),
@ -750,6 +746,10 @@ GuiDocument::GuiDocument(GuiView & lv)
// fonts // fonts
fontModule = new UiWidget<Ui::FontUi>; 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)), connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor())); this, SLOT(change_adaptor()));
connect(fontModule->fontsRomanCO, SIGNAL(activated(int)), 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(); updateFontlist();
updateDefaultFormat(); updateDefaultFormat();
langModule->encodingCO->setEnabled(!xetex && langModule->encodingCO->setEnabled(tex_fonts &&
!langModule->defaultencodingRB->isChecked()); !langModule->defaultencodingRB->isChecked());
langModule->defaultencodingRB->setEnabled(!xetex); langModule->defaultencodingRB->setEnabled(tex_fonts);
langModule->otherencodingRB->setEnabled(!xetex); langModule->otherencodingRB->setEnabled(tex_fonts);
fontModule->fontsDefaultCO->setEnabled(!xetex); fontModule->fontsDefaultCO->setEnabled(tex_fonts);
fontModule->fontsDefaultLA->setEnabled(!xetex); fontModule->fontsDefaultLA->setEnabled(tex_fonts);
fontModule->cjkFontLE->setEnabled(!xetex); fontModule->cjkFontLE->setEnabled(tex_fonts);
fontModule->cjkFontLA->setEnabled(!xetex); fontModule->cjkFontLA->setEnabled(tex_fonts);
string font; string font;
if (!xetex) if (tex_fonts)
font = tex_fonts_sans[fontModule->fontsSansCO->currentIndex()]; font = tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
bool scaleable = providesScale(font); bool scaleable = providesScale(font);
fontModule->scaleSansSB->setEnabled(scaleable); fontModule->scaleSansSB->setEnabled(scaleable);
fontModule->scaleSansLA->setEnabled(scaleable); fontModule->scaleSansLA->setEnabled(scaleable);
if (!xetex) if (tex_fonts)
font = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()]; font = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
scaleable = providesScale(font); scaleable = providesScale(font);
fontModule->scaleTypewriterSB->setEnabled(scaleable); fontModule->scaleTypewriterSB->setEnabled(scaleable);
fontModule->scaleTypewriterLA->setEnabled(scaleable); fontModule->scaleTypewriterLA->setEnabled(scaleable);
if (!xetex) if (tex_fonts)
font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()]; font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
fontModule->fontScCB->setEnabled(providesSC(font)); fontModule->fontScCB->setEnabled(providesSC(font));
fontModule->fontOsfCB->setEnabled(providesOSF(font)); fontModule->fontOsfCB->setEnabled(providesOSF(font));
fontModule->fontencLA->setEnabled(!xetex); fontModule->fontencLA->setEnabled(tex_fonts);
fontModule->fontencCO->setEnabled(!xetex); fontModule->fontencCO->setEnabled(tex_fonts);
if (xetex) if (!tex_fonts)
fontModule->fontencLE->setEnabled(false); fontModule->fontencLE->setEnabled(false);
else else
fontencChanged(fontModule->fontencCO->currentIndex()); fontencChanged(fontModule->fontencCO->currentIndex());
@ -1648,7 +1649,7 @@ void GuiDocument::updateFontlist()
fontModule->fontsTypewriterCO->clear(); fontModule->fontsTypewriterCO->clear();
// With XeTeX, we have access to all system fonts, but not the LaTeX fonts // 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->fontsRomanCO->addItem(qt_("Default"));
fontModule->fontsSansCO->addItem(qt_("Default")); fontModule->fontsSansCO->addItem(qt_("Default"));
fontModule->fontsTypewriterCO->addItem(qt_("Default")); fontModule->fontsTypewriterCO->addItem(qt_("Default"));
@ -1692,7 +1693,7 @@ void GuiDocument::fontencChanged(int item)
void GuiDocument::romanChanged(int item) void GuiDocument::romanChanged(int item)
{ {
if (outputModule->xetexCB->isChecked()) if (fontModule->osFontsCB->isChecked())
return; return;
string const font = tex_fonts_roman[item]; string const font = tex_fonts_roman[item];
fontModule->fontScCB->setEnabled(providesSC(font)); fontModule->fontScCB->setEnabled(providesSC(font));
@ -1702,7 +1703,7 @@ void GuiDocument::romanChanged(int item)
void GuiDocument::sansChanged(int item) void GuiDocument::sansChanged(int item)
{ {
if (outputModule->xetexCB->isChecked()) if (fontModule->osFontsCB->isChecked())
return; return;
string const font = tex_fonts_sans[item]; string const font = tex_fonts_sans[item];
bool scaleable = providesScale(font); bool scaleable = providesScale(font);
@ -1713,7 +1714,7 @@ void GuiDocument::sansChanged(int item)
void GuiDocument::ttChanged(int item) void GuiDocument::ttChanged(int item)
{ {
if (outputModule->xetexCB->isChecked()) if (fontModule->osFontsCB->isChecked())
return; return;
string const font = tex_fonts_monospaced[item]; string const font = tex_fonts_monospaced[item];
bool scaleable = providesScale(font); bool scaleable = providesScale(font);
@ -2073,7 +2074,8 @@ void GuiDocument::updateDefaultFormat()
return; return;
// make a copy in order to consider unapplied changes // make a copy in order to consider unapplied changes
Buffer * tmpbuf = buffer().clone(); Buffer * tmpbuf = buffer().clone();
tmpbuf->params().useXetex = outputModule->xetexCB->isChecked(); tmpbuf->params().useNonTeXFonts =
fontModule->osFontsCB->isChecked();
int idx = latexModule->classCO->currentIndex(); int idx = latexModule->classCO->currentIndex();
if (idx >= 0) { if (idx >= 0) {
string const classname = classes_model_.getIDString(idx); string const classname = classes_model_.getIDString(idx);
@ -2389,8 +2391,8 @@ void GuiDocument::applyView()
bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData( bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData(
outputModule->defaultFormatCO->currentIndex()).toString()); outputModule->defaultFormatCO->currentIndex()).toString());
bool const xetex = outputModule->xetexCB->isChecked(); bool const nontexfonts = fontModule->osFontsCB->isChecked();
bp_.useXetex = xetex; bp_.useNonTeXFonts = nontexfonts;
bp_.output_sync = outputModule->outputsyncCB->isChecked(); bp_.output_sync = outputModule->outputsyncCB->isChecked();
bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText()); bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText());
@ -2405,7 +2407,7 @@ void GuiDocument::applyView()
bp_.html_math_img_scale = outputModule->mathimgSB->value(); bp_.html_math_img_scale = outputModule->mathimgSB->value();
// fonts // fonts
if (xetex) { if (nontexfonts) {
if (fontModule->fontsRomanCO->currentIndex() == 0) if (fontModule->fontsRomanCO->currentIndex() == 0)
bp_.fontsRoman = "default"; bp_.fontsRoman = "default";
else else
@ -2452,7 +2454,7 @@ void GuiDocument::applyView()
bp_.fontsOSF = fontModule->fontOsfCB->isChecked(); bp_.fontsOSF = fontModule->fontOsfCB->isChecked();
if (xetex) if (nontexfonts)
bp_.fontsDefaultFamily = "default"; bp_.fontsDefaultFamily = "default";
else else
bp_.fontsDefaultFamily = GuiDocument::fontfamilies[ bp_.fontsDefaultFamily = GuiDocument::fontfamilies[
@ -2825,9 +2827,9 @@ void GuiDocument::paramsToDialog()
if (index == -1) if (index == -1)
index = 0; index = 0;
outputModule->defaultFormatCO->setCurrentIndex(index); outputModule->defaultFormatCO->setCurrentIndex(index);
outputModule->xetexCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX); fontModule->osFontsCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX);
outputModule->xetexCB->setChecked( fontModule->osFontsCB->setChecked(
bp_.baseClass()->outputType() == lyx::LATEX && bp_.useXetex); bp_.baseClass()->outputType() == lyx::LATEX && bp_.useNonTeXFonts);
outputModule->outputsyncCB->setChecked(bp_.output_sync); outputModule->outputsyncCB->setChecked(bp_.output_sync);
outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro)); outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro));
@ -2840,7 +2842,7 @@ void GuiDocument::paramsToDialog()
updateFontsize(documentClass().opt_fontsize(), updateFontsize(documentClass().opt_fontsize(),
bp_.fontsize); bp_.fontsize);
if (bp_.useXetex) { if (bp_.useNonTeXFonts) {
fontModule->fontencLA->setEnabled(false); fontModule->fontencLA->setEnabled(false);
fontModule->fontencCO->setEnabled(false); fontModule->fontencCO->setEnabled(false);
fontModule->fontencLE->setEnabled(false); fontModule->fontencLE->setEnabled(false);
@ -3366,7 +3368,7 @@ bool GuiDocument::isFontAvailable(string const & font) const
bool GuiDocument::providesOSF(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 // FIXME: we should check if the fonts really
// have OSF support. But how? // have OSF support. But how?
return true; return true;
@ -3380,7 +3382,7 @@ bool GuiDocument::providesOSF(string const & font) const
bool GuiDocument::providesSC(string const & font) const bool GuiDocument::providesSC(string const & font) const
{ {
if (outputModule->xetexCB->isChecked()) if (fontModule->osFontsCB->isChecked())
return false; return false;
if (font == "palatino") if (font == "palatino")
return isFontAvailable("mathpazo"); return isFontAvailable("mathpazo");
@ -3392,7 +3394,7 @@ bool GuiDocument::providesSC(string const & font) const
bool GuiDocument::providesScale(string const & font) const bool GuiDocument::providesScale(string const & font) const
{ {
if (outputModule->xetexCB->isChecked()) if (fontModule->osFontsCB->isChecked())
return true; return true;
return font == "helvet" || font == "luximono" return font == "helvet" || font == "luximono"
|| font == "berasans" || font == "beramono"; || font == "berasans" || font == "beramono";

2
src/frontends/qt4/GuiDocument.h
View File

@ -115,7 +115,7 @@ private Q_SLOTS:
void deleteNoteFontColor(); void deleteNoteFontColor();
void changeBoxBackgroundColor(); void changeBoxBackgroundColor();
void deleteBoxBackgroundColor(); void deleteBoxBackgroundColor();
void xetexChanged(bool); void osFontsChanged(bool);
void branchesRename(docstring const &, docstring const &); void branchesRename(docstring const &, docstring const &);
private: private:
/// validate listings parameters and return an error message, if any /// validate listings parameters and return an error message, if any

71
src/frontends/qt4/ui/FontUi.ui
View File

@ -5,15 +5,38 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>404</width> <width>407</width>
<height>256</height> <height>285</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>FontUi</string> <string>FontUi</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <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"> <widget class="QLabel" name="fontsDefaultLA">
<property name="text"> <property name="text">
<string>&amp;Default Family:</string> <string>&amp;Default Family:</string>
@ -23,14 +46,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="1" column="1">
<widget class="QComboBox" name="fontsDefaultCO"> <widget class="QComboBox" name="fontsDefaultCO">
<property name="toolTip"> <property name="toolTip">
<string>Select the default family for the document</string> <string>Select the default family for the document</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="1" column="3">
<widget class="QLabel" name="BaseSizeLA"> <widget class="QLabel" name="BaseSizeLA">
<property name="text"> <property name="text">
<string>&amp;Base Size:</string> <string>&amp;Base Size:</string>
@ -40,14 +63,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3"> <item row="1" column="4">
<widget class="QComboBox" name="fontsizeCO"> <widget class="QComboBox" name="fontsizeCO">
<property name="toolTip"> <property name="toolTip">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="2" column="0">
<widget class="QLabel" name="fontencLA"> <widget class="QLabel" name="fontencLA">
<property name="text"> <property name="text">
<string>LaTe&amp;X font encoding:</string> <string>LaTe&amp;X font encoding:</string>
@ -57,17 +80,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="1">
<widget class="QComboBox" name="fontencCO"/> <widget class="QComboBox" name="fontencCO"/>
</item> </item>
<item row="1" column="2" colspan="2"> <item row="2" column="3" colspan="2">
<widget class="QLineEdit" name="fontencLE"> <widget class="QLineEdit" name="fontencLE">
<property name="toolTip"> <property name="toolTip">
<string>Specify the font encoding (e.g., T1).</string> <string>Specify the font encoding (e.g., T1).</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="3" column="0">
<widget class="QLabel" name="fontsRomanLA"> <widget class="QLabel" name="fontsRomanLA">
<property name="text"> <property name="text">
<string>&amp;Roman:</string> <string>&amp;Roman:</string>
@ -77,14 +100,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="1">
<widget class="QComboBox" name="fontsRomanCO"> <widget class="QComboBox" name="fontsRomanCO">
<property name="toolTip"> <property name="toolTip">
<string>Select the roman (serif) typeface</string> <string>Select the roman (serif) typeface</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0"> <item row="4" column="0">
<widget class="QLabel" name="fontsSansLA"> <widget class="QLabel" name="fontsSansLA">
<property name="text"> <property name="text">
<string>&amp;Sans Serif:</string> <string>&amp;Sans Serif:</string>
@ -94,14 +117,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="4" column="1">
<widget class="QComboBox" name="fontsSansCO"> <widget class="QComboBox" name="fontsSansCO">
<property name="toolTip"> <property name="toolTip">
<string>Select the Sans Serif (grotesque) typeface</string> <string>Select the Sans Serif (grotesque) typeface</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="4" column="3">
<widget class="QLabel" name="scaleSansLA"> <widget class="QLabel" name="scaleSansLA">
<property name="text"> <property name="text">
<string>S&amp;cale (%):</string> <string>S&amp;cale (%):</string>
@ -111,7 +134,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3"> <item row="4" column="4">
<widget class="QSpinBox" name="scaleSansSB"> <widget class="QSpinBox" name="scaleSansSB">
<property name="toolTip"> <property name="toolTip">
<string>Scale the Sans Serif font to match the base font's dimensions</string> <string>Scale the Sans Serif font to match the base font's dimensions</string>
@ -124,7 +147,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0"> <item row="5" column="0">
<widget class="QLabel" name="fontsTypewriterLA"> <widget class="QLabel" name="fontsTypewriterLA">
<property name="text"> <property name="text">
<string>&amp;Typewriter:</string> <string>&amp;Typewriter:</string>
@ -134,14 +157,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="1"> <item row="5" column="1">
<widget class="QComboBox" name="fontsTypewriterCO"> <widget class="QComboBox" name="fontsTypewriterCO">
<property name="toolTip"> <property name="toolTip">
<string>Select the typewriter (monospaced) typeface</string> <string>Select the typewriter (monospaced) typeface</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2"> <item row="5" column="3">
<widget class="QLabel" name="scaleTypewriterLA"> <widget class="QLabel" name="scaleTypewriterLA">
<property name="text"> <property name="text">
<string>Sc&amp;ale (%):</string> <string>Sc&amp;ale (%):</string>
@ -151,7 +174,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="3"> <item row="5" column="4">
<widget class="QSpinBox" name="scaleTypewriterSB"> <widget class="QSpinBox" name="scaleTypewriterSB">
<property name="toolTip"> <property name="toolTip">
<string>Scale the Typewriter font to match the base font's dimensions</string> <string>Scale the Typewriter font to match the base font's dimensions</string>
@ -164,7 +187,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="0"> <item row="6" column="0">
<widget class="QLabel" name="cjkFontLA"> <widget class="QLabel" name="cjkFontLA">
<property name="text"> <property name="text">
<string>C&amp;JK:</string> <string>C&amp;JK:</string>
@ -174,14 +197,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="5" column="1"> <item row="6" column="1">
<widget class="QLineEdit" name="cjkFontLE"> <widget class="QLineEdit" name="cjkFontLE">
<property name="toolTip"> <property name="toolTip">
<string>Input the font to be used for Chinese, Japanese or Korean (CJK) script</string> <string>Input the font to be used for Chinese, Japanese or Korean (CJK) script</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1"> <item row="7" column="1" colspan="2">
<widget class="QCheckBox" name="fontScCB"> <widget class="QCheckBox" name="fontScCB">
<property name="toolTip"> <property name="toolTip">
<string>Use a real small caps shape, if the font provides one</string> <string>Use a real small caps shape, if the font provides one</string>
@ -191,7 +214,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="1"> <item row="8" column="1" colspan="2">
<widget class="QCheckBox" name="fontOsfCB"> <widget class="QCheckBox" name="fontOsfCB">
<property name="toolTip"> <property name="toolTip">
<string>Use old style instead of lining figures</string> <string>Use old style instead of lining figures</string>
@ -201,7 +224,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1"> <item row="9" column="1" colspan="2">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>

170
src/frontends/qt4/ui/OutputUi.ui
View File

@ -1,7 +1,7 @@
<ui version="4.0" > <ui version="4.0">
<class>OutputUi</class> <class>OutputUi</class>
<widget class="QWidget" name="OutputUi" > <widget class="QWidget" name="OutputUi">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -9,104 +9,94 @@
<height>334</height> <height>334</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" > <layout class="QGridLayout" name="gridLayout">
<item> <item row="0" column="0">
<widget class="QGroupBox" name="outputFormatGB" > <widget class="QGroupBox" name="outputFormatGB">
<property name="title" > <property name="title">
<string>Output Format</string> <string>Output Format</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" > <item row="0" column="0">
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QLabel" name="defaultFormatLA" > <widget class="QLabel" name="defaultFormatLA">
<property name="toolTip" > <property name="toolTip">
<string>Specify the default output format (for view/update)</string> <string>Specify the default output format (for view/update)</string>
</property> </property>
<property name="text" > <property name="text">
<string>De&amp;fault Output Format:</string> <string>De&amp;fault Output Format:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>defaultFormatCO</cstring> <cstring>defaultFormatCO</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="defaultFormatCO" > <widget class="QComboBox" name="defaultFormatCO">
<property name="toolTip" > <property name="toolTip">
<string>Specify the default output format (for view/update)</string> <string>Specify the default output format (for view/update)</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </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> </layout>
</widget> </widget>
</item> </item>
<item> <item row="1" column="0">
<widget class="QGroupBox" name="outputsyncCB" > <widget class="QGroupBox" name="outputsyncCB">
<property name="toolTip" > <property name="toolTip">
<string>Enable forward/reverse search between editor and output (e.g., SyncTeX)</string> <string>Enable forward/reverse search between editor and output (e.g., SyncTeX)</string>
</property> </property>
<property name="title" > <property name="title">
<string>S&amp;ynchronize with Output</string> <string>S&amp;ynchronize with Output</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="checkable" > <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="checked" > <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2" > <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout" > <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<widget class="QLabel" name="label" > <widget class="QLabel" name="label">
<property name="text" > <property name="text">
<string>C&amp;ustom Macro:</string> <string>C&amp;ustom Macro:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>synccustomCB</cstring> <cstring>synccustomCB</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="synccustomCB" > <widget class="QComboBox" name="synccustomCB">
<property name="toolTip" > <property name="toolTip">
<string>Custom LaTeX preamble macro</string> <string>Custom LaTeX preamble macro</string>
</property> </property>
<property name="editable" > <property name="editable">
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
@ -116,111 +106,111 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="2" column="0">
<widget class="QGroupBox" name="xhtmlGB" > <widget class="QGroupBox" name="xhtmlGB">
<property name="title" > <property name="title">
<string>XHTML Output Options</string> <string>XHTML Output Options</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="outGridLayout" > <layout class="QGridLayout" name="outGridLayout">
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="strictCB" > <widget class="QCheckBox" name="strictCB">
<property name="toolTip" > <property name="toolTip">
<string>Whether to comply strictly with XHTML 1.1.</string> <string>Whether to comply strictly with XHTML 1.1.</string>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Strict XHTML 1.1</string> <string>&amp;Strict XHTML 1.1</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="mathoutLA" > <widget class="QLabel" name="mathoutLA">
<property name="font" > <property name="font">
<font> <font>
<weight>50</weight> <weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Math Output:</string> <string>&amp;Math Output:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>mathoutCB</cstring> <cstring>mathoutCB</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QComboBox" name="mathoutCB" > <widget class="QComboBox" name="mathoutCB">
<property name="font" > <property name="font">
<font> <font>
<weight>50</weight> <weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Format to use for math output.</string> <string>Format to use for math output.</string>
</property> </property>
<item> <item>
<property name="text" > <property name="text">
<string>MathML</string> <string>MathML</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>HTML</string> <string>HTML</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>Images</string> <string>Images</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text" > <property name="text">
<string>LaTeX</string> <string>LaTeX</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QLabel" name="mathimgLA" > <widget class="QLabel" name="mathimgLA">
<property name="font" > <property name="font">
<font> <font>
<weight>50</weight> <weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
<property name="text" > <property name="text">
<string>Math &amp;Image Scaling:</string> <string>Math &amp;Image Scaling:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>mathimgSB</cstring> <cstring>mathimgSB</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="1">
<widget class="QDoubleSpinBox" name="mathimgSB" > <widget class="QDoubleSpinBox" name="mathimgSB">
<property name="font" > <property name="font">
<font> <font>
<weight>50</weight> <weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Scaling factor for images used for math output.</string> <string>Scaling factor for images used for math output.</string>
</property> </property>
<property name="minimum" > <property name="minimum">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
<property name="maximum" > <property name="maximum">
<double>10.000000000000000</double> <double>10.000000000000000</double>
</property> </property>
<property name="singleStep" > <property name="singleStep">
<double>0.100000000000000</double> <double>0.100000000000000</double>
</property> </property>
<property name="value" > <property name="value">
<double>1.000000000000000</double> <double>1.000000000000000</double>
</property> </property>
</widget> </widget>
@ -228,12 +218,12 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item> <item row="3" column="0">
<spacer name="verticalSpacer" > <spacer name="verticalSpacer">
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>40</height> <height>40</height>
@ -244,7 +234,7 @@
</layout> </layout>
</widget> </widget>
<includes> <includes>
<include location="local" >qt_i18n.h</include> <include location="local">qt_i18n.h</include>
</includes> </includes>
<resources/> <resources/>
<connections/> <connections/>