EmbeddedObjects: fix bug in description of \extrarowheight command

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

lib/doc/EmbeddedObjects.lyx

@@ -1,4 +1,4 @@
-#LyX 1.5.0svn created this file. For more info see http://www.lyx.org/
+#LyX 1.5.0rc2 created this file. For more info see http://www.lyx.org/
 \lyxformat 276
 \begin_document
 \begin_header
@@ -106,7 +106,9 @@
 % used for book-style tables
 \usepackage{booktabs}
 
-% used to have extra space in table cells,
+% used to have extra space in table cells
+\@ifundefined{extrarowheight}
+ {\usepackage{array}}{}
 \setlength{\extrarowheight}{2pt}
 
 % used for customized tables
@@ -125,10 +127,6 @@
 \newcolumntype{W}{!{\color{green}\vline}}
 % ---
 
-% To be able to enter the characters ° and · directly in LyX
-\DeclareInputText{176}{\ifmmode^\circ\else\textdegree\fi}
-\DeclareInputText{183}{\ifmmode\cdot\else\textperiodcentered\fi}
-
 % insert additional vertical space of
 % 1.5 mm between footnotes
 \let\myFoot\footnote
@@ -203,6 +201,7 @@
 \bullet 3 2 7 -1
 \tracking_changes false
 \output_changes false
+\author "Anonymous" 
 \author "usti" 
 \author "Bo Peng" 
 \author "muso" 
@@ -14136,26 +14135,14 @@ reference "tab:Table-with-vertical-colored"
 \end_inset
 
  the LaTeX-argument
-\end_layout
-
-\begin_layout Standard
-
 \series bold
-WcW
+ WcW
-\end_layout
+\series default
-
+ was used for the last column and
-\begin_layout Standard
-was used for the last column and
-\end_layout
-
-\begin_layout Standard
-
 \series bold
-Wc
+ Wc
-\end_layout
+\series default
-
+ for the other columns.
-\begin_layout Standard
-for the other columns.
 \end_layout
 
 \begin_layout Standard
@@ -14321,7 +14308,22 @@ hline
 \backslash
 renewcommand{
 \backslash
-hline}{
+hline}
+\newline
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+hphantom{ }
+\end_layout
+
+\end_inset
+
+{
 \backslash
 arrayrulecolor{red}
 \backslash
@@ -14351,7 +14353,12 @@ hline
 \backslash
 renewcommand{
 \backslash
-hline}{
+hline}
+\end_layout
+
+\begin_layout Standard
+
+ {
 \backslash
 arrayrulecolor{red}
 \backslash
@@ -14538,6 +14545,7 @@ reference "tab:Table-with-colored"
 
 \begin_layout Standard
 \begin_inset Float table
+placement h
 wide false
 sideways false
 status open
@@ -14770,7 +14778,7 @@ reference "sec:Formal-Tables"
 em space.
  For normal tables the inserted space will unfortunately destroy the vertical
  table lines as in the following table:
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -14849,7 +14857,7 @@ hspace*{0pt}
 \end_inset
 
 
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -14875,7 +14883,7 @@ rows adds space between the current and the following row.
 em space.
  For normal tables the inserted space will unfortunately destroy the vertical
  table lines as in the following table:
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -14969,7 +14977,7 @@ hspace*{0pt}
 \end_inset
 
 
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -14979,14 +14987,39 @@ So inserting space between rows for normal tables is only useful when you
 \end_layout
 
 \begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
 When you want to add extra height to all cells of all tables, you can do
- this with the following preamble line:
+ this with the following preamble lines:
 \end_layout
 
 \begin_layout Standard
 
 \series bold
 
+\backslash
+@ifundef\SpecialChar \textcompwordmark{}
+ined{extrarowheight}
+\newline
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+hphantom{ }
+\end_layout
+
+\end_inset
+
+{
+\backslash
+usepackage{array}}{}
+\newline
+
 \backslash
 setlength{
 \backslash
@@ -14996,6 +15029,19 @@ extrarowheight}{height}
 \begin_layout Standard
 But this has the disadvantage that the cell texts are no longer exactly
  vertically centered.
+ (The package 
+\series bold
+array
+\series default
+ will be loaded automatically by LyX when you use self defined table formats.
+ To avoid that it is loaded twice the command 
+\series bold
+
+\backslash
+@ifundef\SpecialChar \textcompwordmark{}
+ined
+\series default
+ is used in the above command.)
 \end_layout
 
 \begin_layout Subsection

lib/doc/de/EmbeddedObjects.lyx

@@ -1,4 +1,4 @@
-#LyX 1.5.0svn created this file. For more info see http://www.lyx.org/
+#LyX 1.5.0rc2 created this file. For more info see http://www.lyx.org/
 \lyxformat 276
 \begin_document
 \begin_header
@@ -105,6 +105,8 @@
 \usepackage{booktabs}
 
 % wird benutzt, um Tabellenzellen zu vergroessern
+\@ifundefined{extrarowheight}
+ {\usepackage{array}}{}
 \setlength{\extrarowheight}{2pt}
 
 % wird fuer benutzerdefinierte Tabellen benutzt
@@ -123,10 +125,6 @@
 \newcolumntype{W}{!{\color{green}\vline}}
 % ---
 
-% Um ° und · direkt in LyX zu schreiben
-\DeclareInputText{176}{\ifmmode^\circ\else\textdegree\fi}
-\DeclareInputText{183}{\ifmmode\cdot\else\textperiodcentered\fi}
-
 % Setzt einen zusaetzlichen Abstand von
 % 1.5 mm zwischen Fussnoten
 \let\myFoot\footnote
@@ -205,6 +203,7 @@
 \bullet 3 2 7 -1
 \tracking_changes false
 \output_changes false
+\author "Anonymous" 
 \author "usti" 
 \author "Hartmut Haase" hha4491@atomstromfrei.de
 \author "Uwe Stöhr" 
@@ -15112,7 +15111,22 @@ hline
 \backslash
 renewcommand{
 \backslash
-hline}{
+hline}
+\newline
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+hphantom{ }
+\end_layout
+
+\end_inset
+
+{
 \backslash
 arrayrulecolor{red}
 \backslash
@@ -15142,7 +15156,12 @@ hline
 \backslash
 renewcommand{
 \backslash
-hline}{
+hline}
+\end_layout
+
+\begin_layout Standard
+
+ {
 \backslash
 arrayrulecolor{red}
 \backslash
@@ -15313,6 +15332,7 @@ reference "tab:Table-with-colored"
 
 \begin_layout Standard
 \begin_inset Float table
+placement h
 wide false
 sideways false
 status open
@@ -15557,7 +15577,7 @@ reference "abs:Formale-Tabellen"
  fügt LyX standardmäßig 0.5\InsetSpace \thinspace{}
 em Leerraum ein.
  Bei normalen Tabellen werden die vertikalen Linien leider nicht mit verlängert:
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -15636,7 +15656,7 @@ hspace*{0pt}
 \end_inset
 
 
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -15663,7 +15683,7 @@ Zeilen fügt zwischen zwei Zeilen zusätzlichen Leerraum ein.
  Bei einer formalen Tabelle fügt LyX standardmäßig 0.5\InsetSpace \thinspace{}
 em Leerraum ein.
  Bei normalen Tabellen werden die vertikalen Linien leider nicht mit verlängert:
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -15757,7 +15777,7 @@ hspace*{0pt}
 \end_inset
 
 
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -15767,14 +15787,39 @@ n Linien verwenden.
 \end_layout
 
 \begin_layout Standard
-Wenn Sie die Höhe aller Zellen vergrößern wollen, können Sie das mit folgendem
+\begin_inset VSpace bigskip
- Befehle im LaTeX-Vorspann machen:
+\end_inset
+
+Wenn Sie die Höhe aller Zellen vergrößern wollen, können Sie das mit folgenden
+ Befehlen im LaTeX-Vorspann machen:
 \end_layout
 
 \begin_layout Standard
 
 \series bold
 
+\backslash
+@ifundef\SpecialChar \textcompwordmark{}
+ined{extrarowheight}
+\newline
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+hphantom{ }
+\end_layout
+
+\end_inset
+
+{
+\backslash
+usepackage{array}}{}
+\newline
+
 \backslash
 setlength{
 \backslash
@@ -15784,6 +15829,20 @@ extrarowheight}{Höhe}
 \begin_layout Standard
 Aber das hat den Nachteil, dass die Zelltexte nicht mehr genau vertikal
  ausgerichtet sind.
+ (Das Paket 
+\series bold
+array
+\series default
+ wird automatisch von LyX geladen, wenn Sie selbst-definierte Tabellenformate
+ verwenden.
+ Der Befehl 
+\series bold
+
+\backslash
+@ifundef\SpecialChar \textcompwordmark{}
+ined
+\series default
+ vermeidet, dass es in diesem Fall doppelt geladen wird.)
 \end_layout
 
 \begin_layout Subsection
@@ -27197,13 +27256,14 @@ color
 status collapsed
 
 \begin_layout Standard
-
+Der Befehl 
 \series bold
 
 \backslash
-@ifundefined
+@ifundef\SpecialChar \textcompwordmark{}
+ined
 \series default
- vermeidet ein doppeltes Laden.
+ vermeidet, dass es in diesem Fall doppelt geladen wird.
 \end_layout
 
 \end_inset

lib/doc/es/EmbeddedObjects.lyx

@@ -1,4 +1,4 @@
-#LyX 1.5.0svn created this file. For more info see http://www.lyx.org/
+#LyX 1.5.0rc2 created this file. For more info see http://www.lyx.org/
 \lyxformat 276
 \begin_document
 \begin_header
@@ -96,7 +96,9 @@
 % used for book-style tables
 \usepackage{booktabs}
 
-% used to have extra space in table cells,
+% used to have extra space in table cells
+\@ifundefined{extrarowheight}
+ {\usepackage{array}}{}
 \setlength{\extrarowheight}{2pt}
 
 % used for customized tables
@@ -115,10 +117,6 @@
 \newcolumntype{W}{!{\color{green}\vline}}
 % ---
 
-% To be able to enter the characters ° and · directly in LyX
-\DeclareInputText{176}{\ifmmode^\circ\else\textdegree\fi}
-\DeclareInputText{183}{\ifmmode\cdot\else\textperiodcentered\fi}
-
 % the pages of the TOC are numbered roman
 % and a PDF-bookmark for the TOC is added
 \pagenumbering{Roman}
@@ -203,6 +201,7 @@
 \bullet 3 2 7 -1
 \tracking_changes false
 \output_changes false
+\author "Anonymous" 
 \author "usti" 
 \author "IG" 
 \author "IG,,," 
@@ -14182,26 +14181,14 @@ reference "tab:Tabla-con-verticales-coloreadas"
 \end_inset
 
  se usó el argumento LaTeX
-\end_layout
-
-\begin_layout Standard
-
 \series bold
-WcW
+ WcW
-\end_layout
+\series default
-
+ para la última columna y
-\begin_layout Standard
-para la última columna y
-\end_layout
-
-\begin_layout Standard
-
 \series bold
-Wc
+ Wc
-\end_layout
+\series default
-
+ para las demás.
-\begin_layout Standard
-para las demás.
 \end_layout
 
 \begin_layout Standard
@@ -14367,7 +14354,22 @@ hline
 \backslash
 renewcommand{
 \backslash
-hline}{
+hline}
+\newline
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+hphantom{ }
+\end_layout
+
+\end_inset
+
+{
 \backslash
 arrayrulecolor{red}
 \backslash
@@ -14397,7 +14399,12 @@ hline
 \backslash
 renewcommand{
 \backslash
-hline}{
+hline}
+\end_layout
+
+\begin_layout Standard
+
+ {
 \backslash
 arrayrulecolor{red}
 \backslash
@@ -14536,22 +14543,6 @@ sd
 \end_inset
 
 
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-pagebreak 
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard
@@ -14584,6 +14575,7 @@ reference "tab:Tabla-con-líneas-coloreadas"
 
 \begin_layout Standard
 \begin_inset Float table
+placement h
 wide false
 sideways false
 status open
@@ -14823,7 +14815,7 @@ reference "sec:Tablas-Formales"
 em por defecto.
  Si la tabla es de estilo normal el espacio adicional destruirá las líneas
  verticales, como se ve en la tabla siguiente:
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -14902,7 +14894,7 @@ hspace*{0pt}
 \end_inset
 
 
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -14931,7 +14923,7 @@ filas añade espacio entre la fila actual y la siguiente.
 em por defecto.
  En tablas normales, el espacio adicional destruirá las líneas verticales
  de la tabla, como se ve en la siguiente:
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -15021,7 +15013,7 @@ hspace*{0pt}
 \end_inset
 
 
-\begin_inset VSpace defskip
+\begin_inset VSpace medskip
 \end_inset
 
 
@@ -15031,14 +15023,39 @@ Así pues, los espacios adicionales entre filas de tablas normales sólo sirven
 \end_layout
 
 \begin_layout Standard
+\begin_inset VSpace bigskip
+\end_inset
+
 Para añadir altura vertical extra a todas las celdas de todas las tablas,
- utiliza el siguiente comando en el preámbulo:
+ utiliza los siguientes comandos en el preámbulo:
 \end_layout
 
 \begin_layout Standard
 
 \series bold
 
+\backslash
+@ifundef\SpecialChar \textcompwordmark{}
+ined{extrarowheight}
+\newline
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+hphantom{ }
+\end_layout
+
+\end_inset
+
+{
+\backslash
+usepackage{array}}{}
+\newline
+
 \backslash
 setlength{
 \backslash
@@ -15048,6 +15065,23 @@ extrarowheight}{altura}
 \begin_layout Standard
 Esto tiene el inconveniente de que el texto de las celdas no estará exactamente
  centrado en vertical.
+ (
+\lang english
+The package 
+\series bold
+array
+\series default
+ will be loaded automatically by LyX when you use self defined table formats.
+ To avoid that it is loaded twice the command 
+\series bold
+
+\backslash
+@ifundef\SpecialChar \textcompwordmark{}
+ined
+\series default
+ is used in the above command.
+\lang spanish
+)
 \end_layout
 
 \begin_layout Standard
@@ -25965,19 +25999,6 @@ en ERT antes de la palabra.
 \end_inset
 
  en ERT.
-\begin_inset ERT
-status collapsed
-
-\begin_layout Standard
-
-
-\backslash
-pagebreak 
-\end_layout
-
-\end_inset
-
-
 \end_layout
 
 \begin_layout Standard