From e1c0f7268178ed7060f762c35545e875ea41e8b4 Mon Sep 17 00:00:00 2001 From: Allan Rae Date: Sun, 4 Feb 2001 07:01:49 +0000 Subject: [PATCH] A couple of tiny fixes to get it compiling and a partial fix for the '\n' output. That part still needs fixing so don't use it for 1.1.6fix yet git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1446 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/layouts/paper.layout | 2 +- po/POTFILES.in | 1 + src/ChangeLog | 11 +++++++++++ src/LaTeX.h | 20 ++++++++++++++------ src/mathed/ChangeLog | 5 +++++ src/mathed/math_parser.C | 2 +- src/paragraph.C | 4 ++++ 7 files changed, 37 insertions(+), 8 deletions(-) diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout index 0ae48b75ff..4cc067aafd 100644 --- a/lib/layouts/paper.layout +++ b/lib/layouts/paper.layout @@ -127,7 +127,7 @@ Style Author EndFont End -Style Abstract +Style Abstract Align Left AlignPossible Left diff --git a/po/POTFILES.in b/po/POTFILES.in index 8ba413e6c2..05a6c7333c 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -61,6 +61,7 @@ src/frontends/kde/refdlg.C src/frontends/kde/tabcreatedlg.C src/frontends/kde/tocdlg.C src/frontends/kde/urldlg.C +src/frontends/qt2/FormCopyright.C src/frontends/xforms/FormBase.h src/frontends/xforms/FormCitation.C src/frontends/xforms/form_citation.C diff --git a/src/ChangeLog b/src/ChangeLog index 78a177a155..e4ef92bcc9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,14 @@ +2001-02-04 Allan Rae + + * paragraph.C (TeXOnePar): Partial fix for the '\n' generation in + floats problem. I've left it commented out because it's not quite + correct. It should also test that the current object is a table or + figure inset. But I haven't gotten around to figuring out how to do + that. I *think* it'll be something like: "table" == inset.type() + + * LaTeX.h (operator==): Aux_Info should have a friend that returns a + bool. + 2001-02-02 Dekel Tsur * LaTeX.C (scanAuxFile): A rewrite of this method. It now returns diff --git a/src/LaTeX.h b/src/LaTeX.h index 74e1317074..f9c6b1c84f 100644 --- a/src/LaTeX.h +++ b/src/LaTeX.h @@ -75,14 +75,22 @@ public: /// std::set styles; /// - operator==(Aux_Info const & o) const { - return aux_file == o.aux_file && - citations == o.citations && - databases == o.databases && - styles == o.styles; - } + friend + bool operator==(Aux_Info const & a, Aux_Info const & o); }; + +/// +inline +bool operator==(Aux_Info const & a, Aux_Info const & o) +{ + return a.aux_file == o.aux_file && + a.citations == o.citations && + a.databases == o.databases && + a.styles == o.styles; +} + + /// class LaTeX : public noncopyable { public: diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 03218b7ef3..904a48b660 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,8 @@ +2001-02-04 Allan Rae + + * math_parser.C (mathed_parse): I'm sure Lars has a better fix than + just casting the variable. + 2001-02-02 Dekel Tsur * Many files: Add support for multline and alignat environments from diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index 330ea9cc30..288496ffad 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -803,7 +803,7 @@ LyxArrayBase * mathed_parse(unsigned flags, LyxArrayBase * array, panic = true; } - mathed_env = yylval.i; + mathed_env = static_cast(yylval.i); if (mathed_env != LM_OT_MIN) { size = LM_ST_DISPLAY; if (is_multiline(mathed_env)) { diff --git a/src/paragraph.C b/src/paragraph.C index e6ab4c8774..510b784b21 100644 --- a/src/paragraph.C +++ b/src/paragraph.C @@ -2421,7 +2421,11 @@ LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf, break; default: // we don't need it for the last paragraph!!! + // or for tables in floats + // -- effectively creates a \par where there isn't one which + // breaks a \subfigure or \subtable. if (next) { +// && footnoteflag == LyXParagraph::NO_FOOTNOTE) { os << '\n'; texrow.newline(); } -- 2.39.5