EmbeddedObjects.lyx:

- describe how to use math in program listings
- squash some LaTeX warnings (some will remain to be compatible with older LaTeX installations)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@35683 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2010-10-18 00:38:18 +00:00
parent 9228c81988
commit b81aaa13bb
6 changed files with 641 additions and 43 deletions

View File

@ -29,7 +29,7 @@
\mainmatter }
% provides caption formatting
\usepackage[labelfont={bf,sf}, tableposition=top]{caption}[2004/07/16]
\usepackage[labelfont={bf,sf}]{caption}[2004/07/16]
% provides commands to set caption
% beside tables/images
@ -33154,6 +33154,121 @@ lstparams "breaklines=true,caption={Lines 10 - 15 of this LyX file},extendedchar
\end_inset
\end_layout
\begin_layout Standard
Inserting a formula into a listing can be done the following way:
\end_layout
\begin_layout Enumerate
Open the listings dialog and add
\begin_inset Newline newline
\end_inset
\family sans
mathescape=true
\family default
\begin_inset Newline newline
\end_inset
to the field of the
\family sans
Advanced
\family default
tab.
\end_layout
\begin_layout Enumerate
Create a formula outside the listing
\end_layout
\begin_layout Enumerate
Copy the content of the formula (not the formula inset) to the clipboard
(shortcut
\begin_inset Info
type "shortcut"
arg "copy"
\end_inset
)
\end_layout
\begin_layout Enumerate
In the listing write
\begin_inset Quotes eld
\end_inset
\family sans
$$
\family default
\begin_inset Quotes erd
\end_inset
and copy from the clipboard between the dollar-signs (shortcut
\begin_inset Info
type "shortcut"
arg "paste"
\end_inset
)
\end_layout
\begin_layout Standard
\begin_inset listings
lstparams "language=Python,mathescape=true"
inline false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
Example Listing float containing a formula
\end_layout
\end_inset
# Example listing float
\end_layout
\begin_layout Plain Layout
def func(param):
\end_layout
\begin_layout Plain Layout
# $
\backslash
prod_{n=1}^{
\backslash
infty}
\backslash
,
\backslash
frac{1}{x^{2}}$
\end_layout
\begin_layout Plain Layout
pass
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip
\end_inset
\end_layout
\begin_layout Standard
@ -34301,14 +34416,14 @@ Explanation of Equation
\begin_inset space ~
\end_inset
(
\begin_inset CommandInset ref
LatexCommand eqref
LatexCommand ref
reference "eq:Wgn"
\end_inset
)
\begin_inset CommandInset label
LatexCommand label
name "cha:Explanation-of-Equation"

View File

@ -28,7 +28,7 @@
\mainmatter }
% Formatierung von Legenden
\usepackage[labelfont={bf,sf}, tableposition=top]{caption}[2004/07/16]
\usepackage[labelfont={bf,sf}]{caption}[2004/07/16]
% Befehle, um Legenden neben Tabellen und Abbildungen zu setzen
\usepackage{sidecap}
@ -375,7 +375,6 @@ Um eine Abbildung in Ihr Dokument einzufügen, klicken Sie auf das Symbol
filename ../../images/dialog-show-new-inset_graphics.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -778,7 +777,6 @@ Wenn Sie auf das Werkzeugleisten-Symbol
filename ../../images/float-insert_figure.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -964,7 +962,6 @@ Marke
filename ../../images/label-insert.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 20bp 20bp
\end_inset
@ -979,7 +976,6 @@ Querverweis
filename ../../images/dialog-show-new-inset_ref.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -1602,7 +1598,6 @@ Eine Tabelle können Sie mit dem Werkzeugleistenknopf
filename ../../images/tabular-insert.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -2723,7 +2718,6 @@ Tabelle
filename ../../images/float-insert_table.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -2751,7 +2745,6 @@ Nr:
filename ../../images/tabular-insert.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -2882,7 +2875,6 @@ Marke
filename ../../images/label-insert.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 20bp 20bp
\end_inset
@ -2897,7 +2889,6 @@ Querverweis
filename ../../images/dialog-show-new-inset_ref.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -11439,7 +11430,6 @@ Um mehrere Zellen einer Zeile zu einer zu verbinden, markieren Sie diese
filename ../../images/tabular-feature_multicolumn.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -14946,7 +14936,6 @@ Farbe ! für Text
filename ../../images/dialog-show_character.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 0bp 20bp 20bp
\end_inset
@ -19853,7 +19842,6 @@ Gleitobjekt
filename ../../images/float-insert_figure.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -19862,7 +19850,6 @@ Gleitobjekt
filename ../../images/float-insert_table.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -19894,7 +19881,6 @@ reference "abs:Titel-Platzierung"
filename clipart/GleitobjektQt4.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 128bp 22bp
\end_inset
@ -19913,7 +19899,6 @@ Vorhandene Abbildungen oder Tabellen können Sie in ein Gleitobjekt packen,
filename ../../images/float-insert_figure.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -19922,7 +19907,6 @@ Vorhandene Abbildungen oder Tabellen können Sie in ein Gleitobjekt packen,
filename ../../images/float-insert_table.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -20656,7 +20640,6 @@ Marke
lyxscale 80
scale 50
scaleBeforeRotation
BoundingBox 0bp 6bp 76bp 23bp
\end_inset
@ -20689,7 +20672,6 @@ Querverweis
lyxscale 80
scale 50
scaleBeforeRotation
BoundingBox 0bp 6bp 76bp 23bp
\end_inset
@ -24636,7 +24618,6 @@ Notizen werden mit einem Klick auf
filename ../../images/note-insert.png
scale 85
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -24861,7 +24842,6 @@ Wenn Sie auf den Werkzeugleistenknopf
filename ../../images/note-insert.png
scale 85
scaleBeforeRotation
BoundingBox 0bp 6bp 22bp 22bp
\end_inset
@ -33444,6 +33424,125 @@ lstparams "breaklines=true,caption={Zeilen 10 - 15 dieser LyX-Datei},extendedcha
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Newpage pagebreak
\end_inset
\end_layout
\begin_layout Standard
Eine Formel in ein Listing einzufügen ist folgendermaßen möglich:
\end_layout
\begin_layout Enumerate
Öffnen Sie die Listings-Einstellungen und fügen
\begin_inset Newline newline
\end_inset
\family sans
mathescape=true
\family default
\begin_inset Newline newline
\end_inset
in das Feld des Tabs
\family sans
Erweitert
\family default
ein
\end_layout
\begin_layout Enumerate
Erstellen Sie eine Formel außerhalb des Listings
\end_layout
\begin_layout Enumerate
Kopieren Sie den Inhalt der Formel (nicht die Formel-Einfügung) in die Zwischena
blage (Tastenkürzel
\family sans
Ctrl+C
\family default
)
\end_layout
\begin_layout Enumerate
Schreiben sie
\begin_inset Quotes gld
\end_inset
\family sans
$$
\family default
\begin_inset Quotes grd
\end_inset
in das Listing und kopieren sie aus der Zwischenablage zwischen die Dollar-Zeic
hen (Tastenkürzel
\family sans
Ctrl+V
\family default
)
\end_layout
\begin_layout Standard
\begin_inset listings
lstparams "language=Python,mathescape=true"
inline false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
Programm-Listing mit einer Formel
\end_layout
\end_inset
# Beispiel-Programm-Listing
\end_layout
\begin_layout Plain Layout
def func(param):
\end_layout
\begin_layout Plain Layout
# $
\backslash
prod_{n=1}^{
\backslash
infty}
\backslash
,
\backslash
frac{1}{x^{2}}$
\end_layout
\begin_layout Plain Layout
pass
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip
\end_inset
\end_layout
\begin_layout Standard
@ -34175,7 +34274,6 @@ Ansicht
filename ../../images/buffer-view_dvi.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 0bp 20bp 20bp
\end_inset
@ -34575,7 +34673,6 @@ Ansicht
filename ../../images/buffer-view_pdf2.png
scale 70
scaleBeforeRotation
BoundingBox 0bp 0bp 20bp 20bp
\end_inset
@ -34599,14 +34696,14 @@ Erklärung der Gleichung
\begin_inset space ~
\end_inset
(
\begin_inset CommandInset ref
LatexCommand eqref
LatexCommand ref
reference "eq:Wgn"
\end_inset
)
\begin_inset CommandInset label
LatexCommand label
name "kap:Exläuterung-einer-Gleichung"

View File

@ -29,7 +29,7 @@
\mainmatter }
% provides caption formatting
\usepackage[labelfont={bf,sf}, tableposition=top]{caption}[2004/07/16]
\usepackage[labelfont={bf,sf}]{caption}[2004/07/16]
% provides commands to set caption
% beside tables/images
@ -32702,6 +32702,132 @@ lstparams "breaklines=true,caption={Líneas 10 - 15 de este archivo LyX},firstl
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip
\end_inset
\end_layout
\begin_layout Standard
\lang english
Inserting a formula into a listing can be done the following way:
\end_layout
\begin_layout Enumerate
\lang english
Open the listings dialog and add
\begin_inset Newline newline
\end_inset
\family sans
mathescape=true
\family default
\begin_inset Newline newline
\end_inset
to the field of the
\family sans
Advanced
\family default
tab.
\end_layout
\begin_layout Enumerate
\lang english
Create a formula outside the listing
\end_layout
\begin_layout Enumerate
\lang english
Copy the content of the formula (not the formula inset) to the clipboard
(shortcut
\begin_inset Info
type "shortcut"
arg "copy"
\end_inset
)
\end_layout
\begin_layout Enumerate
\lang english
In the listing write
\begin_inset Quotes eld
\end_inset
\family sans
$$
\family default
\begin_inset Quotes erd
\end_inset
and copy from the clipboard between the dollar-signs (shortcut
\begin_inset Info
type "shortcut"
arg "paste"
\end_inset
)
\end_layout
\begin_layout Standard
\begin_inset listings
lstparams "language=Python,mathescape=true"
inline false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
Ejemplo de listado de programa flotante
\lang english
containing a formula
\end_layout
\end_inset
# Example listing float
\end_layout
\begin_layout Plain Layout
def func(param):
\end_layout
\begin_layout Plain Layout
# $
\backslash
prod_{n=1}^{
\backslash
infty}
\backslash
,
\backslash
frac{1}{x^{2}}$
\end_layout
\begin_layout Plain Layout
pass
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip
\end_inset
@ -33762,14 +33888,14 @@ Explicación de la ecuación
\begin_inset space ~
\end_inset
(
\begin_inset CommandInset ref
LatexCommand eqref
LatexCommand ref
reference "eq:Wgn"
\end_inset
)
\begin_inset CommandInset label
LatexCommand label
name "cap:Explicación-de-la-Ecuación"

View File

@ -29,7 +29,7 @@
\mainmatter }
% provides caption formatting
\usepackage[labelfont={bf,sf}, tableposition=top]{caption}[2004/07/16]
\usepackage[labelfont={bf,sf}]{caption}[2004/07/16]
% provides commands to set caption
% beside tables/images
@ -34020,6 +34020,140 @@ lstparams "breaklines=true,caption={Lignes 10 - 15 de ce fichier LyX},extendedch
\end_inset
\end_layout
\begin_layout Standard
\begin_inset Newpage pagebreak
\end_inset
\end_layout
\begin_layout Standard
\lang english
Inserting a formula into a listing can be done the following way:
\end_layout
\begin_layout Enumerate
\lang english
Open the listings dialog and add
\begin_inset Newline newline
\end_inset
\family sans
mathescape=true
\family default
\begin_inset Newline newline
\end_inset
to the field of the
\family sans
Advanced
\family default
tab.
\end_layout
\begin_layout Enumerate
\lang english
Create a formula outside the listing
\end_layout
\begin_layout Enumerate
\lang english
Copy the content of the formula (not the formula inset) to the clipboard
(shortcut
\begin_inset Info
type "shortcut"
arg "copy"
\end_inset
)
\end_layout
\begin_layout Enumerate
\lang english
In the listing write
\begin_inset Quotes eld
\end_inset
\family sans
$$
\family default
\begin_inset Quotes erd
\end_inset
and copy from the clipboard between the dollar-signs (shortcut
\begin_inset Info
type "shortcut"
arg "paste"
\end_inset
)
\end_layout
\begin_layout Standard
\begin_inset listings
lstparams "language=Python,mathescape=true"
inline false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
Exemple de listing flottant
\lang english
containing a formula
\end_layout
\end_inset
# Exemple de listing flottant
\end_layout
\begin_layout Plain Layout
def func(param):
\end_layout
\begin_layout Plain Layout
# $
\backslash
prod_{n=1}^{
\backslash
infty}
\backslash
,
\backslash
frac{1}{x^{2}}$
\end_layout
\begin_layout Plain Layout
pass
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip
\end_inset
\end_layout
\begin_layout Standard
@ -35169,14 +35303,14 @@ Explication de l' Équation
\begin_inset space ~
\end_inset
(
\begin_inset CommandInset ref
LatexCommand eqref
LatexCommand ref
reference "eq:Wgn"
\end_inset
)
\begin_inset CommandInset label
LatexCommand label
name "cha:Explication-de-l'Equation"

View File

@ -1,4 +1,4 @@
#LyX 1.6.5 created this file. For more info see http://www.lyx.org/
#LyX 1.6.8svn created this file. For more info see http://www.lyx.org/
\lyxformat 345
\begin_document
\begin_header
@ -35,7 +35,7 @@
\mainmatter }
% provides caption formatting
\usepackage[labelfont={bf,sf}, tableposition=top]{caption}[2004/07/16]
\usepackage[labelfont={bf,sf}]{caption}[2004/07/16]
% provides commands to set caption
% beside tables/images
@ -30293,6 +30293,129 @@ lstparams "breaklines=true,caption={Lines 10 - 15 of this LyX file},extendedchar
\end_inset
\end_layout
\begin_layout Standard
\lang english
Inserting a formula into a listing can be done the following way:
\end_layout
\begin_layout Enumerate
\lang english
Open the listings dialog and add
\begin_inset Newline newline
\end_inset
\family sans
mathescape=true
\family default
\begin_inset Newline newline
\end_inset
to the field of the
\family sans
Advanced
\family default
tab.
\end_layout
\begin_layout Enumerate
\lang english
Create a formula outside the listing
\end_layout
\begin_layout Enumerate
\lang english
Copy the content of the formula (not the formula inset) to the clipboard
(shortcut
\begin_inset Info
type "shortcut"
arg "copy"
\end_inset
)
\end_layout
\begin_layout Enumerate
\lang english
In the listing write
\begin_inset Quotes eld
\end_inset
\family sans
$$
\family default
\begin_inset Quotes erd
\end_inset
and copy from the clipboard between the dollar-signs (shortcut
\begin_inset Info
type "shortcut"
arg "paste"
\end_inset
)
\end_layout
\begin_layout Standard
\begin_inset listings
lstparams "language=Python,mathescape=true"
inline false
status open
\begin_layout Plain Layout
\begin_inset Caption
\begin_layout Plain Layout
\lang english
Example Listing float containing a formula
\end_layout
\end_inset
# Example listing float
\end_layout
\begin_layout Plain Layout
def func(param):
\end_layout
\begin_layout Plain Layout
# $
\backslash
prod_{n=1}^{
\backslash
infty}
\backslash
,
\backslash
frac{1}{x^{2}}$
\end_layout
\begin_layout Plain Layout
pass
\end_layout
\end_inset
\end_layout
\begin_layout Standard
\begin_inset VSpace bigskip
\end_inset
\end_layout
\begin_layout Standard
@ -31280,14 +31403,14 @@ PDF
\end_layout
\begin_layout Chapter
(
\begin_inset CommandInset ref
LatexCommand eqref
LatexCommand ref
reference "eq:Wgn"
\end_inset
式の説明
)式の説明
\begin_inset CommandInset label
LatexCommand label
name "cha:式の説明"

View File

@ -65,6 +65,9 @@ What's new
- Revised section 5.1 "Installing a new LaTeX package" of the Customization manual.
- Described how to use formulas n program listings in sec. 7 of the
EmbeddedObjects manual.
- Updated LaTeXConfig file.
- Updated English and German Linguistics manual.