From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Fri, 7 Jun 2002 15:49:38 +0000 (+0000)
Subject: fix table example; protect warning in buffer.C
X-Git-Tag: 1.6.10~19125
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b523000e9670edcb23986cce04d00b65aa0c51c9;p=features.git

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 9f3ea81b19..47742e9dea 100644
--- 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 a7a239ba86..74d0d0d2da 100644
--- 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 42e1a7f507..ef7c28c92c 100644
--- 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 afb5d022c0..2ca003dd6d 100644
--- 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);