f1.size == f2.size &&
f1.family == f2.family &&
f1.series == f2.series &&
- f1.shape == f2.shape;
+ f1.shape == f2.shape &&
+ f1.language == f2.language;
}
os << "\n\\shape " << newfont.shape << '\n';
if (oldfont.size != newfont.size)
os << "\n\\size " << newfont.size << '\n';
+ if (oldfont.language != newfont.language)
+ os << "\n\\lang " << newfont.language << '\n';
}
: need_layout(need_layout_),
need_end_layout(false), need_end_deeper(false),
has_item(false), deeper_paragraph(false),
- new_layout_allowed(true), textclass(textclass_),
+ new_layout_allowed(true), merging_hyphens_allowed(true),
+ textclass(textclass_),
layout(layout_), parent_layout(parent_layout_),
font(font_)
{
Context::~Context()
{
if (!par_extra_stuff.empty())
- cerr << "Bug: Ignoring par-level extra stuff '"
+ cerr << "Bug: Ignoring par-level extra stuff '"
<< par_extra_stuff << '\'' << endl;
}
}
// FIXME: This is not enough for things like
// \\Huge par1 \\par par2
+ // FIXME: If the document language is not english this outputs a
+ // superflous language change. Fortunately this is only file format
+ // bloat and does not change the TeX export of LyX.
output_font_change(os, normalfont, font);
}
}
need_layout = false;
need_end_layout = true;
- os << "\n";
empty = false;
}
}
os << "deeper_paragraph ";
if (new_layout_allowed)
os << "new_layout_allowed ";
+ if (merging_hyphens_allowed)
+ os << "merging_hyphens_allowed ";
if (!extra_stuff.empty())
os << "extrastuff=[" << extra_stuff << "] ";
if (!par_extra_stuff.empty())