A couple of tiny fixes to get it compiling and a partial fix for the '\n' output...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1446 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout
index 0ae48b75ff41f8f4bd29916fbab350410b80e0fc..4cc067aafde77875fcca7ac0495e479530e00532 100644 (file)
--- 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 8ba413e6c244bd602099b6035f1d7da42286e563..05a6c7333c72c35fbe17ddd3bcc98810b474e5b1 100644 (file)
--- 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 78a177a155d207d77a3dbb7ce74393d8ceb3e57c..e4ef92bcc91897203ecbb8315b7d15794d7fa005 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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>
 
        * LaTeX.C (scanAuxFile): A rewrite of this method. It now returns

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 74e1317074f2df2a5cf603b081fd28d50beceb5a..f9c6b1c84ff6b735c1d8fb491325dbb901861c2f 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -75,14 +75,22 @@ public:
        ///
        std::set<string> 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 03218b7ef3a06147acaaedd3e24119d6c8396883..904a48b660c235d2f97886055c768060f1d1264f 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -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>
 
        * 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 330ea9cc3098a6ef5857824e41ebef492955bf85..288496ffadb971cbddf2e30fcf232c317bab9664 100644 (file)
--- 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<MathedInsetTypes>(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 e6ab4c8774f78ff9abc78b5e048473538d4d3ba6..510b784b21c570adc3e7e35485fbc7fbacc9a8fb 100644 (file)
--- 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();
                }