fix table example; protect warning in buffer.C

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9f3ea81b196b3c40b15ee31f77c7aa52bc38e4fe..47742e9dea8b6fc01c728e469fc50964828a98ed 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-06  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * examples/TableExamples.lyx: fix footnotes inside tables
+       (bug 442)
+
 2002-06-05  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * external_templates: change the requirements of the xfig and

diff --git a/lib/examples/TableExamples.lyx b/lib/examples/TableExamples.lyx
index a7a239ba8646d4bd9511597b1a69b362a98df476..74d0d0d2da44b13ec2976a8d7542b60e177b9653 100644 (file)
--- a/lib/examples/TableExamples.lyx
+++ b/lib/examples/TableExamples.lyx
@@ -2861,7 +2861,25 @@ d
 
 \layout Standard
 
+
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+
+\backslash 
+multirow{4}{14mm}{
+\end_inset 
+
 Text in column 1
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+}
+\end_inset 
+
+
 \end_inset 
 </cell>
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
@@ -2877,7 +2895,25 @@ C2a
 
 \layout Standard
 
+
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+
+\backslash 
+multirow{4}{14mm}{
+\end_inset 
+
 Text in column 1
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+}
+\end_inset 
+
+
 \end_inset 
 </cell>
 <cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
@@ -3030,7 +3066,7 @@ centering
 position 0
 inner_position 0
 height "0pt"
-width "25p%"
+width "25col%"
 collapsed false
 
 \layout Standard
@@ -3091,7 +3127,25 @@ b
 
 \layout Standard
 
-1example1 cell(b,1)
+1
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+
+\backslash 
+footnote{
+\end_inset 
+
+example1 cell(b,1)
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+}
+\end_inset 
+
+
 \end_inset 
 </cell>
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
@@ -3175,7 +3229,25 @@ d
 
 \layout Standard
 
-9example1 cell(d,9)
+9
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+
+\backslash 
+footnote{
+\end_inset 
+
+example1 cell(d,9)
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+}
+\end_inset 
+
+
 \end_inset 
 </cell>
 </row>
@@ -3276,7 +3348,25 @@ b
 
 \layout Standard
 
-1example2 cell(b,1)
+1
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+
+\backslash 
+footnote{
+\end_inset 
+
+example2 cell(b,1)
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+}
+\end_inset 
+
+
 \end_inset 
 </cell>
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
@@ -3360,7 +3450,25 @@ d
 
 \layout Standard
 
-9example2 cell(d,9)
+9
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+
+\backslash 
+footnote{
+\end_inset 
+
+example2 cell(d,9)
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+}
+\end_inset 
+
+
 \end_inset 
 </cell>
 </row>
@@ -3440,6 +3548,16 @@ b
 \layout Standard
 
 1
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+
+\backslash 
+footnotemark
+\end_inset 
+
+
 \end_inset 
 </cell>
 <cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
@@ -3524,6 +3642,16 @@ d
 \layout Standard
 
 9
+\begin_inset ERT
+status Collapsed
+
+\layout Standard
+
+\backslash 
+footnotemark
+\end_inset 
+
+
 \end_inset 
 </cell>
 </row>

diff --git a/src/ChangeLog b/src/ChangeLog
index 42e1a7f507bfcf815f02ff1b4df8452122735a24..ef7c28c92cb7ca4109b8e5be15ec02f9056bd39f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2002-06-06  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+       * buffer.C (sgmlError): hide #warning
+
 2002-06-05  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
        * xtl/*: get rid of xtl, which is not in use anyway

diff --git a/src/buffer.C b/src/buffer.C
index afb5d022c081919472f16e3be14fa530f06c5ce3..2ca003dd6d243a71288ddd8ffae0773fe0248a80 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -3201,12 +3201,14 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
 void Buffer::sgmlError(Paragraph * /*par*/, int /*pos*/,
        string const & /*message*/) const
 {
+#ifdef WITH_WARNINGS
 #warning This is wrong we cannot insert an inset like this!!!
        // I guess this was Jose' so I explain you more or less why this
        // is wrong. This way you insert something in the paragraph and
        // don't tell it to LyXText (row rebreaking and undo handling!!!)
        // I deactivate this code, have a look at BufferView::insertErrors
        // how you should do this correctly! (Jug 20020315)
+#endif
 #if 0
        // insert an error marker in text
        InsetError * new_inset = new InsetError(message);