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
This commit is contained in:
Allan Rae 2001-02-04 07:01:49 +00:00
parent d59aaf992a
commit e1c0f72681
7 changed files with 37 additions and 8 deletions

View File

@ -127,7 +127,7 @@ Style Author
EndFont EndFont
End End
Style Abstract Style Abstract
Align Left Align Left
AlignPossible Left AlignPossible Left

View File

@ -61,6 +61,7 @@ src/frontends/kde/refdlg.C
src/frontends/kde/tabcreatedlg.C src/frontends/kde/tabcreatedlg.C
src/frontends/kde/tocdlg.C src/frontends/kde/tocdlg.C
src/frontends/kde/urldlg.C src/frontends/kde/urldlg.C
src/frontends/qt2/FormCopyright.C
src/frontends/xforms/FormBase.h src/frontends/xforms/FormBase.h
src/frontends/xforms/FormCitation.C src/frontends/xforms/FormCitation.C
src/frontends/xforms/form_citation.C src/frontends/xforms/form_citation.C

View File

@ -1,3 +1,14 @@
2001-02-04 Allan Rae <rae@lyx.org>
* 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 <dekelts@tau.ac.il> 2001-02-02 Dekel Tsur <dekelts@tau.ac.il>
* LaTeX.C (scanAuxFile): A rewrite of this method. It now returns * LaTeX.C (scanAuxFile): A rewrite of this method. It now returns

View File

@ -75,14 +75,22 @@ public:
/// ///
std::set<string> styles; std::set<string> styles;
/// ///
operator==(Aux_Info const & o) const { friend
return aux_file == o.aux_file && bool operator==(Aux_Info const & a, Aux_Info const & o);
citations == o.citations &&
databases == o.databases &&
styles == o.styles;
}
}; };
///
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 { class LaTeX : public noncopyable {
public: public:

View File

@ -1,3 +1,8 @@
2001-02-04 Allan Rae <rae@lyx.org>
* math_parser.C (mathed_parse): I'm sure Lars has a better fix than
just casting the variable.
2001-02-02 Dekel Tsur <dekelts@tau.ac.il> 2001-02-02 Dekel Tsur <dekelts@tau.ac.il>
* Many files: Add support for multline and alignat environments from * Many files: Add support for multline and alignat environments from

View File

@ -803,7 +803,7 @@ LyxArrayBase * mathed_parse(unsigned flags, LyxArrayBase * array,
panic = true; panic = true;
} }
mathed_env = yylval.i; mathed_env = static_cast<MathedInsetTypes>(yylval.i);
if (mathed_env != LM_OT_MIN) { if (mathed_env != LM_OT_MIN) {
size = LM_ST_DISPLAY; size = LM_ST_DISPLAY;
if (is_multiline(mathed_env)) { if (is_multiline(mathed_env)) {

View File

@ -2421,7 +2421,11 @@ LyXParagraph * LyXParagraph::TeXOnePar(Buffer const * buf,
break; break;
default: default:
// we don't need it for the last paragraph!!! // 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) { if (next) {
// && footnoteflag == LyXParagraph::NO_FOOTNOTE) {
os << '\n'; os << '\n';
texrow.newline(); texrow.newline();
} }