anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-21 23:09:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix lyx->tex->lyx round trip problems

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9567 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-02-02 12:40:50 +00:00
parent ad6ae8996a
commit b1cc3aad86
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tex2lyx/ChangeLog
View File

@ -1,3 +1,8 @@
2005-02-01 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* text.C (parse_text): Only reset font changes if not at the
beginning of a new layout
2005-01-31 Angus Leeming <leeming@lyx.org>
* tex2lyx.C (main): enable tex2lyx to find the top level

53
src/tex2lyx/text.C
View File

@ -995,37 +995,48 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
; // ignore it in {}`` or -{}-
else if (s == "[" || s == "]" || s == "*")
os << s;
else if (is_known(next.cs(), known_sizes))
else if (is_known(next.cs(), known_sizes)) {
// s will change the size, so we must reset
// it here
os << s << "\n\\size " << context.font.size
<< "\n";
else if (is_known(next.cs(), known_font_families))
os << s;
if (!context.atParagraphStart())
os << "\\n\\size "
<< context.font.size << "\n";
} else if (is_known(next.cs(), known_font_families)) {
// s will change the font family, so we must
// reset it here
os << s << "\n\\family "
<< context.font.family << "\n";
else if (is_known(next.cs(), known_font_series))
os << s;
if (!context.atParagraphStart())
os << "\n\\family "
<< context.font.family << "\n";
} else if (is_known(next.cs(), known_font_series)) {
// s will change the font series, so we must
// reset it here
os << s << "\n\\series "
<< context.font.series << "\n";
else if (is_known(next.cs(), known_font_shapes))
os << s;
if (!context.atParagraphStart())
os << "\n\\series "
<< context.font.series << "\n";
} else if (is_known(next.cs(), known_font_shapes)) {
// s will change the font shape, so we must
// reset it here
os << s << "\n\\shape "
<< context.font.shape << "\n";
else if (is_known(next.cs(), known_old_font_families) ||
is_known(next.cs(), known_old_font_series) ||
is_known(next.cs(), known_old_font_shapes))
os << s;
if (!context.atParagraphStart())
os << "\n\\shape "
<< context.font.shape << "\n";
} else if (is_known(next.cs(), known_old_font_families) ||
is_known(next.cs(), known_old_font_series) ||
is_known(next.cs(), known_old_font_shapes)) {
// s will change the font family, series
// and shape, so we must reset it here
os << s
<< "\n\\family " << context.font.family
<< "\n\\series " << context.font.series
<< "\n\\shape " << context.font.shape
<< "\n";
else {
os << s;
if (!context.atParagraphStart())
os << "\n\\family "
<< context.font.family
<< "\n\\series "
<< context.font.series
<< "\n\\shape "
<< context.font.shape << "\n";
} else {
handle_ert(os, "{", context, false);
// s will end the current layout and begin a
// new one if necessary