mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-27 06:19:36 +00:00
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
This commit is contained in:
Jean-Marc Lasgouttes
parent
fb29f01377
commit
b523000e96
@ -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
|
||||
|
||||
@ -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,170 +3348,25 @@ b
|
||||
|
||||
\layout Standard
|
||||
|
||||
1example2 cell(b,1)
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
2
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
3
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
<row topline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
c
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
4
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
5
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
6
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
<row topline="true" bottomline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
d
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
7
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
8
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
9example2 cell(d,9)
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
</lyxtabular>
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_deeper
|
||||
\layout Enumerate
|
||||
|
||||
|
||||
\emph on
|
||||
Using footnotemark and footnotetext LaTeX commands
|
||||
\begin_deeper
|
||||
\layout Standard
|
||||
|
||||
This is a heavy way to do it but just to demonstrate that it works, here
|
||||
it is.
|
||||
Use this method in minipages to get footnotes at the bottom of the page.
|
||||
\layout Standard
|
||||
\added_space_top 0.3cm \added_space_bottom 0.3cm \align center
|
||||
|
||||
\begin_inset Tabular
|
||||
<lyxtabular version="3" rows="4" columns="4">
|
||||
<features>
|
||||
<column alignment="center" valignment="top" leftline="true" rightline="true" width="0pt">
|
||||
<column alignment="center" valignment="top" leftline="true" width="0pt">
|
||||
<column alignment="center" valignment="top" leftline="true" width="0pt">
|
||||
<column alignment="center" valignment="top" leftline="true" rightline="true" width="0pt">
|
||||
<row topline="true" bottomline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
a
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
b
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
c
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
d
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
<row topline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
b
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
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">
|
||||
@ -3524,6 +3451,207 @@ d
|
||||
\layout Standard
|
||||
|
||||
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>
|
||||
</lyxtabular>
|
||||
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_deeper
|
||||
\layout Enumerate
|
||||
|
||||
|
||||
\emph on
|
||||
Using footnotemark and footnotetext LaTeX commands
|
||||
\begin_deeper
|
||||
\layout Standard
|
||||
|
||||
This is a heavy way to do it but just to demonstrate that it works, here
|
||||
it is.
|
||||
Use this method in minipages to get footnotes at the bottom of the page.
|
||||
\layout Standard
|
||||
\added_space_top 0.3cm \added_space_bottom 0.3cm \align center
|
||||
|
||||
\begin_inset Tabular
|
||||
<lyxtabular version="3" rows="4" columns="4">
|
||||
<features>
|
||||
<column alignment="center" valignment="top" leftline="true" rightline="true" width="0pt">
|
||||
<column alignment="center" valignment="top" leftline="true" width="0pt">
|
||||
<column alignment="center" valignment="top" leftline="true" width="0pt">
|
||||
<column alignment="center" valignment="top" leftline="true" rightline="true" width="0pt">
|
||||
<row topline="true" bottomline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
a
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
b
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
c
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
d
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
<row topline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
b
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\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">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
2
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
3
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
<row topline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
c
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
4
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
5
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
6
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
<row topline="true" bottomline="true">
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
d
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
7
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
8
|
||||
\end_inset
|
||||
</cell>
|
||||
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
|
||||
\begin_inset Text
|
||||
|
||||
\layout Standard
|
||||
|
||||
9
|
||||
\begin_inset ERT
|
||||
status Collapsed
|
||||
|
||||
\layout Standard
|
||||
|
||||
\backslash
|
||||
footnotemark
|
||||
\end_inset
|
||||
|
||||
|
||||
\end_inset
|
||||
</cell>
|
||||
</row>
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user