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

propagate the need_protect property to optional insets (bug 1739)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9250 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2004-11-15 13:57:22 +00:00
parent 10b52fe365
commit a2891b5255
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ChangeLog
View File

@ -1,7 +1,13 @@
2004-11-15 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* paragraph.C (TeXOnePar): use LyXStyle::needprotect and pass it
to InsetOptArg::latexOptional as needed (bug 1739)
(simpleTeXOnePar): no need to honor needprotect here
2004-11-12 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* lengthcommon.C (unitFromString): revert fix, which is is not
needed (and indeed wrong) for 1.3.X
* lengthcommon.C (unitFromString): revert fix for bug 1682, which
is is not needed (and indeed wrong) for 1.3.X
2004-11-09 Jean-Marc Lasgouttes <lasgouttes@lyx.org>

4
src/insets/ChangeLog
View File

@ -1,3 +1,7 @@
2004-11-09 Jean-Marc Lasgouttes <lasgouttes@lyx.org>
* insetoptarg.C (latexOptional): honor 'fragile' argument (bug 1739)
2004-10-25 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* insetfoot.C (latex): use \thanks instead of \footnote on titlepage

4
src/insets/insetoptarg.C
View File

@ -76,10 +76,10 @@ int InsetOptArg::latex(Buffer const *, ostream &, bool, bool) const
int InsetOptArg::latexOptional(Buffer const * buf, ostream & os,
bool, bool fp) const
bool fragile, bool fp) const
{
os << '[';
int const i = inset.latex(buf, os, false, fp);
int const i = inset.latex(buf, os, fragile, fp);
os << ']';
return i + 2;
}

6
src/paragraph.C
View File

@ -975,6 +975,8 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
else
style = bparams.getLyXTextClass().defaultLayout();
moving_arg |= style->needprotect;
Language const * language = getParLanguage(bparams);
Language const * doc_language = bparams.language;
Language const * previous_language = previous()
@ -1066,7 +1068,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
if (style->optionalargs == 1) {
InsetOptArg * it = optArgInset(*this);
if (it != 0)
it->latexOptional(buf, os, false, false);
it->latexOptional(buf, os, moving_arg, false);
}
else
os << style->latexparam();
@ -1354,8 +1356,6 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
basefont = getLayoutFont(bparams);
}
moving_arg |= style->needprotect;
// Which font is currently active?
LyXFont running_font(basefont);
// Do we have an open font change?

7
status.13x
View File

@ -29,13 +29,16 @@ What's new
* Document input/output:
- Fix lyxpreview2ppm.py to work with python versions older than 2.1.
- Fix LaTeX output of percentage length values <10% [bug 1523].
- Fix output of footnotes on the titlepage, which did not work with
the memoir class [bug 1677].
- Fix the LaTeX output of Short Titles (aka optional inset) that did
not get \protect added when needed [bug 1739].
- Fix lyxpreview2ppm.py to work with python versions older than 2.1.
* User Interface: