* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
* \author Angus Leeming
- * \author André Pönitz
+ * \author André Pönitz
* \author Dekel Tsur
*
* Full author contact details are available in file CREDITS.
#include "Font.h"
#include "BufferParams.h" // stateText
-#include "Color.h"
+#include "ColorSet.h"
#include "Encoding.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "LyXRC.h"
#include "output_latex.h"
#include "OutputParams.h"
+#include "texstream.h"
+#include "support/lassert.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/gettext.h"
namespace lyx {
+//
+// Strings used to read and write .lyx format files
+//
+// These are defined in FontInfo.cpp
+extern char const * LyXFamilyNames[NUM_FAMILIES + 2];
+extern char const * LyXSeriesNames[NUM_SERIES + 2];
+extern char const * LyXShapeNames[NUM_SHAPE + 2];
+extern char const * LyXSizeNames[NUM_SIZE + 4];
+extern char const * LyXMiscNames[5];
+
//
// Names for the GUI
//
char const * GUIFamilyNames[NUM_FAMILIES + 2 /* default & error */] =
{ N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
- "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
- N_("Inherit"), N_("Ignore") };
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "stmry",
+ "wasy", "esint", N_("Inherit"), N_("Ignore") };
-char const * GUISeriesNames[4] =
+char const * GUISeriesNames[NUM_SERIES + 2 /* default & error */] =
{ N_("Medium"), N_("Bold"), N_("Inherit"), N_("Ignore") };
-char const * GUIShapeNames[6] =
+char const * GUIShapeNames[NUM_SHAPE + 2 /* default & error */] =
{ N_("Upright"), N_("Italic"), N_("Slanted"), N_("Smallcaps"), N_("Inherit"),
N_("Ignore") };
-char const * GUISizeNames[14] =
+char const * GUISizeNames[NUM_SIZE + 4 /* increase, decrease, default & error */] =
{ N_("Tiny"), N_("Smallest"), N_("Smaller"), N_("Small"), N_("Normal"), N_("Large"),
N_("Larger"), N_("Largest"), N_("Huge"), N_("Huger"), N_("Increase"), N_("Decrease"),
N_("Inherit"), N_("Ignore") };
char const * GUIMiscNames[5] =
{ N_("Off"), N_("On"), N_("Toggle"), N_("Inherit"), N_("Ignore") };
-
-//
-// Strings used to read and write .lyx format files
-//
-char const * LyXFamilyNames[NUM_FAMILIES + 2 /* default & error */] =
-{ "roman", "sans", "typewriter", "symbol",
- "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy", "esint",
- "default", "error" };
-
-char const * LyXSeriesNames[4] =
-{ "medium", "bold", "default", "error" };
-
-char const * LyXShapeNames[6] =
-{ "up", "italic", "slanted", "smallcaps", "default", "error" };
-
-char const * LyXSizeNames[14] =
-{ "tiny", "scriptsize", "footnotesize", "small", "normal", "large",
- "larger", "largest", "huge", "giant",
- "increase", "decrease", "default", "error" };
-
-char const * LyXMiscNames[5] =
-{ "off", "on", "toggle", "default", "error" };
-
//
// Strings used to write LaTeX files
//
-char const * LaTeXFamilyNames[6] =
-{ "textrm", "textsf", "texttt", "error1", "error2", "error3" };
+char const * LaTeXFamilyNames[NUM_FAMILIES + 2] =
+{ "textrm", "textsf", "texttt", "error1", "error2", "error3", "error4",
+ "error5", "error6", "error7", "error8", "error9", "error10", "error11",
+ "error12", "error13" };
-char const * LaTeXSeriesNames[4] =
+char const * LaTeXSeriesNames[NUM_SERIES + 2] =
{ "textmd", "textbf", "error4", "error5" };
-char const * LaTeXShapeNames[6] =
+char const * LaTeXShapeNames[NUM_SHAPE + 2] =
{ "textup", "textit", "textsl", "textsc", "error6", "error7" };
-char const * LaTeXSizeNames[14] =
+char const * LaTeXSizeNames[NUM_SIZE + 4] =
{ "tiny", "scriptsize", "footnotesize", "small", "normalsize", "large",
"Large", "LARGE", "huge", "Huge", "error8", "error9", "error10", "error11" };
-} // namespace anon
+} // namespace
Font::Font(FontInfo bits, Language const * l)
setLanguage(default_language);
else
setLanguage(document_language);
+ else if (newfont.language() == reset_language)
+ setLanguage(document_language);
else if (newfont.language() != ignore_language)
setLanguage(newfont.language());
}
if (f.underbar() != FONT_INHERIT)
os << bformat(_("Underline %1$s, "),
_(GUIMiscNames[f.underbar()]));
+ if (f.strikeout() != FONT_INHERIT)
+ os << bformat(_("Strike out %1$s, "),
+ _(GUIMiscNames[f.strikeout()]));
+ if (f.xout() != FONT_INHERIT)
+ os << bformat(_("Cross out %1$s, "),
+ _(GUIMiscNames[f.xout()]));
+ if (f.uuline() != FONT_INHERIT)
+ os << bformat(_("Double underline %1$s, "),
+ _(GUIMiscNames[f.uuline()]));
+ if (f.uwave() != FONT_INHERIT)
+ os << bformat(_("Wavy underline %1$s, "),
+ _(GUIMiscNames[f.uwave()]));
if (f.noun() != FONT_INHERIT)
os << bformat(_("Noun %1$s, "),
_(GUIMiscNames[f.noun()]));
os << bformat(_("Language: %1$s, "),
_(language()->display()));
if (bits_.number() != FONT_OFF)
- os << bformat(_(" Number %1$s"),
+ os << " " << bformat(_("Number %1$s"),
_(GUIMiscNames[bits_.number()]));
return rtrim(os.str(), ", ");
}
-// Set family according to lyx format string
-void setLyXFamily(string const & fam, FontInfo & f)
-{
- string const s = ascii_lowercase(fam);
-
- int i = 0;
- while (LyXFamilyNames[i] != s &&
- LyXFamilyNames[i] != string("error"))
- ++i;
- if (s == LyXFamilyNames[i])
- f.setFamily(FontFamily(i));
- else
- lyxerr << "setLyXFamily: Unknown family `"
- << s << '\'' << endl;
-}
-
-
-// Set series according to lyx format string
-void setLyXSeries(string const & ser, FontInfo & f)
-{
- string const s = ascii_lowercase(ser);
-
- int i = 0;
- while (LyXSeriesNames[i] != s &&
- LyXSeriesNames[i] != string("error")) ++i;
- if (s == LyXSeriesNames[i]) {
- f.setSeries(FontSeries(i));
- } else
- lyxerr << "setLyXSeries: Unknown series `"
- << s << '\'' << endl;
-}
-
-
-// Set shape according to lyx format string
-void setLyXShape(string const & sha, FontInfo & f)
-{
- string const s = ascii_lowercase(sha);
-
- int i = 0;
- while (LyXShapeNames[i] != s && LyXShapeNames[i] != string("error"))
- ++i;
- if (s == LyXShapeNames[i])
- f.setShape(FontShape(i));
- else
- lyxerr << "Font::setLyXShape: Unknown shape `"
- << s << '\'' << endl;
-}
-
-
-// Set size according to lyx format string
-void setLyXSize(string const & siz, FontInfo & f)
-{
- string const s = ascii_lowercase(siz);
- int i = 0;
- while (LyXSizeNames[i] != s && LyXSizeNames[i] != string("error"))
- ++i;
- if (s == LyXSizeNames[i]) {
- f.setSize(FontSize(i));
- } else
- lyxerr << "Font::setLyXSize: Unknown size `"
- << s << '\'' << endl;
-}
-
-
-// Set size according to lyx format string
-FontState Font::setLyXMisc(string const & siz)
-{
- string const s = ascii_lowercase(siz);
- int i = 0;
- while (LyXMiscNames[i] != s &&
- LyXMiscNames[i] != string("error")) ++i;
- if (s == LyXMiscNames[i])
- return FontState(i);
- lyxerr << "Font::setLyXMisc: Unknown misc flag `"
- << s << '\'' << endl;
- return FONT_OFF;
-}
-
-
-/// Sets color after LyX text format
-void setLyXColor(string const & col, FontInfo & f)
-{
- f.setColor(lcolor.getFromLyXName(col));
-}
-
-
// Returns size in latex format
string const Font::latexSize() const
{
}
-// Read a font definition from given file in lyx format
-// Used for layouts
-FontInfo lyxRead(Lexer & lex, FontInfo const & fi)
-{
- FontInfo f = fi;
- bool error = false;
- bool finished = false;
- while (!finished && lex.isOK() && !error) {
- lex.next();
- string const tok = ascii_lowercase(lex.getString());
-
- if (tok.empty()) {
- continue;
- } else if (tok == "endfont") {
- finished = true;
- } else if (tok == "family") {
- lex.next();
- string const ttok = lex.getString();
- setLyXFamily(ttok, f);
- } else if (tok == "series") {
- lex.next();
- string const ttok = lex.getString();
- setLyXSeries(ttok, f);
- } else if (tok == "shape") {
- lex.next();
- string const ttok = lex.getString();
- setLyXShape(ttok, f);
- } else if (tok == "size") {
- lex.next();
- string const ttok = lex.getString();
- setLyXSize(ttok, f);
- } else if (tok == "misc") {
- lex.next();
- string const ttok = ascii_lowercase(lex.getString());
-
- if (ttok == "no_bar") {
- f.setUnderbar(FONT_OFF);
- } else if (ttok == "no_emph") {
- f.setEmph(FONT_OFF);
- } else if (ttok == "no_noun") {
- f.setNoun(FONT_OFF);
- } else if (ttok == "emph") {
- f.setEmph(FONT_ON);
- } else if (ttok == "underbar") {
- f.setUnderbar(FONT_ON);
- } else if (ttok == "noun") {
- f.setNoun(FONT_ON);
- } else {
- lex.printError("Illegal misc type `$$Token'");
- }
- } else if (tok == "color") {
- lex.next();
- string const ttok = lex.getString();
- setLyXColor(ttok, f);
- } else {
- lex.printError("Unknown tag `$$Token'");
- error = true;
- }
- }
- return f;
-}
-
-
/// Writes the changes from this font to orgfont in .lyx format in file
void Font::lyxWriteChanges(Font const & orgfont,
ostream & os) const
break;
}
}
+ if (orgfont.fontInfo().strikeout() != bits_.strikeout()) {
+ os << "\\strikeout " << LyXMiscNames[bits_.strikeout()] << "\n";
+ }
+ if (orgfont.fontInfo().xout() != bits_.xout()) {
+ os << "\\xout " << LyXMiscNames[bits_.xout()] << "\n";
+ }
+ if (orgfont.fontInfo().uuline() != bits_.uuline()) {
+ os << "\\uuline " << LyXMiscNames[bits_.uuline()] << "\n";
+ }
+ if (orgfont.fontInfo().uwave() != bits_.uwave()) {
+ os << "\\uwave " << LyXMiscNames[bits_.uwave()] << "\n";
+ }
if (orgfont.fontInfo().noun() != bits_.noun()) {
os << "\\noun " << LyXMiscNames[bits_.noun()] << "\n";
}
bool env = false;
int count = 0;
- if (language()->babel() != base.language()->babel() &&
+
+ // polyglossia or babel?
+ if (runparams.use_polyglossia
+ && language()->lang() != base.language()->lang()
+ && language() != prev.language()) {
+ if (!language()->polyglossia().empty()) {
+ string tmp = "\\text" + language()->polyglossia();
+ if (!language()->polyglossiaOpts().empty())
+ tmp += "[" + language()->polyglossiaOpts() + "]";
+ tmp += "{";
+ os << from_ascii(tmp);
+ count += tmp.length();
+ pushLanguageName(language()->polyglossia(), true);
+ } else if (language()->encoding()->package() != Encoding::CJK) {
+ os << '{';
+ count += 1;
+ }
+ } else if (language()->babel() != base.language()->babel() &&
language() != prev.language()) {
if (language()->lang() == "farsi") {
os << "\\textFR{";
"$$lang", language()->babel());
os << from_ascii(tmp);
count += tmp.length();
- } else {
+ if (!lyxrc.language_command_end.empty())
+ pushLanguageName(language()->babel(), true);
+ } else if (language()->encoding()->package() != Encoding::CJK) {
os << '{';
count += 1;
}
}
}
- // When the current language is Hebrew, Arabic, or Farsi
+ // If the current language is Hebrew, Arabic, or Farsi
// the numbers are written Left-to-Right. ArabTeX package
// reorders the number automatically but the packages used
// for Hebrew and Farsi (Arabi) do not.
- if (bits_.number() == FONT_ON && prev.fontInfo().number() != FONT_ON
- && (language()->lang() == "hebrew"
- || language()->lang() == "farsi"
- || language()->lang() == "arabic_arabi")) {
+ if (!runparams.pass_thru && bits_.number() == FONT_ON
+ && prev.fontInfo().number() != FONT_ON
+ && (language()->lang() == "hebrew"
+ || language()->lang() == "farsi"
+ || language()->lang() == "arabic_arabi")) {
os << "{\\beginL ";
count += 9;
}
count += 6;
env = true; //We have opened a new environment
}
- if (f.underbar() == FONT_ON) {
- os << "\\underbar{";
- count += 10;
- env = true; //We have opened a new environment
- }
// \noun{} is a LyX special macro
if (f.noun() == FONT_ON) {
os << "\\noun{";
}
os << '\\'
<< LaTeXSizeNames[f.size()]
- << ' ';
- count += strlen(LaTeXSizeNames[f.size()]) + 2;
+ << "{}";
+ count += strlen(LaTeXSizeNames[f.size()]) + 3;
+ }
+ // The ulem commands need to be on the deepest nesting level
+ // because ulem puts every nested group or macro in a box,
+ // which prevents linebreaks (#8424, #8733)
+ if (f.underbar() == FONT_ON) {
+ os << "\\uline{";
+ count += 10;
+ ++runparams.inulemcmd;
+ }
+ if (f.strikeout() == FONT_ON) {
+ os << "\\sout{";
+ count += 9;
+ ++runparams.inulemcmd;
+ }
+ if (f.xout() == FONT_ON) {
+ os << "\\xout{";
+ count += 9;
+ ++runparams.inulemcmd;
+ }
+ if (f.uuline() == FONT_ON) {
+ os << "\\uuline{";
+ count += 11;
+ ++runparams.inulemcmd;
+ }
+ if (f.uwave() == FONT_ON) {
+ os << "\\uwave{";
+ count += 10;
+ ++runparams.inulemcmd;
}
return count;
}
/// Writes ending block of LaTeX needed to close use of this font
// Returns number of chars written
// This one corresponds to latexWriteStartChanges(). (Asger)
-int Font::latexWriteEndChanges(odocstream & os, BufferParams const & bparams,
+int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
OutputParams const & runparams,
Font const & base,
Font const & next,
+ bool & needPar,
bool const & closeLanguage) const
{
int count = 0;
++count;
env = true; // Size change need not bother about closing env.
}
- if (f.underbar() == FONT_ON) {
- os << '}';
- ++count;
- env = true; // Size change need not bother about closing env.
- }
if (f.noun() == FONT_ON) {
os << '}';
++count;
if (f.size() != FONT_SIZE_INHERIT) {
// We only have to close if only size changed
if (!env) {
+ if (needPar && !closeLanguage) {
+ os << "\\par";
+ count += 4;
+ needPar = false;
+ }
os << '}';
++count;
}
}
+ if (f.underbar() == FONT_ON) {
+ os << '}';
+ ++count;
+ --runparams.inulemcmd;
+ }
+ if (f.strikeout() == FONT_ON) {
+ os << '}';
+ ++count;
+ --runparams.inulemcmd;
+ }
+ if (f.xout() == FONT_ON) {
+ os << '}';
+ ++count;
+ --runparams.inulemcmd;
+ }
+ if (f.uuline() == FONT_ON) {
+ os << '}';
+ ++count;
+ --runparams.inulemcmd;
+ }
+ if (f.uwave() == FONT_ON) {
+ os << '}';
+ ++count;
+ --runparams.inulemcmd;
+ }
- // When the current language is Hebrew, Arabic, or Farsi
+ // If the current language is Hebrew, Arabic, or Farsi
// the numbers are written Left-to-Right. ArabTeX package
// reorders the number automatically but the packages used
// for Hebrew and Farsi (Arabi) do not.
- if (bits_.number() == FONT_ON && next.fontInfo().number() != FONT_ON
- && (language()->lang() == "hebrew"
- || language()->lang() == "farsi"
- || language()->lang() == "arabic_arabi")) {
+ if (!runparams.pass_thru && bits_.number() == FONT_ON
+ && next.fontInfo().number() != FONT_ON
+ && (language()->lang() == "hebrew"
+ || language()->lang() == "farsi"
+ || language()->lang() == "arabic_arabi")) {
os << "\\endL}";
count += 6;
}
if (open_encoding_) {
// We need to close the encoding even if it does not change
// to do correct environment nesting
- Encoding const * const ascii = encodings.getFromLyXName("ascii");
- pair<bool, int> const c = switchEncoding(os, bparams,
+ Encoding const * const ascii = encodings.fromLyXName("ascii");
+ pair<bool, int> const c = switchEncoding(os.os(), bparams,
runparams, *ascii);
- BOOST_ASSERT(c.first);
+ LATTEST(c.first);
count += c.second;
runparams.encoding = ascii;
open_encoding_ = false;
}
- if (closeLanguage &&
- language() != base.language() && language() != next.language()) {
+ if (closeLanguage
+ && language() != base.language() && language() != next.language()
+ && language()->encoding()->package() != Encoding::CJK) {
os << '}';
++count;
+ bool const using_begin_end =
+ runparams.use_polyglossia ||
+ !lyxrc.language_command_end.empty();
+ if (using_begin_end)
+ popLanguageName();
}
return count;
string Font::toString(bool const toggle) const
{
- string lang = "ignore";
- if (language())
- lang = language()->lang();
+ string const lang = (language() == reset_language)
+ ? "reset" : language()->lang();
ostringstream os;
os << "family " << bits_.family() << '\n'
<< "size " << bits_.size() << '\n'
<< "emph " << bits_.emph() << '\n'
<< "underbar " << bits_.underbar() << '\n'
+ << "strikeout " << bits_.strikeout() << '\n'
+ << "xout " << bits_.xout() << '\n'
+ << "uuline " << bits_.uuline() << '\n'
+ << "uwave " << bits_.uwave() << '\n'
<< "noun " << bits_.noun() << '\n'
<< "number " << bits_.number() << '\n'
<< "color " << bits_.color() << '\n'
bool Font::fromString(string const & data, bool & toggle)
{
istringstream is(data);
- Lexer lex(0,0);
+ Lexer lex;
lex.setStream(is);
int nset = 0;
int const next = lex.getInteger();
bits_.setSize(FontSize(next));
- } else if (token == "emph" || token == "underbar" ||
- token == "noun" || token == "number") {
+ } else if (token == "emph" || token == "underbar"
+ || token == "noun" || token == "number"
+ || token == "uuline" || token == "uwave"
+ || token == "strikeout" || token == "xout") {
int const next = lex.getInteger();
FontState const misc = FontState(next);
bits_.setEmph(misc);
else if (token == "underbar")
bits_.setUnderbar(misc);
+ else if (token == "strikeout")
+ bits_.setStrikeout(misc);
+ else if (token == "xout")
+ bits_.setXout(misc);
+ else if (token == "uuline")
+ bits_.setUuline(misc);
+ else if (token == "uwave")
+ bits_.setUwave(misc);
else if (token == "noun")
bits_.setNoun(misc);
else if (token == "number")
} else if (token == "language") {
string const next = lex.getString();
- if (next == "ignore")
- setLanguage(ignore_language);
- else
- setLanguage(languages.getLanguage(next));
+ setLanguage(languages.getLanguage(next));
} else if (token == "toggleall") {
toggle = lex.getBool();
features.require("noun");
LYXERR(Debug::LATEX, "Noun enabled. Font: " << to_utf8(stateText(0)));
}
+ if (bits_.underbar() == FONT_ON) {
+ LYXERR(Debug::LATEX, "font.underline: " << bits_.underbar());
+ features.require("ulem");
+ LYXERR(Debug::LATEX, "Underline enabled. Font: " << to_utf8(stateText(0)));
+ }
+ if (bits_.strikeout() == FONT_ON) {
+ LYXERR(Debug::LATEX, "font.strikeout: " << bits_.strikeout());
+ features.require("ulem");
+ LYXERR(Debug::LATEX, "Strike out enabled. Font: " << to_utf8(stateText(0)));
+ }
+ if (bits_.xout() == FONT_ON) {
+ LYXERR(Debug::LATEX, "font.xout: " << bits_.xout());
+ features.require("ulem");
+ LYXERR(Debug::LATEX, "Cross out enabled. Font: " << to_utf8(stateText(0)));
+ }
+ if (bits_.uuline() == FONT_ON) {
+ LYXERR(Debug::LATEX, "font.uuline: " << bits_.uuline());
+ features.require("ulem");
+ LYXERR(Debug::LATEX, "Double underline enabled. Font: " << to_utf8(stateText(0)));
+ }
+ if (bits_.uwave() == FONT_ON) {
+ LYXERR(Debug::LATEX, "font.uwave: " << bits_.uwave());
+ features.require("ulem");
+ LYXERR(Debug::LATEX, "Wavy underline enabled. Font: " << to_utf8(stateText(0)));
+ }
switch (bits_.color()) {
case Color_none:
case Color_inherit:
case Color_latex:
case Color_notelabel:
break;
+ case Color_brown:
+ case Color_darkgray:
+ case Color_gray:
+ case Color_lightgray:
+ case Color_lime:
+ case Color_olive:
+ case Color_orange:
+ case Color_pink:
+ case Color_purple:
+ case Color_teal:
+ case Color_violet:
+ features.require("xcolor");
+ break;
default:
features.require("color");
LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText(0)));
// FIXME: Do something for background and soul package?
- if (lang_->babel() != doc_language->babel() &&
- lang_ != ignore_language &&
- lang_ != latex_language)
+ if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
+ || (features.useBabel() && lang_->babel() != doc_language->babel())
+ || (doc_language->encoding()->package() == Encoding::CJK && lang_ != doc_language))
+ && lang_ != ignore_language
+ && lang_ != latex_language)
{
features.useLanguage(lang_);
LYXERR(Debug::LATEX, "Found language " << lang_->lang());
//<< " background " << f.background()
<< " emph " << f.emph()
<< " underbar " << f.underbar()
+ << " strikeout " << f.strikeout()
+ << " xout " << f.xout()
+ << " uuline " << f.uuline()
+ << " uwave " << f.uwave()
<< " noun " << f.noun()
<< " number " << f.number();
}