mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-25 05:55:34 +00:00
very basic support for switching encoding in a document (no context of grouping right now)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27721 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
4d07d0b61c
commit
632da1cc57
@ -1553,8 +1553,9 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
|
|||||||
TeXFont const oldFont = context.font;
|
TeXFont const oldFont = context.font;
|
||||||
// save the current font size
|
// save the current font size
|
||||||
string const size = oldFont.size;
|
string const size = oldFont.size;
|
||||||
// reset the font size to default, because the font size switches don't
|
// reset the font size to default, because the
|
||||||
// affect section headings and the like
|
// font size switches don't affect section
|
||||||
|
// headings and the like
|
||||||
context.font.size = known_coded_sizes[0];
|
context.font.size = known_coded_sizes[0];
|
||||||
output_font_change(os, oldFont, context.font);
|
output_font_change(os, oldFont, context.font);
|
||||||
// write the layout
|
// write the layout
|
||||||
@ -2129,25 +2130,31 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
|
|||||||
|
|
||||||
else if (t.cs() == "selectlanguage") {
|
else if (t.cs() == "selectlanguage") {
|
||||||
context.check_layout(os);
|
context.check_layout(os);
|
||||||
// save the language for the case that a \foreignlanguage is used
|
// save the language for the case that a
|
||||||
|
// \foreignlanguage is used
|
||||||
|
|
||||||
|
//FIXME: this is wrong, the language should
|
||||||
|
// be saved in the context. (JMarc)
|
||||||
selectlang = subst(p.verbatim_item(), "\n", " ");
|
selectlang = subst(p.verbatim_item(), "\n", " ");
|
||||||
os << "\\lang " << selectlang << "\n";
|
os << "\\lang " << selectlang << "\n";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (t.cs() == "foreignlanguage") {
|
else if (t.cs() == "foreignlanguage") {
|
||||||
context.check_layout(os);
|
context.check_layout(os);
|
||||||
os << "\n\\lang " << subst(p.verbatim_item(), "\n", " ") << "\n";
|
os << "\n\\lang " << subst(p.verbatim_item(), "\n", " ") << "\n";
|
||||||
os << subst(p.verbatim_item(), "\n", " ");
|
os << subst(p.verbatim_item(), "\n", " ");
|
||||||
|
// FIXME: the second argument of selectlanguage
|
||||||
|
// has to be parsed (like for \textsf, for
|
||||||
|
// example).
|
||||||
// set back to last selectlanguage
|
// set back to last selectlanguage
|
||||||
os << "\n\\lang " << selectlang << "\n";
|
os << "\n\\lang " << selectlang << "\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (t.cs() == "inputencoding")
|
else if (t.cs() == "inputencoding") {
|
||||||
// write nothing because this is done by LyX using the "\lang"
|
// nothing to write here
|
||||||
// information given by selectlanguage and foreignlanguage
|
string const enc = subst(p.verbatim_item(), "\n", " ");
|
||||||
subst(p.verbatim_item(), "\n", " ");
|
p.setEncoding(enc);
|
||||||
|
}
|
||||||
else if (t.cs() == "LyX" || t.cs() == "TeX"
|
else if (t.cs() == "LyX" || t.cs() == "TeX"
|
||||||
|| t.cs() == "LaTeX") {
|
|| t.cs() == "LaTeX") {
|
||||||
context.check_layout(os);
|
context.check_layout(os);
|
||||||
|
Loading…
Reference in New Issue
Block a user