UserGuide.lyx, Additional.lyx, Tutorial.lyx: port latest changes to trunk

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

diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index ffd383a839cfc58c1974fb5f3928e21bdc3ff1a2..a9d8c8b06320213b5aa8640165354d45d62c0c7f 100644 (file)
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -43,17 +43,6 @@
 
 % extra space for tables
 \newcommand{\extratablespace}[1]{\noalign{\vskip#1}}
 
 % extra space for tables
 \newcommand{\extratablespace}[1]{\noalign{\vskip#1}}

-
-% test for installed LaTeX packages
-\usepackage{ifthen}
-
-% for wrapped figures/tables
-% test for picinpar
-\newboolean{picinpar}
-\IfFileExists{picinpar.sty}
- {\usepackage{picinpar}
-  \setboolean{picinpar}{true}}
- {\setboolean{picinpar}{false}}

 \end_preamble
 \options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading
 \use_default_options false
 \end_preamble
 \options fleqn,bibliography=totoc,index=totoc,BCOR7.5mm,titlepage,captions=tableheading
 \use_default_options false


@@ -22491,10 +22480,9 @@ Special features
 You can do everything with LyX that you can do with LaTeX.
  However, LyX cannot support every LaTeX feature directly.
  But you can always use TeX Code.
 You can do everything with LyX that you can do with LaTeX.
  However, LyX cannot support every LaTeX feature directly.
  But you can always use TeX Code.

- This chapter shows you some more special things that are possible with
- LyX that you might want to use.
- For spcial things you can do with the features that are directly supported
- by LyX, have a look at the 
+ This chapter shows you some more special things you might want to use.
+ For other special things you can do with figures, tables, floats, boxes
+ and notes, have a look at the 

 \emph on
 EmbeddedObjects
 \emph default
 \emph on
 EmbeddedObjects
 \emph default


@@ -22505,90 +22493,66 @@ EmbeddedObjects
 Multiple Columns
 \end_layout
 
 Multiple Columns
 \end_layout
 

-\begin_layout Subsection
-Purpose
-\end_layout
-

 \begin_layout Standard
 \begin_layout Standard

-The aim for this chapter
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Editor's note: Lars' original chapter was a masterful description of how
- to use the 
-\family typewriter
-multicol
-\family default
- package.
- However, it was too long to flow smoothly in this document.
- I have therefore chosen to excerpt the most important sections here (sorry,
- Lars); you can read the original chapter (and more of the story!) in the
- example file 
-\family typewriter
-examples/multicol.lyx
-\family default
-.
- — mer
-\end_layout
-
-\end_inset
-
- is to show how the LaTeX package 
-\family typewriter
+The aim for this section is to show how the LaTeX package 
+\series bold

 multicol
 multicol

-\family default
+\series default

  can be used in a LyX document.
  can be used in a LyX document.

- As LyX doesn't support the 
-\family typewriter
+ LyX does not support the 
+\series bold

 multicol
 multicol

-\family default
- package natively yet, we have to use some small hacks.
- By reading this section it should be obvious how to do this.
-\end_layout
-
-\begin_layout Subsection
-Limitations 
+\series default
+ package natively yet, so you have to use some TeX code.

 \end_layout
 
 \begin_layout Standard
 The 
 \end_layout
 
 \begin_layout Standard
 The 

-\family typewriter
+\series bold

 multicol
 multicol

-\family default
+\series default

  package allows switching between one and multicolumn format on the same
  page.
  package allows switching between one and multicolumn format on the same
  page.

- Footnotes are handled correctly (for the most part), but will be placed
- at the bottom of the page and not under each column.
- LaTeX's float mechanism, however, is partly disabled in the current implementat
-ion.
- At the moment only page-wide floats can be used within the scope of the
- environment.
+ Footnotes are handled correctly, but will be placed at the bottom of the
+ page and not under each column.
+ Within the different columns you can use everyting, with the limitation
+ that for floats you need to use the option 
+\family sans
+Span colums
+\family default
+ for each column.

 \end_layout
 
 \begin_layout Subsection
 \end_layout
 
 \begin_layout Subsection

-Examples
+Two columns

 \end_layout
 
 \end_layout
 

-\begin_layout Subsubsection
-Two columns
+\begin_layout Standard
+If you want to have two columns in your text, insert the comand

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-If you want to have two columns in your text, you have use LaTeX mode to
- insert 
-\family typewriter
+
+\series bold

 
 \backslash
 begin{multicols}{2}
 
 \backslash
 begin{multicols}{2}

-\family default
- at the point where you want the two column layout to start, and then 
-\family typewriter
+\end_layout
+
+\begin_layout Standard
+at the point where you want the two column layout to start, and then
+\end_layout
+
+\begin_layout Standard
+
+\series bold

 
 \backslash
 end{multicols}
 
 \backslash
 end{multicols}

-\family default
- where you want it to end.
+\end_layout
+
+\begin_layout Standard
+where you want it to end.

  Like this:
 \end_layout
 
  Like this:
 \end_layout
 


@@ -22666,7 +22630,7 @@ end{multicols}
 
 \end_layout
 
 
 \end_layout
 

-\begin_layout Subsubsection
+\begin_layout Subsection

 Multiple columns
 \end_layout
 
 Multiple columns
 \end_layout
 


@@ -22735,7 +22699,7 @@ You can have more than 3 columns if you want to, but that might not be very
  pleasant for the eye.
 \end_layout
 
  pleasant for the eye.
 \end_layout
 

-\begin_layout Subsubsection
+\begin_layout Subsection

 Columns inside columns
 \end_layout
 
 Columns inside columns
 \end_layout
 


@@ -22860,1401 +22824,187 @@ end{multicols}
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Please do read the file 
+Please read the example file 

 \family typewriter
 \family typewriter

-examples/multicol.lyx
+multicol.lyx

 \family default
  for more advanced examples including column and header spacing, vertical
  separator lines, and more.
 \end_layout
 
 \begin_layout Section
 \family default
  for more advanced examples including column and header spacing, vertical
  separator lines, and more.
 \end_layout
 
 \begin_layout Section

-Numbering in the 
-\family sans
-Enumerate
-\family default
- Paragraph Environment
-\begin_inset Argument
-status collapsed
-
-\begin_layout Plain Layout
-Numbering in Enumerate
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
+Dropped Capitals

 \end_layout
 
 \begin_layout Standard
 \noindent
 \end_layout
 
 \begin_layout Standard
 \noindent

-The default numbering for the 
-\family sans
-Enumerate
-\family default
- paragraph environment begins with Arabic numbers and ends with uppercase
- letters.
- Suppose, however, you wanted a different type of numbering scheme.
- Here's a quickie example of how to change the numbering scheme:
-\end_layout
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout

 
 

-\begin_layout LyX-Code

 
 \backslash
 
 \backslash

-renewcommand{
+newfont{
+\backslash
+tmpfont}{cmr17 scaled 2500}{

 \backslash
 \backslash

-labelenumi}{
+tmpfont T}

 \backslash
 \backslash

-Roman{enumi}.}
+vspace*{-8.4ex}

 \end_layout
 
 \end_layout
 

-\begin_layout LyX-Code
+\end_inset
+

 
 

-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumii}.}

 \end_layout
 
 \end_layout
 

-\begin_layout LyX-Code
+\begin_layout Standard
+\noindent
+\begin_inset ERT
+status open

 
 

-\backslash
-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-arabic{enumiii}.}
-\end_layout
+\begin_layout Plain Layout

 
 

-\begin_layout LyX-Code

 
 \backslash
 
 \backslash

-renewcommand{
-\backslash
-labelenumiv}{
+hangindent=3.3em 

 \backslash
 \backslash

-alph{enumiv}.)}
+hangafter=-3

 \end_layout
 
 \end_layout
 

-\begin_layout Standard
-\SpecialChar \ldots{}
- which changes the numbering scheme to uppercase Roman numerals, uppercase
- letters, Arabic numbers, and lowercase letter.
-\end_layout
+\end_inset

 
 

-\begin_layout Standard
-Additionally, the previous example also adds a little bit extra to the numbering
- scheme.
- For example, the first level label actually looks like: 
+ hose of you who like the style of old books probably also like 

 \begin_inset Quotes eld
 \end_inset
 
 \begin_inset Quotes eld
 \end_inset
 

-I.
+dropped capitals

 \begin_inset Quotes erd
 \end_inset
 
 \begin_inset Quotes erd
 \end_inset
 

-.
- For ease of reading, we'll describe what the numbering schemes look like
- using a notation something like this: <
-\begin_inset Quotes eld
-\end_inset
+—those large capital letters which begin each new chapter or section.
+ Implementing them with plain LyX/LaTeX is straightforward (assuming you
+ know some plain TeX!) but does require a lot of work and many iterations,
+ as you can see by all the ugly TeX-mode stuff at the beginning of this
+ paragraph.
+\end_layout

 
 

-I.
-\begin_inset Quotes erd
-\end_inset
+\begin_layout Standard
+\begin_inset ERT
+status open

 
 

-,
-\begin_inset space ~
-\end_inset
+\begin_layout Plain Layout

 
 
 
 

-\begin_inset Quotes erd
-\end_inset
+\backslash
+verb+
+\backslash
+bigdrop{-1em}{3}{ptmri}{T}+
+\end_layout

 
 

-A.
-\begin_inset Quotes erd

 \end_inset
 
 \end_inset
 

-,
-\begin_inset space ~
+here is a much easier way of doing this, of course.
+ The 
+\family typewriter
+dropcaps
+\family default
+ (or the newer 
+\family typewriter
+dropping
+\family default
+) package from CTAN allows a simple way to add such letters to your documents.
+ Since this package is not a standard part of TeXLive, I can't demonstrate
+ it within this document, but if you copy this paragraph to a new document,
+ delete the 
+\begin_inset Quotes eld

 \end_inset
 
 
 \end_inset
 
 

-\begin_inset Quotes erd
-\end_inset
+\family typewriter

 
 

-1.
-\begin_inset Quotes erd
-\end_inset
+\backslash
+verb
+\family default

 
 

-,
-\begin_inset space ~
+\begin_inset Quotes erd

 \end_inset
 
 \end_inset
 

+ and the pluses from the TeX code at the beginning of the paragraph, and
+ add 
+\family typewriter

 
 

+\backslash
+usepackage{dropcaps}
+\family default
+ to your LaTeX preamble, you will get a nice Times Roman Italic 

 \begin_inset Quotes eld
 \end_inset
 
 \begin_inset Quotes eld
 \end_inset
 

-a.)
+T

 \begin_inset Quotes erd
 \end_inset
 
 \begin_inset Quotes erd
 \end_inset
 

->.
- 
-\end_layout
-
-\begin_layout Standard
-As you can see in the example, there is a label command for each nesting
- level, 
-\family typewriter
+, whose height is three lines of text and which protrudes 1 em into the
+ margin.
+ (Make certain you have copied 
+\begin_inset Quotes eld
+\end_inset

 
 

-\backslash
-labelenumi
-\family default
- \SpecialChar \ldots{}
- 
-\family typewriter

 
 

-\backslash
-labelenumiv
-\family default
-, as well as a counter, 

 \family typewriter
 \family typewriter

-enumi
+dropcaps.sty

 \family default
 \family default

- \SpecialChar \ldots{}
- 
+
+\begin_inset Quotes erd
+\end_inset
+
+ into a directory where TeX can see it.) The first argument is the amount
+ of indentation; in this case the negative sign moves it into the margin.
+ The second argument is the height of the letter in number of lines of text.
+ The third argument is the font name: virtually anything which has a tfm
+ file should work (wade through the 

 \family typewriter
 \family typewriter

-enumiv
+.../texmf/fonts/tfm

 \family default
 \family default

-.
- There are also five 
+ directory for possibilities).
+ My personal favorite is 

 \begin_inset Quotes eld
 \end_inset
 
 \begin_inset Quotes eld
 \end_inset
 

-number printing
-\begin_inset Quotes erd
-\end_inset

 
 

- commands, 

 \family typewriter
 \family typewriter

-
-\backslash
-arabic{}
+yinit

 \family default
 \family default

-, 
-\family typewriter

 
 

-\backslash
-roman{}
-\family default
-, 
-\family typewriter
+\begin_inset Quotes erd
+\end_inset

 
 

-\backslash
-Roman{}
+, a fancy German font specifically designed for dropped capitals.
+ The fourth argument is the letter (or letters) to be dropped.
+ The 
+\family typewriter
+dropping

 \family default
 \family default

-, 
+ package also offers the 

 \family typewriter
 
 \backslash
 \family typewriter
 
 \backslash

-alph{}
+bigdrop

 \family default
 \family default

-, and 
+ command, as well as a slightly simplified 

 \family typewriter
 
 \backslash
 \family typewriter
 
 \backslash

-Alph{}
+dropping

 \family default
 \family default

-, each of which take one counter as an argument.
- You can add characters before or after these, but there's no need to add
- spaces.
+ command.

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-You can get really fancy with these.
- For example:
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumi}{
-\backslash
-#
-\backslash
-Alph{enumi}
-\backslash
-#}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumi}.
-\backslash
-arabic{enumii}}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-alph{enumiii}+}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiv}{(
-\backslash
-roman{enumiv})}
-\end_layout
-
-\begin_layout Standard
-produces the somewhat out of hand numbering scheme: <
-\begin_inset Quotes eld
-\end_inset
-
-#A#
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes erd
-\end_inset
-
-A.1
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes erd
-\end_inset
-
-a+
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes eld
-\end_inset
-
-(i)
-\begin_inset Quotes erd
-\end_inset
-
->.
- 
-\end_layout
-
-\begin_layout Section
-Dropped Capitals
-\end_layout
-
-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\noindent
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-newfont{
-\backslash
-tmpfont}{cmr17 scaled 2500}{
-\backslash
-tmpfont T}
-\backslash
-vspace*{-8.4ex}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\noindent
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-hangindent=3.3em 
-\backslash
-hangafter=-3
-\end_layout
-
-\end_inset
-
- hose of you who like the style of old books probably also like 
-\begin_inset Quotes eld
-\end_inset
-
-dropped capitals
-\begin_inset Quotes erd
-\end_inset
-
-—those large capital letters which begin each new chapter or section.
- Implementing them with plain LyX/LaTeX is straightforward (assuming you
- know some plain TeX!) but does require a lot of work and many iterations,
- as you can see by all the ugly TeX-mode stuff at the beginning of this
- paragraph.
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-verb+
-\backslash
-bigdrop{-1em}{3}{ptmri}{T}+
-\end_layout
-
-\end_inset
-
-here is a much easier way of doing this, of course.
- The 
-\family typewriter
-dropcaps
-\family default
- (or the newer 
-\family typewriter
-dropping
-\family default
-) package from CTAN allows a simple way to add such letters to your documents.
- Since this package is not a standard part of TeXLive, I can't demonstrate
- it within this document, but if you copy this paragraph to a new document,
- delete the 
-\begin_inset Quotes eld
-\end_inset
-
-
-\family typewriter
-
-\backslash
-verb
-\family default
-
-\begin_inset Quotes erd
-\end_inset
-
- and the pluses from the TeX code at the beginning of the paragraph, and
- add 
-\family typewriter
-
-\backslash
-usepackage{dropcaps}
-\family default
- to your LaTeX preamble, you will get a nice Times Roman Italic 
-\begin_inset Quotes eld
-\end_inset
-
-T
-\begin_inset Quotes erd
-\end_inset
-
-, whose height is three lines of text and which protrudes 1 em into the
- margin.
- (Make certain you have copied 
-\begin_inset Quotes eld
-\end_inset
-
-
-\family typewriter
-dropcaps.sty
-\family default
-
-\begin_inset Quotes erd
-\end_inset
-
- into a directory where TeX can see it.) The first argument is the amount
- of indentation; in this case the negative sign moves it into the margin.
- The second argument is the height of the letter in number of lines of text.
- The third argument is the font name: virtually anything which has a tfm
- file should work (wade through the 
-\family typewriter
-.../texmf/fonts/tfm
-\family default
- directory for possibilities).
- My personal favorite is 
-\begin_inset Quotes eld
-\end_inset
-
-
-\family typewriter
-yinit
-\family default
-
-\begin_inset Quotes erd
-\end_inset
-
-, a fancy German font specifically designed for dropped capitals.
- The fourth argument is the letter (or letters) to be dropped.
- The 
-\family typewriter
-dropping
-\family default
- package also offers the 
-\family typewriter
-
-\backslash
-bigdrop
-\family default
- command, as well as a slightly simplified 
-\family typewriter
-
-\backslash
-dropping
-\family default
- command.
-\end_layout
-
-\begin_layout Section
-
-\lang ngerman
-Textumflossene Bilder und Tabellen
-\end_layout
-
-\begin_layout Standard
-
-\lang ngerman
-Im 
-\emph on
-Eingebettete Objekte
-\emph default
- Handbuch werden Umflossene Gleitobjekte beschrieben.
- Sie liefern Folgendes:
-\end_layout
-
-\begin_layout Standard
-\noindent
-\align center
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- or 
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-
-\lang ngerman
-Wenn Sie aber text richtig um Bilder oder Tabellen fließen lassen wollen,
- also auch so etwas:
-\lang english
-
-\begin_inset VSpace defskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\noindent
-\align center
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="3">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="3">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\noindent
-\align center
-\begin_inset Tabular
-<lyxtabular version="3" rows="3" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="3" columns="3">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="3" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\noindent
-
-\lang ngerman
-sollten Sie das LaTeX-Paket 
-\family sans
-picinpar
-\family default
- benutzen.
- Hier ist ein Beispiel:
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-ifpicinpar
-\end_layout
-
-\end_inset
-
-
-\lang ngerman
-
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-
-\lang ngerman
-Das folgende Beispiel wird nur gedruckt, wenn das LaTeX-Paket 
-\family typewriter
-picinpar
-\family default
- installiert ist.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{window}[2,c,{
-\end_layout
-
-\end_inset
-
-
-\begin_inset Graphics
-       filename clipart/mobius.eps
-       width 40col%
-       scaleBeforeRotation
-       rotateOrigin center
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-},{}]
-\end_layout
-
-\begin_layout Plain Layout
-
-
-\backslash
-hspace{-1em}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-hspace*{1em}
-\end_layout
-
-\end_inset
-
-
-\lang ngerman
-Textumflossene Bilder oder Tabellen sind keine Gleitobjekte, weil sie dort
- gedruckt werden, wo sie definiert wurden.
- Dieser Typ wird benutzt, um text um eine Abbildung herum 
-\emph on
-fließen
-\emph default
- zu lassen, wobei der text nur den Teil der Zeile benutzt, den die Abbildung
- übrig lässt.
- Er wird so eingefügt, wie Sie hier sehen, wenn das La\SpecialChar \-
-TeX-Paket 
-\family typewriter
-picinpar
-\family default
- installiert ist.
- Der erste Parameter in der eckigen
-\begin_inset Newline linebreak
-\end_inset
-
-Klammer, hier 2, definiert die Anzahl der Zeilen über dem Bild, der zweite,
- hier c, die Position des Bildes.
- Die Abbildung nimmt 40
-\begin_inset space \thinspace{}
-\end_inset
-
-% der Spaltenbreite ein.
- Weitere Einzelheiten finden Sie in der Dokumentation von 
-\family typewriter
-picinpar
-\family default
-.
- Die Bildparameter können Sie mit einem Klick auf das Bild wie gewohnt ändern.
-\lang english
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{window}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-else
-\end_layout
-
-\end_inset
-
-
-\lang ngerman
-
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-
-\lang ngerman
-Der folgende Teil wird gedruckt, wenn das LaTeX-Paket 
-\family typewriter
-picinpar
-\family default
- nicht installiert ist:
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-
-\lang ngerman
-Sie müssen das LaTeX-Paket 
-\family typewriter
-picinpar
-\family default
- installiert haben, um das Beispiel in der Ausgabe zu sehen.
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-fi
-\end_layout
-
-\end_inset
+\begin_inset Newpage newpage
+\end_inset

 
 
 \end_layout
 
 
 \end_layout


@@ -24263,13 +23013,6 @@ fi
 Non-standard Paragraph Shapes
 \end_layout
 
 Non-standard Paragraph Shapes
 \end_layout
 

-\begin_layout Standard
-\begin_inset VSpace bigskip
-\end_inset
-
-
-\end_layout
-

 \begin_layout Standard
 \begin_inset ERT
 status collapsed
 \begin_layout Standard
 \begin_inset ERT
 status collapsed

diff --git a/lib/doc/Tutorial.lyx b/lib/doc/Tutorial.lyx
index c76d8b9952074c92f433552d7c6ced43901c605e..4a3216c245fcc21b352bc844eb4ce4a944f74b3c 100644 (file)
--- a/lib/doc/Tutorial.lyx
+++ b/lib/doc/Tutorial.lyx
@@ -2258,7 +2258,7 @@ Your first cross-reference
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Place the cursor somewhere in section
+Place the cursor somewhere in Section

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 


@@ -2271,7 +2271,7 @@ If you want to know more about this document, then see
 \begin_inset Newline newline
 \end_inset
 
 \begin_inset Newline newline
 \end_inset
 

-section, which can be found on page.
+Section, which can be found on page.

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -2384,8 +2384,11 @@ Section 2
 \begin_inset Quotes erd
 \end_inset
 
 \begin_inset Quotes erd
 \end_inset
 

- and depending how much text you have between the start of Section 2 and
- this cross-reference you may see 
+ and depending how much text you have between the start of Section
+\begin_inset space ~
+\end_inset
+
+2 and this cross-reference you may see 

 \begin_inset Quotes eld
 \end_inset
 
 \begin_inset Quotes eld
 \end_inset
 


@@ -2512,7 +2515,7 @@ status collapsed
 
 \begin_layout Plain Layout
 By the way, copying a chapter title may cause an error, because chapters
 
 \begin_layout Plain Layout
 By the way, copying a chapter title may cause an error, because chapters

- are not allowed in the article class, see section
+ are not allowed in the article class, see Section

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 


@@ -4530,7 +4533,7 @@ LyX cannot do absolutely everything that LaTeX can do.
 \backslash
 usepackage{foo}
 \family default
 \backslash
 usepackage{foo}
 \family default

- in the preamble (see section
+ in the preamble (see Section

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 


@@ -4786,7 +4789,7 @@ After you have done this, you can use citations from any bibliographies
 Insert\SpecialChar \menuseparator
 Citation
 \family default
 Insert\SpecialChar \menuseparator
 Citation
 \family default

- (see section
+ (see Section

 \begin_inset space ~
 \end_inset
 
 \begin_inset space ~
 \end_inset
 

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index ea7f73d8bea3fa4f2e3516c52416cb0960f90c1d..fe777525ac06c24346cb0f87fad2bdc4f4183bde 100644 (file)
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -9058,6 +9058,391 @@ Itemize
  You have a huge variety of options at your disposal.
 \end_layout
 
  You have a huge variety of options at your disposal.
 \end_layout
 

+\begin_layout Subsection
+Custom Numbering of Numbered Lists
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Lists ! Enumerate ! Customized
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\noindent
+The default numbering of numbered lists can be changed by adding this command
+ in TeX Code (shortcut 
+\begin_inset Info
+type  "shortcut"
+arg   "ert-insert"
+\end_inset
+
+)
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+For more about TeX Code, look at section
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:TeX-Code"
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+ to your document preamble or in the text:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+roman{enumi}}
+\end_layout
+
+\begin_layout Standard
+
+\emph on
+enumi
+\emph default
+ is hereby the counter of the enumeration in the first level.
+ The command 
+\series bold
+
+\backslash
+roman
+\series default
+ outputs the counter as small Roman numeral.
+ For capital Roman numerals replace in the command above 
+\series bold
+
+\backslash
+roman
+\series default
+ by 
+\series bold
+
+\backslash
+Roman
+\series default
+.
+ For Arabic numerals use 
+\series bold
+
+\backslash
+arabic
+\series default
+.
+ To 
+\begin_inset Quotes eld
+\end_inset
+
+number
+\begin_inset Quotes erd
+\end_inset
+
+ items with capital or small Latin letters use 
+\series bold
+
+\backslash
+Alph
+\series default
+ or 
+\series bold
+
+\backslash
+alph
+\series default
+, respectively.
+ To 
+\begin_inset Quotes eld
+\end_inset
+
+number
+\begin_inset Quotes erd
+\end_inset
+
+ items with symbols use 
+\series bold
+
+\backslash
+fnsymbol
+\series default
+.
+\end_layout
+
+\begin_layout Standard
+\noindent
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ You can only number 26
+\begin_inset space ~
+\end_inset
+
+items with Latin letters, because this numbering is limited to single letters.
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Note:
+\series default
+ You can only number 9
+\begin_inset space ~
+\end_inset
+
+items with symbols.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+To change the numbering for the list sublevels, replace each 'i' in the
+ command by the small Roman numeral of the level (enumi, enumii, enumiii,
+ enumiv).
+\end_layout
+
+\begin_layout Standard
+As example a list with custom numbering:
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Enumerate
+Level 1
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+Level 2
+\end_layout
+
+\begin_layout Enumerate
+Level 2
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+Level 3
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+Level 4
+\end_layout
+
+\end_deeper
+\end_deeper
+\end_deeper
+\begin_layout Standard
+For this list these commands were used:
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+arabic{enumi}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+alph{enumi})}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+roman{enumiii}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{
+\backslash
+Alph{enumiv}.}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+set the numbering back to the default
+\end_layout
+
+\end_inset
+
+
+\end_layout
+

 \begin_layout Section
 Spacing, pagination and line breaks
 \begin_inset Index idx
 \begin_layout Section
 Spacing, pagination and line breaks
 \begin_inset Index idx

diff --git a/lib/doc/de/Additional.lyx b/lib/doc/de/Additional.lyx
index d970a154cf15e6b27b507d34227bfaac85110d1b..b1cecb48a3bb80238500501331642b5366335480 100644 (file)
--- a/lib/doc/de/Additional.lyx
+++ b/lib/doc/de/Additional.lyx
@@ -2027,7 +2027,7 @@ X-Vorspann
  Außerdem gibt es in diesem Handbuch in Kapitel 
 \begin_inset CommandInset ref
 LatexCommand vref
  Außerdem gibt es in diesem Handbuch in Kapitel 
 \begin_inset CommandInset ref
 LatexCommand vref

-reference "Geheimnisse-der-LaTeX-Meister"
+reference "chap:Spezielle-Features"

 
 \end_inset
 
 
 \end_inset
 


@@ -22469,10 +22469,10 @@ ben
 \end_layout
 
 \begin_layout Chapter
 \end_layout
 
 \begin_layout Chapter

-Geheimnisse der LaTeX-Meister
+Spezielle Features

 \begin_inset CommandInset label
 LatexCommand label
 \begin_inset CommandInset label
 LatexCommand label

-name "Geheimnisse-der-LaTeX-Meister"
+name "chap:Spezielle-Features"

 
 \end_inset
 
 
 \end_inset
 


@@ -22492,7 +22492,7 @@ status collapsed
 
 \end_inset
 
 
 \end_inset
 

-X!-Geheimnisse
+X ! Spezielle Features

 \end_layout
 
 \end_inset
 \end_layout
 
 \end_inset


@@ -22501,364 +22501,419 @@ X!-Geheimnisse
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Obwohl LyX ein sehr leistungsfähiges Programm ist, ist es unmöglich, all
- die Dinge, die mit reinem TeX/LaTeX möglich sind, zu unterstützen.
- Dennoch sind viele in TeX und LaTeX übliche und verbreitete Tricks auch
- in LyX möglich, zumindest, wenn es Ihnen nichts ausmacht, den 
-\family sans
-TeX
-\family default
--Schalter in der Werkzeugleiste zu verwenden oder (via 
-\family sans
-Dokument\SpecialChar \menuseparator
-Einstellungen\SpecialChar \ldots{}
-\SpecialChar \menuseparator
-LaTe
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout

 
 

-{}
+\lang english
+You can do everything with LyX that you can do with LaTeX.
+ However, LyX cannot support every LaTeX feature directly.
+ But you can always use TeX Code.
+ This chapter shows you some more special things you might want to use.
+ For other special things you can do with figures, tables, floats, boxes
+ and notes, have a look at the 
+\emph on
+\lang ngerman
+EingebetteteObjekte
+\emph default
+ Handbuch.

 \end_layout
 
 \end_layout
 

-\end_inset
-
-X-Vorspann
-\family default
-) LaTeX-Befehle selber in den LaTeX-Vorspann einzutragen.
+\begin_layout Section
+Mehrere Spalten

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-In diesem Kapitel werden einige Tipps, Tricks und sonstige gute Ideen aufgezeigt
-, um Ihren Dokumenten einen besonderen Anstrich zu geben.
- 
-\emph on
-Machen Sie das aber zu Hause!
-\emph default
- Fangen Sie erstmal mit einem kleineren Text an, nicht gleich mit etwas
- so wichtigem wie Ihrer Dissertation.
-\end_layout

 
 

-\begin_layout Standard
-Die meisten hier vorgestellten Ideen setzen Pakete voraus, die nicht in
- allen LaTeX-Distributio\SpecialChar \-
-nen zum Standard gehören.
- Bei einem kompletten System wie teTeX oder texlive werden zwar die meisten
- dieser Pakete eingeschlossen sein, ein paar werden Sie sich aber trotzdem
- von einem CTAN-Archiv besorgen müssen.
- 
+\lang english
+The aim for this section is to show how the LaTeX package 
+\series bold
+multicol
+\series default
+ can be used in a LyX document.
+ LyX does not support the 
+\series bold
+multicol
+\series default
+ package natively yet, so you have to use some TeX code.

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Oft gibt es in LaTeX mehrere Wege, etwas Bestimmtes zu erreichen, und oft
- gibt es mehrere Stildateien, die demselben Zweck dienen.
- Hier soll nicht ein Paket oder Weg einem anderen vorgezogen werden, es
- soll einfach nur gezeigt werden, 
-\emph on
-wie
-\emph default
- eine bestimmte Aufgabe mit dem benutzten Paket gelöst werden kann.
- Also: setzen Sie Ihren Zauberhut auf, passen Sie auf Drachen auf und lassen
- Sie uns anfangen.
-\end_layout

 
 

-\begin_layout Section
-Nummerierung in der 
+\lang english
+The 
+\series bold
+multicol
+\series default
+ package allows switching between one and multicolumn format on the same
+ page.
+ Footnotes are handled correctly, but will be placed at the bottom of the
+ page and not under each column.
+ Within the different columns you can use everyting, with the limitation
+ that for floats you need to use the option 

 \family sans
 \family sans

-Aufzählung
+Span colums

 \family default
 \family default

--Absatzumgebung
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Aufzahlung@Aufzählung!Nummerierung
+ for each column.

 \end_layout
 
 \end_layout
 

-\end_inset
+\begin_layout Subsection
+Zwei Spalten
+\end_layout

 
 

+\begin_layout Standard

 
 

+\lang english
+If you want to have two columns in your text, insert the comand

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Die Nummerierung in der 
-\family sans
-Aufzählung
-\family default
--Absatzumgebung beginnt normalerweise mit arabischen Zahlen und endet in
- der tiefsten Aufzählungsebene mit Großbuchstaben.
- Falls Sie eine andere Art der Aufteilung wünschen, hier ist ein Beispiel:
-\end_layout

 
 

-\begin_layout LyX-Code
+\series bold

 
 \backslash
 
 \backslash

-renewcommand{
-\backslash
-labelenumi}{
-\backslash
-Roman{enumi}.}
+begin{multicols}{2}

 \end_layout
 
 \end_layout
 

-\begin_layout LyX-Code
+\begin_layout Standard

 
 

-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumii}.}
+\lang english
+at the point where you want the two column layout to start, and then

 \end_layout
 
 \end_layout
 

-\begin_layout LyX-Code
+\begin_layout Standard
+
+\series bold

 
 \backslash
 
 \backslash

-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-arabic{enumiii}.}
+end{multicols}

 \end_layout
 
 \end_layout
 

-\begin_layout LyX-Code
+\begin_layout Standard

 
 

-\backslash
-renewcommand{
-\backslash
-labelenumiv}{
-\backslash
-alph{enumiv}.)}
+\lang english
+where you want it to end.
+ Like this
+\lang ngerman
+:

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Damit wird das Schema auf große römische Zahlen, Großbuchstaben, arabische
- Zahlen und als letztes Kleinbuchstaben umgestellt.
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+begin{multicols}{2}

 \end_layout
 
 \end_layout
 

-\begin_layout Standard
-Darüberhinaus wird die Nummerierung noch ein wenig verändert, es wird zusätzlich
- ein Punkt eingefügt und in Ebene 4 eine Klammer.
- Das so erzeugte Nummerierungsschema für die verschiedenen Aufzählungsebenen
- ist damit also folgendes: 
-\begin_inset Quotes gld

 \end_inset
 
 \end_inset
 

-I.
-\begin_inset Quotes grd
-\end_inset

 
 

-, 
-\begin_inset Quotes gld
-\end_inset
+\end_layout

 
 

-A.
-\begin_inset Quotes grd
-\end_inset
+\begin_layout Standard
+\noindent

 
 

-, 
-\begin_inset Quotes gld
-\end_inset
+\series bold
+\size small
+\lang english
+The Adventure of the Empty House
+\series default

 
 

-1.
-\begin_inset Quotes grd
+\begin_inset Newline newline

 \end_inset
 
 \end_inset
 

-, 
-\begin_inset Quotes gld
-\end_inset
+by 
+\noun on
+Sir Arthur Conan Doyle
+\end_layout

 
 

-a.)
-\begin_inset Quotes grd
-\end_inset
+\begin_layout Standard

 
 

-.
- 
+\size small
+\lang english
+It was in the spring of the year 1894 that all London was interested, and
+ the fashionable world dismayed, by the murder of the Honourable Ronald
+ Adair under most unusual and inexplicable circumstances.
+ The public has already learned those particulars of the crime which came
+ out in the police investigation, but a good deal was suppressed upon that
+ occasion, since the case for the prosecution was so overwhelmingly strong
+ that it was not necessary to bring forward all the facts.
+ Only now, at the end of nearly ten years, am I allowed to supply those
+ missing links which make up the whole of that remarkable chain.
+ The crime was of interest in itself, but that interest was as nothing to
+ me compared to the inconceivable sequel, which afforded me the greatest
+ shock and surprise of any event in my adventurous life.
+ Even now, after this long interval, I find myself thrilling as I think
+ of it, and feeling once more that sudden flood of joy, amazement, and increduli
+ty which utterly submerged my mind.
+ Let me say to that public, which has shown some interest in those glimpses
+ which I have occasionally given them of the thoughts and actions of a very
+ remarkable man, that they are not to blame me if I have not shared my knowledge
+ with them, for I should have considered it my first duty to do so, had
+ I not been barred by a positive prohibition from his own lips, which was
+ only withdrawn upon the third of last month.

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Wie Sie am Beispiel sehen, gibt es für jede Ebene eigene Markierungsbefehle,
- 
-\family typewriter
+\begin_inset ERT
+status open

 
 

-\backslash
-label\SpecialChar \-
-enumi
-\family default
- \SpecialChar \ldots{}
- 
-\family typewriter
+\begin_layout Plain Layout

 
 

-\backslash
-labelenumiv
-\family default
-, und ebenso einen eigenen Zähler, 
-\family typewriter
-enumi
-\family default
- \SpecialChar \ldots{}
- 
-\family typewriter
-enumiv
-\family default
-.
- Außerdem gibt es fünf Befehle, um 
-\emph on
-Zahlen
-\emph default
- auszugeben, nämlich 
-\family typewriter

 
 \backslash
 
 \backslash

-arabic{}
-\family default
-,
-\family typewriter
- 
-\backslash
-ro\SpecialChar \-
-man{}
-\family default
-, 
-\family typewriter
+end{multicols}
+\end_layout

 
 

-\backslash
-Roman{}
-\family default
-, 
-\family typewriter
+\end_inset

 
 

-\backslash
-alph{}
-\family default
- und 
-\family typewriter

 
 

-\backslash
-Alph{}
-\family default
-.
- Jedem von ihnen muss als Argument einer der Zähler übergeben werden.
- Sie können vor oder nach den Befehlen auch noch weitere Zeichen eingeben,
- Leerzeichen sind jedoch nicht notwendig.

 \end_layout
 
 \end_layout
 

-\begin_layout Standard
-Damit ist dann wirklich fast jedes denkbare Schema machbar, hier ein Beispiel:
+\begin_layout Subsection
+Drei Spalten

 \end_layout
 
 \end_layout
 

-\begin_layout LyX-Code
+\begin_layout Standard

 
 

-\backslash
-renewcommand{
-\backslash
-labelenumi}{
-\backslash
-#
-\backslash
-Alph{enumi}
-\backslash
-#}
+\lang english
+The same pattern is used when you want more than two columns:

 \end_layout
 
 \end_layout
 

-\begin_layout LyX-Code
+\begin_layout Standard
+\begin_inset ERT
+status open

 
 

-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumi}.
-\backslash
-arabic{enumii}}
-\end_layout
+\begin_layout Plain Layout

 
 

-\begin_layout LyX-Code

 
 \backslash
 
 \backslash

-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-alph{enumiii}+}
+begin{multicols}{3}

 \end_layout
 
 \end_layout
 

-\begin_layout LyX-Code
+\end_inset
+

 
 

-\backslash
-renewcommand{
-\backslash
-labelenumiv}{(
-\backslash
-roman{enumiv})}

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Damit erhält man folgendes Nummerierungsschema: 
-\begin_inset Quotes gld
-\end_inset

 
 

-#A#
-\begin_inset Quotes grd
-\end_inset
+\size footnotesize
+\lang english
+It can be imagined that my close intimacy with Sherlock Holmes had interested
+ me deeply in crime, and that after his disappearance I never failed to
+ read with care the various problems which came before the public.
+ And I even attempted, more than once, for my own private satisfaction,
+ to employ his methods in their solution, though with indifferent success.
+ There was none, however, which appealed to me like this tragedy of Ronald
+ Adair.
+ As I read the evidence at the inquest, which led up to a verdict of willful
+ murder against some person or persons unknown, I realized more clearly
+ than I had ever done the loss which the community had sustained by the
+ death of Sherlock Holmes.
+ There were points about this strange business which would, I was sure,
+ have specially appealed to him, and the efforts of the police would have
+ been supplemented, or more probably anticipated, by the trained observation
+ and the alert mind of the first criminal agent in Europe.
+ All day, as I drove upon my round, I turned over the case in my mind and
+ found no explanation which appeared to me to be adequate.
+ At the risk of telling a twice-told tale, I will recapitulate the facts
+ as they were known to the public at the conclusion of the inquest.
+\end_layout

 
 

-, 
-\begin_inset Quotes gld
-\end_inset
+\begin_layout Standard
+\begin_inset ERT
+status open

 
 

-A.1
-\begin_inset Quotes grd
-\end_inset
+\begin_layout Plain Layout

 
 

-, 
-\begin_inset Quotes gld
-\end_inset

 
 

-a+
-\begin_inset Quotes grd
-\end_inset
+\backslash
+end{multicols}
+\end_layout

 
 

-, 
-\begin_inset Quotes gld

 \end_inset
 
 \end_inset
 

-(i)
-\begin_inset Quotes grd
-\end_inset

 
 

-.
- 

 \end_layout
 
 \end_layout
 

-\begin_layout Section
-Initialen
-\begin_inset Index idx
-status collapsed
+\begin_layout Standard

 
 

-\begin_layout Plain Layout
-Initialen
+\lang english
+You can have more than 3 columns if you want to, but that might not be very
+ pleasant for the eye.

 \end_layout
 
 \end_layout
 

-\end_inset
+\begin_layout Subsection
+Spalten innnerhalb von Spalten
+\end_layout

 
 

+\begin_layout Standard

 
 

+\lang english
+You can even have columns inside columns:

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Initialen oder abgesetzte Großbuchstaben
-\begin_inset Index idx
-status collapsed
+\begin_inset ERT
+status open

 
 \begin_layout Plain Layout
 
 \begin_layout Plain Layout

-Abgesetzte Großbuchstaben
+
+
+\backslash
+begin{multicols}{2}

 \end_layout
 
 \end_inset
 
 \end_layout
 
 \end_inset
 

- sind ein oder mehrere Buchstaben am Anfang eines Absatzes, die größer und
- über mehrere Zeilen hinweg gedruckt werden.
- Es gibt mehrere LaTeX-Pakete, die das ermöglichen: 
-\family typewriter
+
+\end_layout
+
+\begin_layout Standard
+
+\size footnotesize
+\lang english
+The Honourable Ronald Adair was the second son of the Earl of Maynooth,
+ at that time governor of one of the Australian colonies.
+ Adair's mother had returned from Australia to undergo the operation for
+ cataract, and she, her son Ronald, and her daughter Hilda were living together
+ at 427 Park Lane.
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+begin{multicols}{2}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\size footnotesize
+\lang english
+The youth moved in the best society–had, so far as was known, no enemies
+ and no particular vices.
+ He had been engaged to Miss Edith Woodley, of Carstairs, but the engagement
+ had been broken off by mutual consent some months before, and there was
+ no sign that it had left any very profound feeling behind it.
+ For the rest {sic} the man's life moved in a narrow and conventional circle,
+ for his habits were quiet and his nature unemotional.
+ Yet it was upon this easy-going young aristocrat that death came, in most
+ strange and unexpected form, between the hours of ten and eleven-twenty
+ on the night of March 30, 1894.
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+end{multicols}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\size footnotesize
+\lang english
+Ronald Adair was fond of cards–playing continually, but never for such stakes
+ as would hurt him.
+ He was a member of the Baldwin, the Cavendish, and the Bagatelle card clubs.
+ It was shown that, after dinner on the day of his death, he had played
+ a rubber of whist at the latter club.
+ He had also played there in the afternoon.
+
+\size default
+ 
+\size footnotesize
+The evidence of those who had played with him– Mr.
+ Murray, Sir John Hardy, and Colonel Moran–showed that the game was whist,
+ and that there was a fairly equal fall of the cards.
+ Adair might have lost five pounds, but not more.
+ His fortune was a considerable one, and such a loss could not in any way
+ affect him.
+ He had played nearly every day at one club or other, but he was a cautious
+ player, and usually rose a winner.
+ It came out in evidence that, in partnership with Colonel Moran, he had
+ actually won as much as four hundred and twenty pounds in a sitting, some
+ weeks before, from Godfrey Milner and Lord Balmoral.
+ So much for his recent history as it came out at the inquest.
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+end{multicols}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+Please read the example file 
+\family typewriter
+multicol.lyx
+\family default
+ for more advanced examples including column and header spacing, vertical
+ separator lines, and more.
+\end_layout
+
+\begin_layout Section
+Initialen
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Initialen
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Initialen oder abgesetzte Großbuchstaben
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Abgesetzte Großbuchstaben
+\end_layout
+
+\end_inset
+
+ sind ein oder mehrere Buchstaben am Anfang eines Absatzes, die größer und
+ über mehrere Zeilen hinweg gedruckt werden.
+ Es gibt mehrere LaTeX-Pakete, die das ermöglichen: 
+\family typewriter

 dropcaps
 \family default
 , 
 dropcaps
 \family default
 , 


@@ -23148,879 +23203,8 @@ hangafter=-3
  vertikalen Abstand einfügen.
 \end_layout
 
  vertikalen Abstand einfügen.
 \end_layout
 

-\begin_layout Section
-Textumflossene Bilder und Tabellen
-\end_layout
-
-\begin_layout Standard
-Im 
-\emph on
-Eingebettete Objekte
-\emph default
- Handbuch werden Umflossene Gleitobjekte beschrieben.
- Sie liefern Folgendes:
-\end_layout
-
-\begin_layout Standard
-\noindent
-\align center
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- oder 
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-

 \begin_layout Standard
 \begin_layout Standard

-Wenn Sie aber Text richtig um Bilder oder Tabellen fließen lassen wollen,
- also auch so etwas:
-\begin_inset VSpace defskip
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\noindent
-\align center
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="3">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="2" columns="3">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\noindent
-\align center
-\begin_inset Tabular
-<lyxtabular version="3" rows="3" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="3" columns="3">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
- 
-\begin_inset Tabular
-<lyxtabular version="3" rows="3" columns="2">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0">
-<column alignment="center" valignment="top" width="0">
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Graphics
-       filename ../../images/dialog-show-new-inset_graphics.png
-       scale 70
-       scaleBeforeRotation
-       BoundingBox 0bp 6bp 22bp 22bp
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Text
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\noindent
-sollten Sie das LaTeX-Paket 
-\family sans
-picinpar
-\family default
- benutzen.
- Hier ist ein Beispiel:
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-ifpicinpar
-\end_layout
-
-\end_inset
-
-
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-Das folgende Beispiel wird nur gedruckt, wenn das LaTeX-Paket 
-\family typewriter
-picinpar
-\family default
- installiert ist.
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-begin{window}[2,c,{
-\end_layout
-
-\end_inset
-
-
-\begin_inset Graphics
-       filename ../clipart/mobius.eps
-       width 40col%
-       scaleBeforeRotation
-       rotateOrigin center
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-},{}]
-\end_layout
-
-\begin_layout Plain Layout
-
-
-\backslash
-hspace{-1em}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-hspace*{1em}
-\end_layout
-
-\end_inset
-
-Textumflossene Bilder oder Tabellen sind keine Gleitobjekte, weil sie dort
- gedruckt werden, wo sie definiert wurden.
- Dieser Typ wird benutzt, um Text um eine Abbildung herum 
-\emph on
-fließen
-\emph default
- zu lassen, wobei der Text nur den Teil der Zeile benutzt, den die Abbildung
- übrig lässt.
- Er wird so eingefügt, wie Sie hier sehen, wenn das La\SpecialChar \-
-TeX-Paket 
-\family typewriter
-picinpar
-\family default
- installiert ist.
- Der erste Parameter in der eckigen
-\begin_inset Newline linebreak
-\end_inset
-
-Klammer, hier 2, definiert die Anzahl der Zeilen über dem Bild, der zweite,
- hier c, die Position des Bildes.
- Die Abbildung nimmt 40
-\begin_inset space \thinspace{}
-\end_inset
-
-% der Spaltenbreite ein.
- Weitere Einzelheiten finden Sie in der Dokumentation von 
-\family typewriter
-picinpar
-\family default
-.
- Die Bildparameter können Sie mit einem Klick auf das Bild wie gewohnt ändern.
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-end{window}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-else
-\end_layout
-
-\end_inset
-
-
-\begin_inset Note Note
-status open
-
-\begin_layout Plain Layout
-Der folgende Teil wird gedruckt, wenn das LaTeX-Paket 
-\family typewriter
-picinpar
-\family default
- nicht installiert ist:
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Sie müssen das LaTeX-Paket 
-\family typewriter
-picinpar
-\family default
- installiert haben, um das Beispiel in der Ausgabe zu sehen.
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-fi
-\end_layout
-
+\begin_inset Newpage newpage

 \end_inset
 
 
 \end_inset
 
 

diff --git a/lib/doc/de/EmbeddedObjects.lyx b/lib/doc/de/EmbeddedObjects.lyx
index f16e98ae7e6d3d917f2c731be45945d2e5921e6e..da5cbebb31532b193b57d2ec4789201d033b1e6b 100644 (file)
--- a/lib/doc/de/EmbeddedObjects.lyx
+++ b/lib/doc/de/EmbeddedObjects.lyx
@@ -143,6 +143,14 @@
   \setboolean{sidecap}{true}}
  {\setboolean{sidecap}{false}}
 
   \setboolean{sidecap}{true}}
  {\setboolean{sidecap}{false}}
 

+% Prüfung auf picinpar
+\newboolean{picinpar}
+\IfFileExists{picinpar.sty}
+ {\usepackage{picinpar}
+  \setboolean{picinpar}{true}}
+ {\setboolean{picinpar}{false}}
+
+

 % Umdefinieren des Makros \LyX für PDF-Lesezeichen
 \def\LyX{\texorpdfstring{%
   L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}
 % Umdefinieren des Makros \LyX für PDF-Lesezeichen
 \def\LyX{\texorpdfstring{%
   L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX\@}


@@ -15280,7 +15288,7 @@ ifcolortbl
 status open
 
 \begin_layout Plain Layout
 status open
 
 \begin_layout Plain Layout

-Die folgende Teil wird nur gedruckt, wenn das LaTeX-Paket 
+Der folgende Teil wird nur gedruckt, wenn das LaTeX-Paket 

 \series bold
 colortbl
 \series default
 \series bold
 colortbl
 \series default


@@ -15850,7 +15858,7 @@ else
 status open
 
 \begin_layout Plain Layout
 status open
 
 \begin_layout Plain Layout

-Die folgende Teil wird gedruckt, wenn das LaTeX-Paket 
+Der folgende Teil wird gedruckt, wenn das LaTeX-Paket 

 \series bold
 colortbl
 \series default
 \series bold
 colortbl
 \series default


@@ -19237,7 +19245,7 @@ ifarydshln
 status open
 
 \begin_layout Plain Layout
 status open
 
 \begin_layout Plain Layout

-Die folgende Teil wird nur gedruckt, wenn das LaTeX-Paket 
+Der folgende Teil wird nur gedruckt, wenn das LaTeX-Paket 

 \series bold
 arydshln
 \series default
 \series bold
 arydshln
 \series default


@@ -19785,7 +19793,7 @@ else
 status open
 
 \begin_layout Plain Layout
 status open
 
 \begin_layout Plain Layout

-Die folgende Teil wird gedruckt, wenn das LaTeX-Paket 
+Der folgende Teil wird gedruckt, wenn das LaTeX-Paket 

 \series bold
 arydshln
 \series default
 \series bold
 arydshln
 \series default


@@ -32025,6 +32033,1036 @@ fleqn
  gewählt, kann man auch abgesetzte Formeln skalieren.
 \end_layout
 
  gewählt, kann man auch abgesetzte Formeln skalieren.
 \end_layout
 

+\begin_layout Chapter
+Umflossene Objekte
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Umflossene Objekte
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Die in Kapitel
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "abs:Gleitende-Abbildungen"
+
+\end_inset
+
+ beschriebenen Gleitobjekte liefern Folgendes:
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align center
+\begin_inset Tabular
+<lyxtabular version="3" rows="2" columns="2">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+       filename ../../images/dialog-show-new-inset_graphics.png
+       scale 70
+       scaleBeforeRotation
+       BoundingBox 0bp 6bp 22bp 22bp
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+ oder 
+\begin_inset Tabular
+<lyxtabular version="3" rows="2" columns="2">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+       filename ../../images/dialog-show-new-inset_graphics.png
+       scale 70
+       scaleBeforeRotation
+       BoundingBox 0bp 6bp 22bp 22bp
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Wenn man aber Text richtig um Objekte fließen lassen will, also auch so
+ etwas:
+\begin_inset VSpace defskip
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align center
+\begin_inset Tabular
+<lyxtabular version="3" rows="2" columns="2">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+       filename ../../images/dialog-show-new-inset_graphics.png
+       scale 70
+       scaleBeforeRotation
+       BoundingBox 0bp 6bp 22bp 22bp
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+ 
+\begin_inset Tabular
+<lyxtabular version="3" rows="2" columns="2">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+       filename ../../images/dialog-show-new-inset_graphics.png
+       scale 70
+       scaleBeforeRotation
+       BoundingBox 0bp 6bp 22bp 22bp
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+ 
+\begin_inset Tabular
+<lyxtabular version="3" rows="2" columns="3">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+       filename ../../images/dialog-show-new-inset_graphics.png
+       scale 70
+       scaleBeforeRotation
+       BoundingBox 0bp 6bp 22bp 22bp
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+ 
+\begin_inset Tabular
+<lyxtabular version="3" rows="2" columns="3">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+       filename ../../images/dialog-show-new-inset_graphics.png
+       scale 70
+       scaleBeforeRotation
+       BoundingBox 0bp 6bp 22bp 22bp
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\noindent
+\align center
+\begin_inset Tabular
+<lyxtabular version="3" rows="3" columns="2">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+       filename ../../images/dialog-show-new-inset_graphics.png
+       scale 70
+       scaleBeforeRotation
+       BoundingBox 0bp 6bp 22bp 22bp
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+ 
+\begin_inset Tabular
+<lyxtabular version="3" rows="3" columns="3">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+       filename ../../images/dialog-show-new-inset_graphics.png
+       scale 70
+       scaleBeforeRotation
+       BoundingBox 0bp 6bp 22bp 22bp
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+ 
+\begin_inset Tabular
+<lyxtabular version="3" rows="3" columns="2">
+<features tabularvalignment="middle">
+<column alignment="center" valignment="top" width="0">
+<column alignment="center" valignment="top" width="0">
+<row>
+<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" topline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+\begin_inset Graphics
+       filename ../../images/dialog-show-new-inset_graphics.png
+       scale 70
+       scaleBeforeRotation
+       BoundingBox 0bp 6bp 22bp 22bp
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+</cell>
+</row>
+<row>
+<cell alignment="center" valignment="top" bottomline="true" leftline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+<cell alignment="center" valignment="top" bottomline="true" rightline="true" usebox="none">
+\begin_inset Text
+
+\begin_layout Plain Layout
+Text
+\end_layout
+
+\end_inset
+</cell>
+</row>
+</lyxtabular>
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\noindent
+kann man das LaTeX-Paket 
+\series bold
+picinpar
+\series default
+
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+LaTeX-Pakete ! picinpar
+\end_layout
+
+\end_inset
+
+ benutzen.
+ Hier ist ein Beispiel:
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+ifpicinpar
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Der folgende Teil wird nur gedruckt, wenn das LaTeX-Paket 
+\series bold
+picinpar
+\series default
+ installiert ist.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+begin{window}[2,c,{
+\end_layout
+
+\end_inset
+
+
+\begin_inset Graphics
+       filename ../clipart/mobius.eps
+       width 40col%
+       scaleBeforeRotation
+       rotateOrigin center
+
+\end_inset
+
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+},]
+\end_layout
+
+\begin_layout Plain Layout
+
+{}
+\end_layout
+
+\end_inset
+
+
+\size small
+\lang english
+It was in the spring of the year 1894 that all London was interested, and
+ the fashionable world dismayed, by the murder of the Honourable Ronald
+ Adair under most unusual and inexplicable circumstances.
+ The public has already learned those particulars of the crime which
+\size default
+
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+footnotemark{}
+\end_layout
+
+\end_inset
+
+
+\size small
+ came out in the police investigation, but a good deal was suppressed upon
+ that occasion, since the case for the prosecution was so overwhelmingly
+ strong that it was not necessary to bring forward all the facts.
+ Only now, at the end of nearly ten years, am I allowed to supply those
+ missing links which make up the whole of that remarkable chain.
+\size default
+\lang ngerman
+
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+end{window}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+footnotetext{
+\end_layout
+
+\end_inset
+
+Fußnote des Absatzes mit umflossenem Objekt.
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Umflossene Objekte sind keine Gleitobjekte, weil sie dort gedruckt werden,
+ wo sie eingefügt werden.
+ Dieser Typ wird benutzt, um Text um ein Objekt herum 
+\emph on
+fließen
+\emph default
+ zu lassen, wobei der Text nur den Teil der Zeile benutzt, den das Objekt
+ übrig lässt.
+\end_layout
+
+\begin_layout Standard
+Ein Umflossenes Objekt wird eingefügt, indem man zu Beginn eines Absatzes
+ den Befehl
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+begin{window}[2,c,{
+\end_layout
+
+\begin_layout Standard
+als TeX-Code einfügt.
+ Der erste Parameter in der eckigen Klammer, hier '2', definiert die Anzahl
+ der Zeilen über dem Objekt, der zweite, hier 'c', die Position des Objekts.
+ Es sind die Positionen 'l', 'c' und 'r' (für links, mitte, rechts) möglich.
+ Danach fügt man das Objekt ein.
+ Dies kann auch eine Tabelle, eine Box oder eine Formel sein.
+ In diesem Beispiel wurde ein Bild mit 40
+\begin_inset space \thinspace{}
+\end_inset
+
+% der Spaltenbreite eingefügt.
+ Nach dem Objekt fügt man den Befehl
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+},Beschreibungstext]
+\begin_inset Newline newline
+\end_inset
+
+{}
+\end_layout
+
+\begin_layout Standard
+ein.
+ Man beachte dass das 
+\begin_inset Quotes gld
+\end_inset
+
+{}
+\begin_inset Quotes grd
+\end_inset
+
+ in der zweiten Zeile steht.
+ Der Beschreibungstext ist optional.
+ Der Text, der das Objekt umfließen soll, muss sich im selben Absatz wie
+ das Objekt befinden, also direkt nach dem 
+\series bold
+{}
+\series default
+ beginnen.
+ Am Ende des Absatzes fügt man folgenden Befehl ein:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+end{window}
+\end_layout
+
+\begin_layout Standard
+Innerhalb eines Absatzes mit umflossenenm Object kann man keine Fußnoten
+ einfügen, man muss stattdessen den Befehl 
+\series bold
+
+\backslash
+footnotemark
+\series default
+ verwenden.
+ Außerhalb des Absatzes den Befehl 
+\series bold
+
+\backslash
+footnotetext
+\series default
+, wie es in Abschnitt
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "abs:Fußnoten"
+
+\end_inset
+
+ beschrieben ist.
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+else
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+Der folgende Teil wird gedruckt, wenn das LaTeX-Paket 
+\series bold
+picinpar
+\series default
+ nicht installiert ist:
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Sie müssen das LaTeX-Paket 
+\series bold
+picinpar
+\series default
+ installiert haben, um das Beispiel in der Ausgabe zu sehen.
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+fi
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+

 \begin_layout Chapter
 Externe Dateien
 \begin_inset Index idx
 \begin_layout Chapter
 Externe Dateien
 \begin_inset Index idx


@@ -33822,10 +34860,6 @@ key "listings"
 \end_inset
 
 .
 \end_inset
 
 .

-\begin_inset Newpage newpage
-\end_inset
-
-

 \end_layout
 
 \begin_layout Chapter
 \end_layout
 
 \begin_layout Chapter

diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index ff20d96e76bcb50ece8bf01cedd3e314455de073..9aaaa48cf9dd999654445ea36ed1fa385f446633 100644 (file)
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -5678,16 +5678,6 @@ Zitat!(kurz)
 \end_inset
 
  – LaTeX-Bezeichnung: Quote
 \end_inset
 
  – LaTeX-Bezeichnung: Quote

-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Quote
-\end_layout
-
-\end_inset
-
-

 \end_layout
 
 \begin_layout Itemize
 \end_layout
 
 \begin_layout Itemize


@@ -5706,16 +5696,6 @@ Zitat!(lang)
 \end_inset
 
  – LaTeX-Bezeichnung: Quotation
 \end_inset
 
  – LaTeX-Bezeichnung: Quotation

-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Quotation
-\end_layout
-
-\end_inset
-
-

 \end_layout
 
 \begin_layout Itemize
 \end_layout
 
 \begin_layout Itemize


@@ -5734,16 +5714,6 @@ Gedicht
 
 \family default
  – LaTeX-Bezeichnung: Verse
 
 \family default
  – LaTeX-Bezeichnung: Verse

-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Verse
-\end_layout
-
-\end_inset
-
-

 \end_layout
 
 \begin_layout Itemize
 \end_layout
 
 \begin_layout Itemize


@@ -5767,19 +5737,7 @@ listung
 
 
 \family default
 
 
 \family default

- – LaTeX-Bezeichnung: Itemize 
-\family sans
-
-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Itemize
-\end_layout
-
-\end_inset
-
-
+ – LaTeX-Bezeichnung: Itemize

 \end_layout
 
 \begin_layout Itemize
 \end_layout
 
 \begin_layout Itemize


@@ -5798,16 +5756,6 @@ Aufzahlung@Aufzählung
 
 \family default
  – LaTeX-Bezeichnung: Enumerate
 
 \family default
  – LaTeX-Bezeichnung: Enumerate

-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Enumerate
-\end_layout
-
-\end_inset
-
-

 \end_layout
 
 \begin_layout Itemize
 \end_layout
 
 \begin_layout Itemize


@@ -5826,16 +5774,6 @@ Beschreibung
 
 \family default
  – LaTeX-Bezeichnung: Description
 
 \family default
  – LaTeX-Bezeichnung: Description

-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-Description
-\end_layout
-
-\end_inset
-
-

 \end_layout
 
 \begin_layout Itemize
 \end_layout
 
 \begin_layout Itemize


@@ -5854,16 +5792,6 @@ Liste
 
 \family default
  – LaTeX-Bezeichnung: List
 
 \family default
  – LaTeX-Bezeichnung: List

-\begin_inset Index idx
-status collapsed
-
-\begin_layout Plain Layout
-List
-\end_layout
-
-\end_inset
-
-

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard


@@ -11504,6 +11432,393 @@ Auflistung
  Sie haben jede Menge Möglichkeiten zur Auswahl.
 \end_layout
 
  Sie haben jede Menge Möglichkeiten zur Auswahl.
 \end_layout
 

+\begin_layout Subsection
+Benutzerdefinierte Nummerierung von Nummerierten Listen
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+Liste ! Aufzahlung@Aufzählung ! Benutzerdefiniert
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\noindent
+Die voreingestellte Nummerierung von nummerierten Listen kann geändert werden,
+ indem man diesen Befehl als TeX-Code (Tastenkürzel 
+\family sans
+Strg+L
+\family default
+)
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+Für mehr über TeX-Code, siehe Abschnitt
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:TeX-Code"
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+ in in die Dokumentpräambel oder den Text einfügt:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+roman{enumi}}
+\end_layout
+
+\begin_layout Standard
+
+\emph on
+enumi
+\emph default
+ ist hierbei der Zähler der Nummerierung der ersten Stufe.
+ Der Befehl 
+\series bold
+
+\backslash
+roman
+\series default
+ gibt den Zähler als kleine römische Zahl.
+ Für große römische Zahlen ersetzen Sie in obigem Befehl 
+\series bold
+
+\backslash
+roman
+\series default
+ durch 
+\series bold
+
+\backslash
+Roman
+\series default
+.
+ Für arabische Zahlen verwenden Sie 
+\series bold
+
+\backslash
+arabic
+\series default
+.
+ Um Punkte mit großen oder kleinen Buchstaben zu 
+\begin_inset Quotes gld
+\end_inset
+
+nummerieren
+\begin_inset Quotes grd
+\end_inset
+
+, verwenden Sie die Befehle 
+\series bold
+
+\backslash
+Alph
+\series default
+ oder 
+\series bold
+
+\backslash
+alph
+\series default
+.
+ Für die 
+\begin_inset Quotes gld
+\end_inset
+
+Nummerierung
+\begin_inset Quotes grd
+\end_inset
+
+ mit Symbolen steht der Befehl 
+\series bold
+
+\backslash
+fnsymbol
+\series default
+ zur Verfügung.
+\end_layout
+
+\begin_layout Standard
+\noindent
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Bemerkung 1:
+\series default
+ Mit Buchstaben können höchstens 26
+\begin_inset space ~
+\end_inset
+
+Punkte nummeriert werden, weil nur 
+\emph on
+ein
+\emph default
+ Buchstabe verwendet wird.
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+Bemerkung 2:
+\series default
+ Mit Symbolen können höchstens 9
+\begin_inset space ~
+\end_inset
+
+Punkte nummeriert werden.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Um die Nummerierung für die anderen Stufen der Liste zu ändern, ersetzen
+ Sie im Befehl die 'i' jeweils durch die kleine römische Zahl der Stufe
+ (enumi, enumii, enumiii, enumiv).
+\end_layout
+
+\begin_layout Standard
+Als Beispiel eine Liste mit benutzerdefinierter Nummerierung:
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Enumerate
+Stufe 1
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+Stufe 2
+\end_layout
+
+\begin_layout Enumerate
+Stufe 2
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+Stufe 3
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+Stufe 4
+\end_layout
+
+\end_deeper
+\end_deeper
+\end_deeper
+\begin_layout Standard
+Für diese Liste wurden diese Befehle verwendet:
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+arabic{enumi}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+alph{enumi})}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+roman{enumiii}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{
+\backslash
+Alph{enumiv}.}
+\end_layout
+
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+setzt die Nummerierung zurück auf die Voreinstellung
+\end_layout
+
+\end_inset
+
+
+\end_layout
+

 \begin_layout Section
 Abstände, Seiten- und Zeilenumbrüche
 \end_layout
 \begin_layout Section
 Abstände, Seiten- und Zeilenumbrüche
 \end_layout


@@ -13536,12 +13851,10 @@ Hervorhebungsstil
 \end_layout
 
 \begin_layout Subsection
 \end_layout
 
 \begin_layout Subsection

-
-\lang english
-LaTeX font support
+LaTeX Schriftunterstützung

 \begin_inset CommandInset label
 LatexCommand label
 \begin_inset CommandInset label
 LatexCommand label

-name "sub:LaTeX-font-support"
+name "sub:LaTeX-Schriftunterstützung"

 
 \end_inset
 
 
 \end_inset
 


@@ -13605,7 +13918,7 @@ status open
 
 \series bold
 \lang english
 
 \series bold
 \lang english

-Note:
+Achtung:

 \series default
  In practice, some fonts might fail due to bad metrics and other font deficienci
 es; so you might have to experiment.
 \series default
  In practice, some fonts might fail due to bad metrics and other font deficienci
 es; so you might have to experiment.


@@ -13626,7 +13939,7 @@ status open
 
 \series bold
 \lang english
 
 \series bold
 \lang english

-Note:
+Achtung:

 \series default
  XeTeX and especially LuaTeX, are still rather new and thus not as mature
  as traditional LaTeX or PDFLaTeX.
 \series default
  XeTeX and especially LuaTeX, are still rather new and thus not as mature
  as traditional LaTeX or PDFLaTeX.


@@ -13820,7 +14133,7 @@ you will have to have either XeTeX or LuaTeX installed (see section
 
 \begin_inset CommandInset ref
 LatexCommand ref
 
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "sub:LaTeX-font-support"
+reference "sub:LaTeX-Schriftunterstützung"

 
 \end_inset
 
 
 \end_inset
 


@@ -16180,7 +16493,7 @@ LuaTeX
 
 \begin_inset CommandInset ref
 LatexCommand ref
 
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "sub:LaTeX-font-support"
+reference "sub:LaTeX-Schriftunterstützung"

 
 \end_inset
 
 
 \end_inset
 


@@ -16243,8 +16556,9 @@ status collapsed
 \begin_layout Plain Layout
 
 \lang english
 \begin_layout Plain Layout
 
 \lang english

-When you are interested to learn more about this, have a look at the LaTeX-packa
-ge 
+When you are interested to learn more about this, have a look at the 
+\lang ngerman
+LaTeX-Paket 

 \series bold
 pstricks
 \series default
 \series bold
 pstricks
 \series default


@@ -16253,9 +16567,7 @@ pstricks
 status collapsed
 
 \begin_layout Plain Layout
 status collapsed
 
 \begin_layout Plain Layout

-
-\lang english
-LaTeX-packages ! pstricks
+LaTeX-Paket ! pstricks

 \end_layout
 
 \end_inset
 \end_layout
 
 \end_inset


@@ -16540,7 +16852,7 @@ XeTeX
 
 \begin_inset CommandInset ref
 LatexCommand ref
 
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "sub:LaTeX-font-support"
+reference "sub:LaTeX-Schriftunterstützung"

 
 \end_inset
 
 
 \end_inset
 


@@ -16587,7 +16899,7 @@ pdflatex
 
 \begin_inset CommandInset ref
 LatexCommand ref
 
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "sub:LaTeX-font-support"
+reference "sub:LaTeX-Schriftunterstützung"

 
 \end_inset
 
 
 \end_inset
 


@@ -33311,7 +33623,14 @@ key "hyperref"
 \end_layout
 
 \begin_layout Section
 \end_layout
 
 \begin_layout Section

-TeX-Code und LaTeX-Syntax 
+TeX-Code und LaTeX-Syntax
+\begin_inset CommandInset label
+LatexCommand label
+name "sec:TeX-Code"
+
+\end_inset
+
+

 \begin_inset Index idx
 status collapsed
 
 \begin_inset Index idx
 status collapsed
 

diff --git a/lib/doc/es/Additional.lyx b/lib/doc/es/Additional.lyx
index a0f2c78ef7b973f6858535ac8e8e1db5e6b91ba5..c087bfcbccdfff83f3dff26698970ac6371e5ec5 100644 (file)
--- a/lib/doc/es/Additional.lyx
+++ b/lib/doc/es/Additional.lyx
@@ -1082,7 +1082,7 @@ target "http://www.ctan.org/"
  para detalles, y consulta el capítulo 
 \begin_inset CommandInset ref
 LatexCommand ref
  para detalles, y consulta el capítulo 
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "cha:secretos"
+reference "chap:Special-features"

 
 \end_inset
 
 
 \end_inset
 


@@ -1842,7 +1842,7 @@ trucos sucios
 
 \begin_inset CommandInset ref
 LatexCommand ref
 
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "cha:secretos"
+reference "chap:Special-features"

 
 \end_inset
 
 
 \end_inset
 


@@ -24067,10 +24067,14 @@ El siguiente asunto es la presencia visible del carácter salto de línea
 \end_layout
 
 \begin_layout Chapter
 \end_layout
 
 \begin_layout Chapter

-Secretos de maestros en LaTeX
+
+\lang english
+Special features
+\lang spanish
+

 \begin_inset CommandInset label
 LatexCommand label
 \begin_inset CommandInset label
 LatexCommand label

-name "cha:secretos"
+name "chap:Special-features"

 
 \end_inset
 
 
 \end_inset
 


@@ -24078,129 +24082,88 @@ name "cha:secretos"
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Aunque LyX es una poderosa herramienta, no es capaz de soportar todo lo
- que se puede hacer con TeX/LaTeX puro.
- No obstante, en LyX es posible hacer muchos trucos habituales de TeX y
- LaTeX, siempre que no temas usar el botón 
-\begin_inset Quotes fld
-\end_inset

 
 

-TeX
-\begin_inset Quotes frd
-\end_inset
-
- de la barra de herramientas o escribir en el preámbulo LaTeX.
- En esta sección se describen algunos consejos, trucos y, en definitiva,
- ideas frescas para dar a tu documento un poco más de empaque.
- ¡
+\lang english
+You can do everything with LyX that you can do with LaTeX.
+ However, LyX cannot support every LaTeX feature directly.
+ But you can always use TeX Code.
+ This chapter shows you some more special things you might want to use.
+ For other special things you can do with figures, tables, floats, boxes
+ and notes, have a look at the 

 \emph on
 \emph on

-Atrévete a probar
+EmbeddedObjects

 \emph default
 \emph default

-, pero con algo más pequeño y menos importante que tu tesina!
-\end_layout
-
-\begin_layout Standard
-La mayor parte de las ideas sugeridas aquí requieren archivos menos comunes
- en las distribuciones de LaTeX.
- Si tienes un sistema como teTeX, casi todos estarán disponibles.
- Sin embargo, tendrás que descargar algunos de los repositorios CTAN.
- Normalmente hay varias formas de hacer una cosa, o varios archivos de estilo
- de LaTeX que hacen lo mismo.
- No te vamos a imponer una opción sobre otra, pretendemos simplemente indicar
- cómo hemos hecho una determinada tarea con un determinado archivo.
- Ponte el disfraz de brujo, no pierdas de vista los dragones, y comencemos.
+ manual.

 \end_layout
 
 \begin_layout Section
 Columnas múltiples
 \end_layout
 
 \end_layout
 
 \begin_layout Section
 Columnas múltiples
 \end_layout
 

-\begin_layout Subsection
-Objetivo
-\end_layout
-

 \begin_layout Standard
 \begin_layout Standard

-La intención de este capítulo
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout

 
 

-\emph on
-N.
- del e.
-\emph default
-: El capítulo original de Lars era una sesuda descripción de 
-\family typewriter
+\lang english
+The aim for this section is to show how the LaTeX package 
+\series bold

 multicol
 multicol

-\family default
-.
- Pero demasiado largo para este manual.
- Por eso he resumido las secciones más relevantes (disculpa, Lars); puedes
- leer el original (¡y más!) en el ejemplo 
-\family typewriter
-examples/multicol.lyx
-\family default
-.
- —mer
+\series default
+ can be used in a LyX document.
+ LyX does not support the 
+\series bold
+multicol
+\series default
+ package natively yet, so you have to use some TeX code.

 \end_layout
 
 \end_layout
 

-\end_inset
+\begin_layout Standard

 
 

- es enseñar el empleo del paquete LaTeX 
-\family typewriter
-multicol
-\family default
- en un documento LyX.
- Como LyX no soporta todavía 
-\family typewriter
+\lang english
+The 
+\series bold

 multicol
 multicol

+\series default
+ package allows switching between one and multicolumn format on the same
+ page.
+ Footnotes are handled correctly, but will be placed at the bottom of the
+ page and not under each column.
+ Within the different columns you can use everyting, with the limitation
+ that for floats you need to use the option 
+\family sans
+Span colums

 \family default
 \family default

-, hemos de usar algunos trucos.
- Leyendo esta sección debería resultar sencillo hacerlo.
+ for each column.

 \end_layout
 
 \begin_layout Subsection
 \end_layout
 
 \begin_layout Subsection

-Limitaciones 
+Dos columnas

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-El paquete 
-\family typewriter
-multicol
-\family default
- permite alternar entre formatos de una o varias columnas en la misma página.
- Las notas al pie se manejan correctamente (en su mayor parte), pero serán
- colocadas al final de la página y no bajo cada columna.
- Sin embargo, el mecanismo de flotación de LaTeX está deshabilitado parcialmente
- en la versión actual.
- Por el momento, solo pueden ponerse flotantes del ancho de la página en
- el ámbito de este entorno.
- 
+Para poner texto en dos columnas, inserta donde quieras ponerlas el comando
+ en modo LaTeX

 \end_layout
 
 \end_layout
 

-\begin_layout Subsection
-Ejemplos
+\begin_layout Standard
+
+\series bold
+
+\backslash
+begin{multicols}{2}

 \end_layout
 
 \end_layout
 

-\begin_layout Subsubsection
-Dos columnas
+\begin_layout Standard
+y luego

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Para poner texto en dos columnas, inserta donde quieras ponerlas el comando
- en modo LaTeX 
-\family typewriter

 
 

-\backslash
-begin{multicols}{2}
-\family default
-, y luego 
-\family typewriter
+\series bold

 
 \backslash
 
 \backslash

-end{multicols} 
-\family default
+end{multicols}
+\end_layout
+
+\begin_layout Standard

 para finalizar.
  Como esto:
 \end_layout
 para finalizar.
  Como esto:
 \end_layout


@@ -24279,7 +24242,7 @@ end{multicols}
 
 \end_layout
 
 
 \end_layout
 

-\begin_layout Subsubsection
+\begin_layout Subsection

 Columnas múltiples
 \end_layout
 
 Columnas múltiples
 \end_layout
 


@@ -24348,7 +24311,7 @@ Si quieres, puedes poner más de tres columnas, pero podría no ser muy cómodo
  de leer.
 \end_layout
 
  de leer.
 \end_layout
 

-\begin_layout Subsubsection
+\begin_layout Subsection

 Columnas dentro de columnas
 \end_layout
 
 Columnas dentro de columnas
 \end_layout
 


@@ -24473,365 +24436,17 @@ end{multicols}
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Lee por favor el archivo 
+Lee por favor el 
+\lang english
+example file

 \family typewriter
 \family typewriter

-examples/multicol.lyx
+\lang spanish
+ multicol.lyx

 \family default
  para ejemplos más sofisticados, incluyendo espacios, encabezados, líneas
  de separación, y más.
 \end_layout
 
 \family default
  para ejemplos más sofisticados, incluyendo espacios, encabezados, líneas
  de separación, y más.
 \end_layout
 

-\begin_layout Section
-Numeración en el entorno de párrafo 
-\family sans
-Enumeración
-\family default
-
-\begin_inset Argument
-status collapsed
-
-\begin_layout Plain Layout
-Numeración con Enumeración
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\noindent
-Por omisión, la numeración en el entorno 
-\family sans
-Enumeración
-\family default
- comienza con números arábigos y acaba con letras mayúsculas.
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-Esto no es así en documentos en español.
- El estilo 
-\family typewriter
-spanish 
-\family default
-del programa 
-\family typewriter
-babel
-\family sans
- 
-\family default
-establece de manera predeterminada la secuencia 
-\begin_inset Quotes fld
-\end_inset
-
-1.
-\begin_inset space ~
-\end_inset
-
-a)
-\begin_inset space ~
-\end_inset
-
-1)
-\begin_inset space ~
-\end_inset
-
-a'
-\begin_inset Quotes frd
-\end_inset
-
-.
- 
-\emph on
-(N.
- del t.)
-\end_layout
-
-\end_inset
-
- Supongamos, sin embargo, que quieres un esquema de numeración diferente.
- Aquí hay un ejemplo de cómo cambiarlo:
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumi}{
-\backslash
-Roman{enumi}.}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumii}.}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-arabic{enumiii}.}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiv}{
-\backslash
-alph{enumiv}.)}
-\end_layout
-
-\begin_layout Standard
-\SpecialChar \ldots{}
- que cambia el esquema a números romanos en mayúsculas, letras mayúsculas,
- números arábigos y letras minúsculas.
-\end_layout
-
-\begin_layout Standard
-Además, el ejemplo anterior añade un pequeño extra al esquema de numeración.
- Así, la etiqueta del primer nivel se ve en realidad como 
-\begin_inset Quotes fld
-\end_inset
-
-I.
-\begin_inset Quotes frd
-\end_inset
-
-.
- Para facilitar la lectura, describiremos cómo se ve el esquema de numeración
- con una notación como esta: <
-\begin_inset Quotes eld
-\end_inset
-
-I.
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes eld
-\end_inset
-
-A.
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes eld
-\end_inset
-
-1.
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes eld
-\end_inset
-
-a.)
-\begin_inset Quotes erd
-\end_inset
-
->.
- 
-\end_layout
-
-\begin_layout Standard
-Como se ve en el ejemplo, hay un comando de etiqueta para cada nivel de
- anidación, 
-\family typewriter
-
-\backslash
-labelenumi
-\family default
- \SpecialChar \ldots{}
- 
-\family typewriter
-
-\backslash
-labelenumiv
-\family default
-, así como un contador 
-\family typewriter
-enumi
-\family default
- \SpecialChar \ldots{}
- 
-\family typewriter
-enumiv
-\family default
-.
- Hay además cinco comandos de 
-\begin_inset Quotes fld
-\end_inset
-
-números
-\begin_inset Quotes frd
-\end_inset
-
-, 
-\family typewriter
-
-\backslash
-arabic{}
-\family default
-, 
-\family typewriter
-
-\backslash
-roman{}
-\family default
-, 
-\family typewriter
-
-\backslash
-Roman{}
-\family default
-, 
-\family typewriter
-
-\backslash
-alph{}
-\family default
-, and 
-\family typewriter
-
-\backslash
-Alph{}
-\family default
-, cada uno de los cuales lleva un contador como argumento.
-
-\family typewriter
- 
-\family default
-Puedes añadir caracteres antes y después de los mismos, pero sin necesidad
- de poner espacios.
-\end_layout
-
-\begin_layout Standard
-Con esto puedes conseguir numeraciones a capricho.
- Por ejemplo:
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumi}{
-\backslash
-#
-\backslash
-Alph{enumi}
-\backslash
-#}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumi}.
-\backslash
-arabic{enumii}}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-alph{enumiii}+}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiv}{(
-\backslash
-roman{enumiv})}
-\end_layout
-
-\begin_layout Standard
-genera el esquema un poco estrafalario: <
-\begin_inset Quotes eld
-\end_inset
-
-#A#
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes eld
-\end_inset
-
-A.1
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes eld
-\end_inset
-
-a+
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes eld
-\end_inset
-
-(i)
-\begin_inset Quotes erd
-\end_inset
-
->.
- 
-\end_layout
-

 \begin_layout Section
 Mayúsculas capitulares
 \end_layout
 \begin_layout Section
 Mayúsculas capitulares
 \end_layout


@@ -25012,6 +24627,13 @@ bigdrop
 dropping.
 \end_layout
 
 dropping.
 \end_layout
 

+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+

 \begin_layout Section
 Párrafos con formas diversas
 \end_layout
 \begin_layout Section
 Párrafos con formas diversas
 \end_layout

diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index ce81388e29e7245b6e87040bcaebbaffac2afac3..bbddf55eaa2ac925abb245e2fa6c383608088d13 100644 (file)
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -9256,6 +9256,427 @@ Enumeración*
  Tienes a tu disposición una amplia variedad de opciones.
 \end_layout
 
  Tienes a tu disposición una amplia variedad de opciones.
 \end_layout
 

+\begin_layout Subsection
+
+\lang english
+Custom Numbering of Numbered Lists
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+Lists ! Enumerate ! Customized
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\lang english
+The default numbering of numbered lists can be changed by adding this command
+ in TeX Code (shortcut 
+\begin_inset Info
+type  "shortcut"
+arg   "ert-insert"
+\end_inset
+
+)
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+For more about TeX Code, look at section
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Código-TeX"
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+ to your document preamble or in the text:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+\lang english
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+roman{enumi}}
+\end_layout
+
+\begin_layout Standard
+
+\emph on
+\lang english
+enumi
+\emph default
+ is hereby the counter of the enumeration in the first level.
+ The command 
+\series bold
+
+\backslash
+roman
+\series default
+ outputs the counter as small Roman numeral.
+ For capital Roman numerals replace in the command above 
+\series bold
+
+\backslash
+roman
+\series default
+ by 
+\series bold
+
+\backslash
+Roman
+\series default
+.
+ For Arabic numerals use 
+\series bold
+
+\backslash
+arabic
+\series default
+.
+ To 
+\begin_inset Quotes eld
+\end_inset
+
+number
+\begin_inset Quotes erd
+\end_inset
+
+ items with capital or small Latin letters use 
+\series bold
+
+\backslash
+Alph
+\series default
+ or 
+\series bold
+
+\backslash
+alph
+\series default
+, respectively.
+ To 
+\begin_inset Quotes eld
+\end_inset
+
+number
+\begin_inset Quotes erd
+\end_inset
+
+ items with symbols use 
+\series bold
+
+\backslash
+fnsymbol
+\series default
+.
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\lang english
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ You can only number 26
+\begin_inset space ~
+\end_inset
+
+items with Latin letters, because this numbering is limited to single letters.
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ You can only number 9
+\begin_inset space ~
+\end_inset
+
+items with symbols.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+To change the numbering for the list sublevels, replace each 'i' in the
+ command by the small Roman numeral of the level (enumi, enumii, enumiii,
+ enumiv).
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+As example a list with custom numbering:
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Level 1
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+Level 2
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Level 2
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+Level 3
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+Level 4
+\end_layout
+
+\end_deeper
+\end_deeper
+\end_deeper
+\begin_layout Standard
+
+\lang english
+For this list these commands were used
+\lang spanish
+:
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+arabic{enumi}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+alph{enumi})}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+roman{enumiii}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{
+\backslash
+Alph{enumiv}.}
+\end_layout
+
+\end_inset
+
+
+\lang english
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+set the numbering back to the default
+\end_layout
+
+\end_inset
+
+
+\end_layout
+

 \begin_layout Section
 Espacios, paginación y saltos de línea
 \begin_inset Index idx
 \begin_layout Section
 Espacios, paginación y saltos de línea
 \begin_inset Index idx

diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx
index 4b640dc2918da89d74b7b8f751d21a0a57885376..15bfa467b35ccfc0c44d5e0530c6618ad21bc360 100644 (file)
--- a/lib/doc/fr/Additional.lyx
+++ b/lib/doc/fr/Additional.lyx
@@ -937,7 +937,7 @@ target "http://www.ctan.org/"
 
 \begin_inset CommandInset ref
 LatexCommand ref
 
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "cha:secrets"
+reference "chap:Special-features"

 
 \end_inset
 
 
 \end_inset
 


@@ -1450,7 +1450,7 @@ trucs et astuces
 
 \begin_inset CommandInset ref
 LatexCommand ref
 
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "cha:secrets"
+reference "chap:Special-features"

 
 \end_inset
 
 
 \end_inset
 


@@ -24505,10 +24505,14 @@ nouvelle ligne
 \end_layout
 
 \begin_layout Chapter
 \end_layout
 
 \begin_layout Chapter

-Secrets des Maîtres du LaTeX
+
+\lang english
+Special features
+\lang french
+

 \begin_inset CommandInset label
 LatexCommand label
 \begin_inset CommandInset label
 LatexCommand label

-name "cha:secrets"
+name "chap:Special-features"

 
 \end_inset
 
 
 \end_inset
 


@@ -24516,127 +24520,89 @@ name "cha:secrets"
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Même si LyX est un outil puissant, il ne faut pas s'attendre à ce qu'il
- puisse supporter tout ce qui peut être fait avec TeX ou LaTeX.
- Cependant, la plupart des trucs et astuces de TeX et LaTeX peuvent resservir
- dans LyX, à condition de ne pas avoir peur d'utiliser le bouton 
-\begin_inset Quotes fld
-\end_inset
-
-TeX
-\begin_inset Quotes frd
-\end_inset

 
 

- de la barre d'outils ou d'ajouter des lignes au préambule LaTeX.
- Cette section présente un ensemble de conseils, d'astuces et d'idées sympa
- pour donner un petit quelque chose en plus à votre document.
- 
+\lang english
+You can do everything with LyX that you can do with LaTeX.
+ However, LyX cannot support every LaTeX feature directly.
+ But you can always use TeX Code.
+ This chapter shows you some more special things you might want to use.
+ For other special things you can do with figures, tables, floats, boxes
+ and notes, have a look at the 

 \emph on
 \emph on

-Mais essayez-les à la maison !
+EmbeddedObjects

 \emph default
 \emph default

- 
-\emph toggle
-Faites vos premières tentatives sur quelque chose de plus court et de moins
- important que votre thèse !
-\end_layout
-
-\begin_layout Standard
-La plupart des idées présentées dans cette section requièrent des fichiers
- un peu moins courants dans les installations LaTeX.
- Si vous avez un système comme teTeX, la plupart seront sûrement présents.
- Certains, cependant, devront être téléchargés sur les archives CTAN.
- Il y a souvent plusieures manières de faire la même chose, ou plusieurs
- fichiers de style LaTeX qui ont le même rôle.
- Nous ne recommandons pas une méthode plutôt qu'une autre, nous affirmons
- simplement que tel fichier permet de faire telle chose.
- Enfourchez votre destrier, ceignez votre heaume et lancez-vous !
+ manual.

 \end_layout
 
 \begin_layout Section
 MultiColonnes
 \end_layout
 
 \end_layout
 
 \begin_layout Section
 MultiColonnes
 \end_layout
 

-\begin_layout Subsection
-But
-\end_layout
-

 \begin_layout Standard
 \begin_layout Standard

-Le but de ce chapitre
-\begin_inset Foot
-status collapsed

 
 

-\begin_layout Plain Layout
-Note de l'Éditeur : Le chapitre original de Lars était une magistrale descriptio
-n de comment utiliser le paquetage 
-\family typewriter
+\lang english
+The aim for this section is to show how the LaTeX package 
+\series bold

 multicol
 multicol

-\family default
-.
- Il était cependant trop long pour s'insérer sans heurt dans ce document.
- J'ai donc choisi d'en extraire ici les sections les plus importantes (désolé,
- Lars) ; vous pouvez lire le chapitre original (et un peu plus de l'histoire
- !) dans le fichier exemple 
-\family typewriter
-examples/fr/MultiColonnes.lyx
-\family default
-.
- – mer
+\series default
+ can be used in a LyX document.
+ LyX does not support the 
+\series bold
+multicol
+\series default
+ package natively yet, so you have to use some TeX code.

 \end_layout
 
 \end_layout
 

-\end_inset
+\begin_layout Standard

 
 

- est de montrer comment utiliser le paquetage LaTeX 
-\family typewriter
+\lang english
+The 
+\series bold

 multicol
 multicol

+\series default
+ package allows switching between one and multicolumn format on the same
+ page.
+ Footnotes are handled correctly, but will be placed at the bottom of the
+ page and not under each column.
+ Within the different columns you can use everyting, with the limitation
+ that for floats you need to use the option 
+\family sans
+Span colums

 \family default
 \family default

- dans un document LyX.
- Comme LyX ne le supporte pas encore d'origine, il faut utiliser quelques
- trucs, qui devraient vous paraître clairs quand vous aurez lu cette section.
+ for each column.

 \end_layout
 
 \begin_layout Subsection
 \end_layout
 
 \begin_layout Subsection

-Limitations
+Deux Colonnes

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Le paquetage 
-\family typewriter
-multicol
-\family default
- permet de basculer dans une même page entre le format sur une colonne et
- sur plusieurs.
- Les notes de bas de page sont gérées correctement (pour la plus grande
- part), mais seront placées en bas de la page et non en bas de chaque colonne.
- Le mécanisme de gestion des flottants de LaTeX, cependant, est partiellement
- désactivé dans l'implémentation actuelle.
- Aujourd'hui seuls des flottants couvrant en largeur toute la page peuvent
- être utilisés au sein de l'environnement.
+Si vous voulez avoir deux colonnes dans votre texte, il faut pour insérer

 \end_layout
 
 \end_layout
 

-\begin_layout Subsection
-Exemples
+\begin_layout Standard
+
+\series bold
+
+\backslash
+begin{multicols}{2}

 \end_layout
 
 \end_layout
 

-\begin_layout Subsubsection
-Deux Colonnes
+\begin_layout Standard
+en mode LaTeX à l'endroit où vous voulez démarrer la disposition en deux
+ colonnes, et

 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Si vous voulez avoir deux colonnes dans votre texte, il faut pour insérer
- 
-\family typewriter

 
 

-\backslash
-begin{multicols}{2}
-\family default
- en mode LaTeX à l'endroit où vous voulez démarrer la disposition en deux
- colonnes, et 
-\family typewriter
+\series bold

 
 \backslash
 end{multicols}
 
 \backslash
 end{multicols}

-\family default
- là où vous voulez qu'elle se termine.
+\end_layout
+
+\begin_layout Standard
+là où vous voulez qu'elle se termine.

  Comme ceci
 \begin_inset Foot
 status collapsed
  Comme ceci
 \begin_inset Foot
 status collapsed


@@ -24726,7 +24692,7 @@ end{multicols}
 
 \end_layout
 
 
 \end_layout
 

-\begin_layout Subsubsection
+\begin_layout Subsection

 Colonnes Multiples
 \end_layout
 
 Colonnes Multiples
 \end_layout
 


@@ -24797,7 +24763,7 @@ Vous pouvez sans problème avoir plus de 3 colonnes, si vous le voulez, mais
  ce n'est plus très agréable à lire.
 \end_layout
 
  ce n'est plus très agréable à lire.
 \end_layout
 

-\begin_layout Subsubsection
+\begin_layout Subsection

 Des Colonnes dans une Colonne
 \end_layout
 
 Des Colonnes dans une Colonne
 \end_layout
 


@@ -24922,316 +24888,17 @@ end{multicols}
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-Veuillez lire le fichier 
+Veuillez lire le 
+\lang english
+example file

 \family typewriter
 \family typewriter

-example/fr/MultiColonnes.lyx
+\lang french
+ MultiColonnes.lyx

 \family default
  pour des exemples plus complexes avec l'espacement des colonnes et de l'en-tête
 , les lignes de séparation verticale, et plus encore.
 \end_layout
 
 \family default
  pour des exemples plus complexes avec l'espacement des colonnes et de l'en-tête
 , les lignes de séparation verticale, et plus encore.
 \end_layout
 

-\begin_layout Section
-Numérotation dans l'environnement de paragraphe 
-\family sans
-Énumération
-\begin_inset Argument
-status collapsed
-
-\begin_layout Plain Layout
-Numérotation dans les 
-\family sans
-Énumérations
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-La numérotation par défaut dans l'environnement de paragraphe 
-\family sans
-Énumération
-\family default
- commence par les chiffres arabes et finit par les lettres majuscules.
- Supposons cependant que vous vouliez un autre schéma de numérotation.
- Voici un rapide exemple de ce qu'il vous faudra écrire :
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumi}{
-\backslash
-Romain{enumi}.}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumii}.}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-arabic{enumiii}.}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiv}{
-\backslash
-alph{enumiv}.)}
-\end_layout
-
-\begin_layout Standard
-Ceci remplace le schéma existant par, dans l'ordre, les chiffres romains,
- les lettres majuscules, les chiffres arabes et les lettres minuscules.
-\end_layout
-
-\begin_layout Standard
-En fait, cet exemple n'est pas seulement une redéfinition de la numérotation.
- Par exemple, le marqueur du premier niveau devient en fait 
-\family sans
-
-\begin_inset Quotes fld
-\end_inset
-
-I.
-\begin_inset Quotes frd
-\end_inset
-
-
-\family default
-.
- Pour faciliter la lecture, nous allons décrire les schémas de numérotation
- avec cette notation : 
-\family sans
-<
-\begin_inset Quotes fld
-\end_inset
-
-I.
-\begin_inset Quotes frd
-\end_inset
-
-
-\family default
-, 
-\family sans
-
-\begin_inset Quotes fld
-\end_inset
-
-A.
-\begin_inset Quotes frd
-\end_inset
-
-
-\family default
-, 
-\family sans
-
-\begin_inset Quotes fld
-\end_inset
-
-1.
-\begin_inset Quotes frd
-\end_inset
-
-
-\family default
-, 
-\family sans
-
-\begin_inset Quotes fld
-\end_inset
-
-a.)
-\begin_inset Quotes frd
-\end_inset
-
->
-\family default
-.
-\end_layout
-
-\begin_layout Standard
-Comme vous pouvez le voir dans l'exemple, il existe pour chaque niveau d'emboîte
-ment une commande : 
-\family typewriter
-
-\backslash
-labelenumi
-\family default
- \SpecialChar \ldots{}
- 
-\family typewriter
-
-\backslash
-labelenumiv
-\family default
-, et un compteur : 
-\family typewriter
-enumi
-\family default
- \SpecialChar \ldots{}
- 
-\family typewriter
-enumiv
-\family default
-.
- Il existe aussi cinq commandes de mise en forme des numéros : 
-\family typewriter
-
-\backslash
-arabic{}
-\family default
-, 
-\family typewriter
-
-\backslash
-roman{}
-\family default
-, 
-\family typewriter
-
-\backslash
-Romain{}
-\family default
-, 
-\family typewriter
-
-\backslash
-alph{}
-\family default
-, et 
-\family typewriter
-
-\backslash
-Alph{}
-\family default
-, chacune prenant un compteur pour paramètre.
- Vous pouvez ajouter des caractères avant et après celui-ci, les espaces
- étant quant à elles générées automatiquement.
-\end_layout
-
-\begin_layout Standard
-Ça peut devenir vraiment amusant avec, par exemple :
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumi}{
-\backslash
-#
-\backslash
-Alph{enumi}
-\backslash
-#}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumi}.
-\backslash
-arabic{enumii}}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-alph{enumiii}+}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiv}{(
-\backslash
-roman{enumiv})}
-\end_layout
-
-\begin_layout Standard
-qui donne le schéma de numérotation : 
-\family sans
-<
-\begin_inset Quotes fld
-\end_inset
-
-#A#
-\begin_inset Quotes frd
-\end_inset
-
-
-\family default
-, 
-\family sans
-
-\begin_inset Quotes fld
-\end_inset
-
-A.1
-\begin_inset Quotes frd
-\end_inset
-
-
-\family default
-, 
-\family sans
-
-\begin_inset Quotes fld
-\end_inset
-
-a+
-\begin_inset Quotes frd
-\end_inset
-
-
-\family default
-, 
-\family sans
-
-\begin_inset Quotes fld
-\end_inset
-
-(i)
-\begin_inset Quotes frd
-\end_inset
-
->
-\family default
-.
-\end_layout
-

 \begin_layout Section
 Lettrines
 \end_layout
 \begin_layout Section
 Lettrines
 \end_layout


@@ -25403,6 +25070,13 @@ dropping
  légèrement plus simple.
 \end_layout
 
  légèrement plus simple.
 \end_layout
 

+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+

 \begin_layout Section
 Paragraphes de forme inhabituelle
 \end_layout
 \begin_layout Section
 Paragraphes de forme inhabituelle
 \end_layout

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 280f58c17260c25d2fe574b5f1e3a3ef3fad44d1..a1ec8c9eb4523c4f4c7dcd0b8ffbaadf956eeff4 100644 (file)
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -9495,6 +9495,428 @@ ListePuces
  Vous avez une énorme variété d'options à votre disposition.
 \end_layout
 
  Vous avez une énorme variété d'options à votre disposition.
 \end_layout
 

+\begin_layout Subsection
+
+\lang english
+Custom Numbering of Numbered Lists
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+Lists ! Enumerate ! Customized
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\lang english
+The default numbering of numbered lists can be changed by adding this command
+ in TeX Code (shortcut 
+\begin_inset Info
+type  "shortcut"
+arg   "ert-insert"
+\end_inset
+
+)
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+For more about TeX Code, look at section
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:Code-TeX"
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+ to your document preamble or in the text:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+roman{enumi}}
+\end_layout
+
+\begin_layout Standard
+
+\emph on
+\lang english
+enumi
+\emph default
+ is hereby the counter of the enumeration in the first level.
+ The command 
+\series bold
+
+\backslash
+roman
+\series default
+ outputs the counter as small Roman numeral.
+ For capital Roman numerals replace in the command above 
+\series bold
+
+\backslash
+roman
+\series default
+ by 
+\series bold
+
+\backslash
+Roman
+\series default
+.
+ For Arabic numerals use 
+\series bold
+
+\backslash
+arabic
+\series default
+.
+ To 
+\begin_inset Quotes eld
+\end_inset
+
+number
+\begin_inset Quotes erd
+\end_inset
+
+ items with capital or small Latin letters use 
+\series bold
+
+\backslash
+Alph
+\series default
+ or 
+\series bold
+
+\backslash
+alph
+\series default
+, respectively.
+ To 
+\begin_inset Quotes eld
+\end_inset
+
+number
+\begin_inset Quotes erd
+\end_inset
+
+ items with symbols use 
+\series bold
+
+\backslash
+fnsymbol
+\series default
+.
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\lang english
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ You can only number 26
+\begin_inset space ~
+\end_inset
+
+items with Latin letters, because this numbering is limited to single letters.
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ You can only number 9
+\begin_inset space ~
+\end_inset
+
+items with symbols.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+To change the numbering for the list sublevels, replace each 'i' in the
+ command by the small Roman numeral of the level (enumi, enumii, enumiii,
+ enumiv).
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+As example a list with custom numbering
+\lang french
+:
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Level 1
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+Level 2
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Level 2
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+Level 3
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+Level 4
+\end_layout
+
+\end_deeper
+\end_deeper
+\end_deeper
+\begin_layout Standard
+
+\lang english
+For this list these commands were used
+\lang french
+:
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+arabic{enumi}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+alph{enumi})}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+roman{enumiii}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{
+\backslash
+Alph{enumiv}.}
+\end_layout
+
+\end_inset
+
+
+\lang english
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+set the numbering back to the default
+\end_layout
+
+\end_inset
+
+
+\end_layout
+

 \begin_layout Standard
 
 \end_layout
 \begin_layout Standard
 
 \end_layout

diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx
index f4ebedf5a6bf7624beaf065c3a99cea6a7c3dee5..e72538ddd06b776c6cbdd53230ee7de054a90d67 100644 (file)
--- a/lib/doc/ja/Additional.lyx
+++ b/lib/doc/ja/Additional.lyx
@@ -1532,7 +1532,7 @@ target "http://www.ctan.org/"
 と第
 \begin_inset CommandInset ref
 LatexCommand ref
 と第
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "cha:secrets"
+reference "chap:Special-features"

 
 \end_inset
 
 
 \end_inset
 


@@ -2600,7 +2600,7 @@ usepackage{indentfirst}
 
 \begin_inset CommandInset ref
 LatexCommand ref
 
 \begin_inset CommandInset ref
 LatexCommand ref

-reference "cha:secrets"
+reference "chap:Special-features"

 
 \end_inset
 
 
 \end_inset
 


@@ -20311,10 +20311,14 @@ status collapsed
 \end_layout
 
 \begin_layout Chapter
 \end_layout
 
 \begin_layout Chapter

-LaTeXの達人の秘密
+
+\lang english
+Special features
+\lang japanese
+

 \begin_inset CommandInset label
 LatexCommand label
 \begin_inset CommandInset label
 LatexCommand label

-name "cha:secrets"
+name "chap:Special-features"

 
 \end_inset
 
 
 \end_inset
 


@@ -20322,91 +20326,87 @@ name "cha:secrets"
 \end_layout
 
 \begin_layout Standard
 \end_layout
 
 \begin_layout Standard

-LyXは強力な道具ですが、TeX/LaTeXでできることをすべてサポートしているわけではありません。しかし、ツールバーのTeXボタンを押したり、LaTeXプリア
-ンブルに追加するのをためらわなければ、多くのTeXやLaTeXのトリックを使うことができます。この節ではそのようなトリック、ヒント、アイデアを紹介します。まず家
-で、あまり重要でない文章で試してください。自分の博士論文でまず試そうとは考えない方がいいでしょう。
-\end_layout

 
 

-\begin_layout Standard
-この節で紹介するものの多くは、通常のLaTeXディストリビューションにはあまり入っていないファイルを使います。teTeXを使っている場合には、ほとんどのファイル
-は含まれていますが、それでもいくつかは近くのCTANアーカイブからダウンロードする必要があります。しばしば、同じことをするのにいくつもの方法があったり、同じこと
-をするいくつものLaTeXファイルがあります。ここで紹介しているのは、いくつもの方法を比べてその中で我々が推薦するものではなく、単にあることをある特定のファイル
-でできるということの紹介です。
+\lang english
+You can do everything with LyX that you can do with LaTeX.
+ However, LyX cannot support every LaTeX feature directly.
+ But you can always use TeX Code.
+ This chapter shows you some more special things you might want to use.
+ For other special things you can do with figures, tables, floats, boxes
+ and notes, have a look at the 
+\emph on
+EmbeddedObjects
+\emph default
+ manual.

 \end_layout
 
 \begin_layout Section
 多段組み
 \end_layout
 
 \end_layout
 
 \begin_layout Section
 多段組み
 \end_layout
 

-\begin_layout Subsection
-目的
-\end_layout
-

 \begin_layout Standard
 \begin_layout Standard

-この章
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-編集者註：もともとの章は
-\family typewriter
-multicol
-\family default
-パッケージの使い方を説明した見事な章でした。ただし、この取扱説明書にそのまま載せるには長すぎました。そのために重要な節のみを選んであります。もとの章（ほとんど物
-語です）は
-\family typewriter
-examples/multicol.lyx
-\family default
-にあります。
-\end_layout
-
-\end_inset

 
 

-の目的は、LyXの文章でどのようにLaTeXパッケージ
-\family typewriter
+\lang english
+The aim for this section is to show how the LaTeX package 
+\series bold

 multicol
 multicol

-\family default
-を使うことができるのかを説明することです。LyXは
-\family typewriter
+\series default
+ can be used in a LyX document.
+ LyX does not support the 
+\series bold

 multicol
 multicol

-\family default
-パッケージをサポートしていないので、ちょっとしたトリックが必要です。この節を読むとどのようなトリックか明らかになるはずです。
-\end_layout
-
-\begin_layout Subsection
-制限事項
+\series default
+ package natively yet, so you have to use some TeX code.

 \end_layout
 
 \begin_layout Standard
 
 \end_layout
 
 \begin_layout Standard
 

-\family typewriter
+\lang english
+The 
+\series bold

 multicol
 multicol

+\series default
+ package allows switching between one and multicolumn format on the same
+ page.
+ Footnotes are handled correctly, but will be placed at the bottom of the
+ page and not under each column.
+ Within the different columns you can use everyting, with the limitation
+ that for floats you need to use the option 
+\family sans
+Span colums

 \family default
 \family default

-パッケージでは同じページ内で一段組みと多段組みを切り替えることができます。脚注も（ほとんどの場合）正しく扱われますが、カラムの下ではなくページの下におかれます。
-しかし、LaTeXのフロートメカニズムは現在の実装では部分的に使うことができなくなっています。今のところこの環境の範囲では、ページ幅のフロートしか使えません。
+ for each column.

 \end_layout
 
 \begin_layout Subsection
 \end_layout
 
 \begin_layout Subsection

-例
-\end_layout
-
-\begin_layout Subsubsection

 二段組み
 \end_layout
 
 \begin_layout Standard
 二段組みを使いたい場合には、二段組みのレイアウトを始めたい場所にLaTeXモードで
 二段組み
 \end_layout
 
 \begin_layout Standard
 二段組みを使いたい場合には、二段組みのレイアウトを始めたい場所にLaTeXモードで

-\family typewriter
+\end_layout
+
+\begin_layout Standard
+
+\series bold

 
 \backslash
 begin{multicols}{2}
 
 \backslash
 begin{multicols}{2}

-\family default
+\end_layout
+
+\begin_layout Standard

 を挿入してください。そして二段組みを終わりたい場所に
 を挿入してください。そして二段組みを終わりたい場所に

-\family typewriter
+\end_layout
+
+\begin_layout Standard
+
+\series bold

 
 \backslash
 end{multicols}
 
 \backslash
 end{multicols}

-\family default
+\end_layout
+
+\begin_layout Standard

 を入れます。次の例を見てください。
 \end_layout
 
 を入れます。次の例を見てください。
 \end_layout
 


@@ -20484,7 +20484,7 @@ end{multicols}
 
 \end_layout
 
 
 \end_layout
 

-\begin_layout Subsubsection
+\begin_layout Subsection

 多段組み
 \end_layout
 
 多段組み
 \end_layout
 


@@ -20552,7 +20552,7 @@ end{multicols}
 三段組み以上も可能ですが、読みにくくなり実用的ではないでしょう。
 \end_layout
 
 三段組み以上も可能ですが、読みにくくなり実用的ではないでしょう。
 \end_layout
 

-\begin_layout Subsubsection
+\begin_layout Subsection

 カラムの中のカラム
 \end_layout
 
 カラムの中のカラム
 \end_layout
 


@@ -20678,293 +20678,14 @@ end{multicols}
 
 \begin_layout Standard
 より複雑な形でカラムの中にカラムを入れる例や、へッダのスペース、縦のカラムを分ける線の入れ方などの例は、ファイル 
 
 \begin_layout Standard
 より複雑な形でカラムの中にカラムを入れる例や、へッダのスペース、縦のカラムを分ける線の入れ方などの例は、ファイル 

-\family typewriter
-examples/multicol.lyx
-\family default
-を読んでください。
-\end_layout
-
-\begin_layout Section
-箇条書き（連番）段落環境での番号振り
-\begin_inset Argument
-status collapsed
-
-\begin_layout Plain Layout
-箇条書き（連番）の番号振り
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-既定での
-\begin_inset Flex MenuItem
-status collapsed
-
-\begin_layout Plain Layout
-箇条書き（連番）
-\end_layout
-
-\end_inset
-
-段落環境での番号の付け方はアラビア数字で始まり、アルファベットの大文字で終わります。違う番号の付け方をしたい場合にはどうしたらいいのでしょうか。次の例を見てくだ
-さい。
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumi}{
-\backslash
-Roman{enumi}.}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumii}.}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-arabic{enumiii}.}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiv}{
-\backslash
-alph{enumiv}.)}
-\end_layout
-
-\begin_layout Standard
-これは番号の付け方をまず大文字のローマ数字、次に大文字のアルファベット、アラビア数字、小文字のアルファベットにします。
-\end_layout
-
-\begin_layout Standard
-前の例にはもう少しおまけがついていて、番号の後に点が入ります。例えば初めのレベルのレベルは
-\begin_inset Quotes eld
-\end_inset
-
-I.
-\begin_inset Quotes erd
-\end_inset
-
-のようになります。読みやすいように、番号の付け方を説明するのに<
-\begin_inset Quotes eld
-\end_inset
-
-I.
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes erd
-\end_inset
-
-A.
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes erd
-\end_inset
-
-1.
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes eld
-\end_inset
-
-a.)
-\begin_inset Quotes erd
-\end_inset
-
->のような表示方法を使うことにしましょう。
-\end_layout
-
-\begin_layout Standard
-例を見て分かるように、各々のネストのレベルにラベルコマンド
-\family typewriter
-
-\backslash
-labelenumi
-\family default
- \SpecialChar \ldots{}
- 
-\family typewriter
-
-\backslash
-labelenumiv
-\family default
-とカウンタ
-\family typewriter
-enumi
-\family default
- \SpecialChar \ldots{}
+\lang english
+example file
+\lang japanese

  
 \family typewriter
  
 \family typewriter

-enumiv
-\family default
-があります。使うことのできる番号印刷用のコマンドは 
-\family typewriter
-
-\backslash
-arabic{}
+multicol.lyx

 \family default
 \family default

-、
-\family typewriter
-
-\backslash
-roman{}
-\family default
-、
-\family typewriter
-
-\backslash
-Roman{}
-\family default
-、
-\family typewriter
-
-\backslash
-alph{}
-\family default
-、
-\family typewriter
-
-\backslash
-Alph{}
-\family default
-の5つでカウンタを一つ引数として取ります。これらの前または後ろに好きな文字を加えることができます。ただしスペースを加える必要はありません。
-\end_layout
-
-\begin_layout Standard
-これらの機能を使った例をお見せしましょう。
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumi}{
-\backslash
-#
-\backslash
-Alph{enumi}
-\backslash
-#}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumii}{
-\backslash
-Alph{enumi}.
-\backslash
-arabic{enumii}}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiii}{
-\backslash
-alph{enumiii}+}
-\end_layout
-
-\begin_layout LyX-Code
-
-\backslash
-renewcommand{
-\backslash
-labelenumiv}{(
-\backslash
-roman{enumiv})}
-\end_layout
-
-\begin_layout Standard
-この例は番号の付け方を <
-\begin_inset Quotes eld
-\end_inset
-
-#A#
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes erd
-\end_inset
-
-A.1
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes erd
-\end_inset
-
-a+
-\begin_inset Quotes erd
-\end_inset
-
-,
-\begin_inset space ~
-\end_inset
-
-
-\begin_inset Quotes eld
-\end_inset
-
-(i)
-\begin_inset Quotes erd
-\end_inset
-
->のようにします。
+を読んでください。

 \end_layout
 
 \begin_layout Section
 \end_layout
 
 \begin_layout Section


@@ -21096,6 +20817,13 @@ dropping
 コマンドも持っています。
 \end_layout
 
 コマンドも持っています。
 \end_layout
 

+\begin_layout Standard
+\begin_inset Newpage newpage
+\end_inset
+
+
+\end_layout
+

 \begin_layout Section
 標準的でない形の段落
 \end_layout
 \begin_layout Section
 標準的でない形の段落
 \end_layout

diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index 8cc1a86a14980d89db84384e385c3f8eb0cfd083..beea907cab0adbe1a8d52c7f5e07b27245a76f2d 100644 (file)
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -15118,6 +15118,430 @@ Moosegroin, MT 00100
 を入れることも簡単にできます。膨大な選択肢を自由にお使いいただけるのです。
 \end_layout
 
 を入れることも簡単にできます。膨大な選択肢を自由にお使いいただけるのです。
 \end_layout
 

+\begin_layout Subsection
+
+\lang english
+Custom Numbering of Numbered Lists
+\begin_inset Index idx
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+Lists ! Enumerate ! Customized
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\lang english
+The default numbering of numbered lists can be changed by adding this command
+ in TeX Code (shortcut 
+\begin_inset Info
+type  "shortcut"
+arg   "ert-insert"
+\end_inset
+
+)
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+For more about TeX Code, look at section
+\lang japanese
+
+\begin_inset space ~
+\end_inset
+
+
+\begin_inset CommandInset ref
+LatexCommand ref
+reference "sec:TeXコード"
+
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+ to your document preamble or in the text:
+\end_layout
+
+\begin_layout Standard
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+roman{enumi}}
+\end_layout
+
+\begin_layout Standard
+
+\emph on
+\lang english
+enumi
+\emph default
+ is hereby the counter of the enumeration in the first level.
+ The command 
+\series bold
+
+\backslash
+roman
+\series default
+ outputs the counter as small Roman numeral.
+ For capital Roman numerals replace in the command above 
+\series bold
+
+\backslash
+roman
+\series default
+ by 
+\series bold
+
+\backslash
+Roman
+\series default
+.
+ For Arabic numerals use 
+\series bold
+
+\backslash
+arabic
+\series default
+.
+ To 
+\begin_inset Quotes eld
+\end_inset
+
+number
+\begin_inset Quotes erd
+\end_inset
+
+ items with capital or small Latin letters use 
+\series bold
+
+\backslash
+Alph
+\series default
+ or 
+\series bold
+
+\backslash
+alph
+\series default
+, respectively.
+ To 
+\begin_inset Quotes eld
+\end_inset
+
+number
+\begin_inset Quotes erd
+\end_inset
+
+ items with symbols use 
+\series bold
+
+\backslash
+fnsymbol
+\series default
+.
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\lang english
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ You can only number 26
+\begin_inset space ~
+\end_inset
+
+items with Latin letters, because this numbering is limited to single letters.
+\end_layout
+
+\end_inset
+
+
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Note Greyedout
+status open
+
+\begin_layout Plain Layout
+
+\series bold
+\lang english
+Note:
+\series default
+ You can only number 9
+\begin_inset space ~
+\end_inset
+
+items with symbols.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+To change the numbering for the list sublevels, replace each 'i' in the
+ command by the small Roman numeral of the level (enumi, enumii, enumiii,
+ enumiv).
+\end_layout
+
+\begin_layout Standard
+
+\lang english
+As example a list with custom numbering
+\lang japanese
+:
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Level 1
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+Level 2
+\end_layout
+
+\begin_layout Enumerate
+
+\lang english
+Level 2
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+Level 3
+\end_layout
+
+\begin_deeper
+\begin_layout Enumerate
+
+\lang english
+Level 4
+\end_layout
+
+\end_deeper
+\end_deeper
+\end_deeper
+\begin_layout Standard
+
+\lang english
+For this list these commands were used
+\lang japanese
+:
+\end_layout
+
+\begin_layout Standard
+\noindent
+
+\series bold
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+#
+\backslash
+Alph{enumi}
+\backslash
+#}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+Alph{enumi}.
+\backslash
+arabic{enumii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+fnsymbol{enumiii}}
+\begin_inset Newline newline
+\end_inset
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{(
+\backslash
+roman{enumiv})}
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumi}{
+\backslash
+arabic{enumi}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumii}{
+\backslash
+alph{enumi})}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiii}{
+\backslash
+roman{enumiii}.}
+\end_layout
+
+\begin_layout Plain Layout
+
+
+\backslash
+renewcommand{
+\backslash
+labelenumiv}{
+\backslash
+Alph{enumiv}.}
+\end_layout
+
+\end_inset
+
+
+\lang english
+
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+
+\lang english
+set the numbering back to the default
+\end_layout
+
+\end_inset
+
+
+\end_layout
+

 \begin_layout Section
 余白取りとページ付けおよび改行
 \begin_inset Index idx
 \begin_layout Section
 余白取りとページ付けおよび改行
 \begin_inset Index idx