EmbeddedObjects.lyx: port recent changes from branch

This commit is contained in:
Uwe Stöhr 2015-05-24 23:25:21 +02:00
parent e69124ab76
commit f69d5abffb
5 changed files with 35 additions and 650 deletions

View File

@ -164,7 +164,7 @@
\setboolean{diagbox}{true}}
{\setboolean{diagbox}{false}}
\end_preamble
\options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\use_default_options false
\begin_modules
initials
@ -19100,56 +19100,6 @@ Note:
\end_layout
\begin_layout Standard
Currently LyX only offers to rotate table cells by 90
\begin_inset space \thinspace{}
\end_inset
° counter-clockwise.
To rotate cells by an angle of your choice, you have to add this to the
document preamble:
\end_layout
\begin_layout Standard
\series bold
\backslash
@ifundefined{turnbox}{
\backslash
usepackage{rotating}}{}
\end_layout
\begin_layout Standard
In the table cell that should be rotated, add at the beginning this command
as TeX-code:
\end_layout
\begin_layout Standard
\series bold
\backslash
begin{turn}{angle}
\end_layout
\begin_layout Standard
where angle is the rotation angle in °.
At the end of the cell the command
\end_layout
\begin_layout Standard
\series bold
\backslash
end{turn}
\end_layout
\begin_layout Standard
is inserted as TeX-code.
\end_layout
\begin_layout Standard
Table
\begin_inset space ~
@ -19175,6 +19125,7 @@ cells were rotated by 45
\begin_layout Standard
\begin_inset Float table
placement h
wide false
sideways false
status open
@ -19203,108 +19154,33 @@ Table with rotated cells in the first row.
\begin_inset Tabular
<lyxtabular version="3" rows="2" columns="3">
<features rotate="0" tabularvalignment="middle">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top" width="0pt">
<row>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
cups
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
plates
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
saucers
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset

View File

@ -165,7 +165,7 @@
% Damit der Index den Namen "Stichwortverzeichnis" erhält
\addto\captionsngerman{\renewcommand{\indexname}{Stichwortverzeichnis}}
\end_preamble
\options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\use_default_options false
\begin_modules
initials
@ -19223,56 +19223,6 @@ Achtung:
\end_layout
\begin_layout Standard
Momentan bietet LyX nur an, Tabellenzellen um 90
\begin_inset space \thinspace{}
\end_inset
° gegen den Uhrzeigersinn zu rotieren.
Um Zellen um Winkel Ihrer Wahl zu rotieren, müssen Sie dies zu Ihrem LaTeX-Vors
pann hinzufügen:
\end_layout
\begin_layout Standard
\series bold
\backslash
@ifundefined{turnbox}{
\backslash
usepackage{rotating}}{}
\end_layout
\begin_layout Standard
In die Tabellenzelle, die rotiert werden soll, fügen Sie zu Beginn diesen
Befehl als TeX-Code ein:
\end_layout
\begin_layout Standard
\series bold
\backslash
begin{turn}{Winkel}
\end_layout
\begin_layout Standard
wobei Winkel der Rotationswinkel in ° ist.
Am Ende der Zellen wird der Befehl
\end_layout
\begin_layout Standard
\series bold
\backslash
end{turn}
\end_layout
\begin_layout Standard
als TeX-Code eingefügt.
\end_layout
\begin_layout Standard
Tabelle
\begin_inset space ~
@ -19298,6 +19248,7 @@ Zellen um 45
\begin_layout Standard
\begin_inset Float table
placement h
wide false
sideways false
status open
@ -19326,108 +19277,33 @@ Tabelle mit rotierten Zellen in der ersten Zeile.
\begin_inset Tabular
<lyxtabular version="3" rows="2" columns="3">
<features rotate="0" tabularvalignment="middle">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top" width="0pt">
<row>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
Tassen
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
Teller
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
Untertassen
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset

View File

@ -168,7 +168,7 @@
\setboolean{diagbox}{true}}
{\setboolean{diagbox}{false}}
\end_preamble
\options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\use_default_options false
\begin_modules
initials
@ -18932,56 +18932,6 @@ Nota:
\end_layout
\begin_layout Standard
Actualmente, LyX solo permite la rotación de celdas 90
\begin_inset space \thinspace{}
\end_inset
° en sentido horario.
Para otros ángulos de rotación hay que añadir lo siguiente en el preámbulo
del documento:
\end_layout
\begin_layout Standard
\series bold
\backslash
@ifundefined{turnbox}{
\backslash
usepackage{rotating}}{}
\end_layout
\begin_layout Standard
En la celda que se desee rotar, se añade al principio el siguiente comando
en código TeX:
\end_layout
\begin_layout Standard
\series bold
\backslash
begin{turn}{ángulo}
\end_layout
\begin_layout Standard
donde
\emph on
ángulo
\emph default
es el ángulo de rotación en grados.
Al final de la celda se inserta en código TeX el comando
\end_layout
\begin_layout Standard
\series bold
\backslash
end{turn}
\end_layout
\begin_layout Standard
El cuadro
\begin_inset space ~
@ -19031,108 +18981,33 @@ Cuadro con celdas rotadas en la primera fila.
\begin_inset Tabular
<lyxtabular version="3" rows="2" columns="3">
<features rotate="0" tabularvalignment="middle">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top" width="0pt">
<row>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
copas
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
platos
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
fuentes
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset

View File

@ -168,7 +168,7 @@
% use normal list environments also in French documents
\frenchbsetup{StandardLayout}
\end_preamble
\options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\use_default_options false
\begin_modules
initials
@ -19324,7 +19324,7 @@ name "sec:Rotated-Table-Cells"
\begin_inset Index idx
status open
status collapsed
\begin_layout Plain Layout
Tableau ! Pivotement des cellules
@ -19334,7 +19334,7 @@ Tableau ! Pivotement des cellules
\begin_inset Index idx
status open
status collapsed
\begin_layout Plain Layout
Pivoter des objets
@ -19362,56 +19362,6 @@ Nota:
\end_layout
\begin_layout Standard
Actuellement LyX ne propose de rotations des cellules que de 90° dans le
sens anti-horaire.
Pour obtenir des rotations d'un angle quelconque, il faut ajouter dans
le préambule:
\end_layout
\begin_layout Standard
\series bold
\backslash
@ifundefined{turnbox}{
\backslash
usepackage{rotating}}{}
\end_layout
\begin_layout Standard
Dans la cellule du tableau qui doit pivoter, ajouter au début en code TeX:
\end_layout
\begin_layout Standard
\series bold
\backslash
begin{turn}{angle}
\end_layout
\begin_layout Standard
\series bold
angle
\series default
est l'angle de rotation en degrés.
À la fin de la cellule la commande
\end_layout
\begin_layout Standard
\series bold
\backslash
end{turn}
\end_layout
\begin_layout Standard
doit être insérée en code TeX.
\end_layout
\begin_layout Standard
Le tableau
\begin_inset space ~
@ -19470,108 +19420,33 @@ Tableau incluant des cellules pivotées dans la première ligne.
\begin_inset Tabular
<lyxtabular version="3" rows="2" columns="3">
<features rotate="0" tabularvalignment="middle">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top" width="0pt">
<row>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
soucoupes
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
assiettes
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
plats
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset

View File

@ -178,7 +178,7 @@
\DeclareCaptionOption{large}[]{\def\captionfont{\large}}
\DeclareCaptionOption{Large}[]{\def\captionfont{\Large}}
\end_preamble
\options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\options bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading,usenames,dvipsnames
\use_default_options false
\begin_modules
initials
@ -226,7 +226,7 @@ End
\font_sf_scale 100
\font_tt_scale 100
\graphics default
\default_output_format pdf
\default_output_format default
\output_sync 0
\bibtex_command default
\index_command default
@ -18354,48 +18354,6 @@ status open
\end_layout
\begin_layout Standard
いまのところ、LyXでは、表セルは、反時計回りに90
\begin_inset space \thinspace{}
\end_inset
°毎に回転させることしかできません。これ以外の角度にセルを回転させたい場合には、文書プリアンブルに
\end_layout
\begin_layout Standard
\series bold
\backslash
@ifundefined{turnbox}{
\backslash
usepackage{rotating}}{}
\end_layout
\begin_layout Standard
と書き加えなくてはなりません。回転させる表セルの冒頭に、TeXコードで
\end_layout
\begin_layout Standard
\series bold
\backslash
begin{turn}{角度}
\end_layout
\begin_layout Standard
というコマンドを書き加えてください。ここで角度は、°での回転角です。さらに、セルの終わりで、TeXコードで
\end_layout
\begin_layout Standard
\series bold
\backslash
end{turn}
\end_layout
\begin_layout Standard
と入れてください。表
\begin_inset CommandInset ref
@ -18437,108 +18395,33 @@ name "tab:回転表"
\begin_inset Tabular
<lyxtabular version="3" rows="2" columns="3">
<features rotate="0" tabularvalignment="middle">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top">
<column alignment="center" valignment="top" width="0pt">
<column alignment="center" valignment="top" width="0pt">
<row>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
コップ
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset
</cell>
<cell alignment="center" valignment="top" usebox="none">
<cell alignment="center" valignment="top" rotate="45" usebox="none">
\begin_inset Text
\begin_layout Plain Layout
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
begin{turn}{45}
\end_layout
\end_inset
受け皿
\begin_inset ERT
status collapsed
\begin_layout Plain Layout
\backslash
end{turn}
\end_layout
\end_inset
\end_layout
\end_inset