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[4];
+extern char const * LyXShapeNames[6];
+extern char const * LyXSizeNames[14];
+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",
+ "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "rsfs", "wasy", "esint",
N_("Inherit"), N_("Ignore") };
char const * GUISeriesNames[4] =
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
//
Font::Font(FontInfo bits, Language const * l)
- : bits_(bits), lang_(l), misspelled_(false), open_encoding_(false)
+ : bits_(bits), lang_(l), open_encoding_(false)
{
if (!lang_)
lang_ = default_language;
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_strikeout") {
- f.setStrikeout(FONT_OFF);
- } else if (ttok == "no_uuline") {
- f.setUuline(FONT_OFF);
- } else if (ttok == "no_uwave") {
- f.setUwave(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 == "strikeout") {
- f.setStrikeout(FONT_ON);
- } else if (ttok == "uuline") {
- f.setUuline(FONT_ON);
- } else if (ttok == "uwave") {
- f.setUwave(FONT_ON);
- } else if (ttok == "noun") {
- f.setNoun(FONT_ON);
- } else {
- lex.printError("Illegal misc type");
- }
- } else if (tok == "color") {
- lex.next();
- string const ttok = lex.getString();
- setLyXColor(ttok, f);
- } else {
- lex.printError("Unknown tag");
- 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
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();
+ }
+ } else if (language()->babel() != base.language()->babel() &&
language() != prev.language()) {
if (language()->lang() == "farsi") {
os << "\\textFR{";
/// 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,
// We need to close the encoding even if it does not change
// to do correct environment nesting
Encoding const * const ascii = encodings.fromLyXName("ascii");
- pair<bool, int> const c = switchEncoding(os, bparams,
+ pair<bool, int> const c = switchEncoding(os.os(), bparams,
runparams, *ascii);
LASSERT(c.first, /**/);
count += c.second;
projects / lyx.git / blobdiff