Fix incompatibility of covington and beamer.

Candidate for stable.
This commit is contained in:
Juergen Spitzmueller 2016-07-08 10:04:24 +02:00
parent 26c0bb9bea
commit b3ce60c96f
3 changed files with 128 additions and 87 deletions

View File

@ -218,10 +218,6 @@ key "covington"
\end_inset
: Dieses Paket wird benötigt, um nummerierte Beispiele und Glossen zu erzeugen.
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -255,10 +251,6 @@ convington
selbst nicht unterstützt).
Das Paket ist darüber hinaus aber auch generell nützlich, um das Aussehen
von Listen (Aufzählungen, Auflistungen, Beschreibungen) anzupassen.
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -292,10 +284,6 @@ Bedeutung
.
Das Paket erlaubt es, kontextsensible Anführungszeichen zu generieren (bspw.
je nach aktuell verwendeter Sprache).
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -325,10 +313,6 @@ key "float"
: Dieses Paket brauchen wir für die OT-Tableaux und das Tableaux-Verzeichnis.
Es sollte Bestandteil jeder \SpecialChar LaTeX
-Distribution sein.
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -356,10 +340,6 @@ key "forest"
\end_inset
: Dieses Paket wird zur Erzeugung von Strukturbäumen verwendet.
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -744,10 +724,6 @@ Einstellungen\SpecialChar ldots
-Vorspann
\family default
kopieren:
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_layout Quote
@ -930,7 +906,25 @@ Glossen (und Beispiele) in Beamer-Präsentationen
\end_layout
\begin_layout Standard
Leider arbeiten das Paket
Wenn Sie das Linguistik-Modul in einer Beamer-Präsentation verwenden wollen,
beachten Sie bitte folgendes:
\end_layout
\begin_layout Itemize
Für Glossen müssen Sie in Beamer immer einen
\begin_inset Quotes gld
\end_inset
fragilen
\begin_inset Quotes grd
\end_inset
Rahmen verwenden.
\end_layout
\begin_layout Itemize
Ältere Versionen des Pakets
\emph on
covington
\emph default
@ -938,7 +932,7 @@ covington
\emph on
Beamer
\emph default
-Klasse von Haus aus nicht gut zusammen, da beide die Befehle
-Klasse arbeiten von Haus aus nicht gut zusammen, da beide die Befehle
\family typewriter
\backslash
@ -950,8 +944,9 @@ example
\backslash
examples
\family default
zu definieren versuchen, was eine \SpecialChar LaTeX
-Fehlermeldung erzeugt.
zu definieren versuchen, was in diesen älteren Versionen eine \SpecialChar LaTeX
-Fehlermeldung
erzeugt, sobald sie Glossen oder Beispiele einfügen.
Sie können das Problem beheben, indem Sie in
\family sans
Dokument\SpecialChar menuseparator
@ -961,6 +956,7 @@ Lokales Format
folgenden Code kopieren:
\end_layout
\begin_deeper
\begin_layout Quote
\begin_inset listings
lstparams "basicstyle={\footnotesize\ttfamily},tabsize=4"
@ -1062,18 +1058,14 @@ OK
\end_layout
\begin_layout Standard
Beachten Sie auch, dass Sie für Glossen in Beamer einen
\begin_inset Quotes gld
\end_inset
fragilen
\begin_inset Quotes grd
\end_inset
Rahmen verwenden müssen.
Ab
\emph on
covington
\emph default
1.1 besteht dieses Problem nicht mehr.
\end_layout
\end_deeper
\begin_layout Section
Tableaux für Optimalitätstheorie
\end_layout
@ -1982,7 +1974,7 @@ Es fehlt ein Symbol: der (2005 in das IPA aufgenommene) labiodentale Flap.
\emph on
Tipa-
\emph default
Pakete noch nicht; daher kann es auch nicht von LyX unterstützt werden.
Paket noch nicht; daher kann es auch nicht von LyX unterstützt werden.
\end_layout
\end_inset

View File

@ -210,10 +210,6 @@ key "covington"
\end_inset
: This is the base package used for numbered examples and glosses.
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -254,10 +250,6 @@ itemize
description
\emph default
).
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -291,10 +283,6 @@ Meaning
character style.
The package provides context sensitive quotation marks, depending on the
language in use.
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -324,10 +312,6 @@ key "float"
: Needed for the OT tableaux floats and list of floats.
This package should be part of any \SpecialChar LaTeX
distribution.
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -355,10 +339,6 @@ key "forest"
\end_inset
: This package is used to generate structure trees.
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_deeper
@ -745,10 +725,6 @@ Settings\SpecialChar menuseparator
LaTeX Preamble
\family default
:
\begin_inset Separator latexpar
\end_inset
\end_layout
\begin_layout Quote
@ -933,16 +909,48 @@ Using Glosses (and Examples) in a Beamer Presentation
\end_layout
\begin_layout Standard
The
\emph on
covington
\emph default
package and the
If you use the linguistics module with
\emph on
beamer
\emph default
class do not work together out of the box, since they both try to define
the commands
presentations, there are some caveats:
\end_layout
\begin_layout Itemize
If you want to use glosses in
\emph on
beamer
\emph default
, you need to put it in a
\begin_inset Quotes eld
\end_inset
fragile
\begin_inset Quotes erd
\end_inset
frame.
\end_layout
\begin_layout Itemize
Older versions of the
\emph on
covington
\emph default
package (before version 1.1) do not play with the
\emph on
beamer
\emph default
class out of the box, since both
\emph on
beamer
\emph default
and
\emph on
covington
\emph default
try to define the commands
\family typewriter
\backslash
@ -954,9 +962,14 @@ example
\backslash
examples
\family default
, which results in a \SpecialChar LaTeX
.
In these older versions of
\emph on
covington
\emph default
, this results in a \SpecialChar LaTeX
error.
You can work around the problem by inserting the following code in
You can work around this problem by inserting the following code in
\family sans
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
@ -965,6 +978,7 @@ Local Layout
:
\end_layout
\begin_deeper
\begin_layout Quote
\begin_inset listings
lstparams "basicstyle={\footnotesize\ttfamily},tabsize=4"
@ -1060,27 +1074,48 @@ OK
\end_inset
.
This effectively defuncts beamer's example(s) environment in favour of
covington's.
This effectively defuncts
\emph on
beamer's
\emph default
example(s) environment in favor of
\emph on
covington's
\emph default
(i.
\begin_inset space \thinspace{}
\end_inset
e., you can use the
\family sans
Numbered Example
\family default
styles, but not
\emph on
beamer's
\emph default
\family sans
Example
\family default
and
\family sans
Examples
\family default
).
\end_layout
\begin_layout Standard
Furthermore, if you want to use glosses in
As of v.
1.1 of
\emph on
beamer
covington
\emph default
, you need to put it in a
\begin_inset Quotes eld
\end_inset
fragile
\begin_inset Quotes erd
\end_inset
frame.
, this problem is solved.
\end_layout
\end_deeper
\begin_layout Section
Optimality Theory Tableaux
\end_layout

View File

@ -12,7 +12,7 @@ Format 60
# single numbered example with covington.sty
Style Numbered_Example_(multiline)
LatexType Environment
LatexName example
LatexName covexample
NextNoIndent 1
Margin Dynamic
LabelSep xx
@ -30,6 +30,13 @@ Style Numbered_Example_(multiline)
Color Blue
EndFont
Requires covington
Preamble
% Backwards compatibility with covington < 1.1
% This code can be removed eventually
\@ifundefined{covexample}{%
\newenvironment{covexample}{\begin{example}}{\end{example}}%
}
EndPreamble
Category Linguistics
End
@ -38,12 +45,19 @@ End
Style Numbered_Examples_(consecutive)
CopyStyle Numbered_Example_(multiline)
LatexType Item_Environment
LatexName examples
LatexName covexamples
LabelString "Examples:"
Argument item:1
LabelString "Custom Numbering|s"
Tooltip "Customize the numeration"
EndArgument
Preamble
% Backwards compatibility with covington < 1.1
% This code can be removed eventually
\@ifundefined{covexamples}{%
\newenvironment{covexamples}{\begin{examples}}{\end{examples}}%
}
EndPreamble
End