Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / lib / examples / linguistics.lyx

diff --git a/lib/examples/linguistics.lyx b/lib/examples/linguistics.lyx
index aa7231161cef6519be578b0d4104cbe9cca82c87..267e65a7058f0f50a475c148475c720d81691707 100644 (file)
--- a/lib/examples/linguistics.lyx
+++ b/lib/examples/linguistics.lyx
@@ -1,5 +1,5 @@
-#LyX 1.6.2svn created this file. For more info see http://www.lyx.org/
-\lyxformat 345
+#LyX 2.0 created this file. For more info see http://www.lyx.org/
+\lyxformat 413
 \begin_document
 \begin_header
 \textclass article
@@ -12,18 +12,26 @@
 \begin_modules
 linguistics
 \end_modules
+\maintain_unincluded_children false
 \language english
+\language_package default
 \inputencoding auto
+\fontencoding global
 \font_roman lmodern
 \font_sans default
 \font_typewriter default
 \font_default_family default
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
 
 \graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
 \paperfontsize default
 \spacing single
 \use_hyperref true
@@ -40,21 +48,31 @@ linguistics
 \use_geometry false
 \use_amsmath 1
 \use_esint 1
+\use_mhchem 1
+\use_mathdots 1
 \cite_engine basic
 \use_bibtopic false
+\use_indices false
 \paperorientation portrait
+\suppress_date false
+\use_refstyle 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
-\defskip medskip
+\paragraph_indentation default
 \quotes_language english
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
 \tracking_changes false
 \output_changes false
-\author "" 
-\author "" 
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
 \end_header
 
 \begin_body
@@ -156,6 +174,18 @@ key "covington"
 : This is the base package used for numbered examples and glosses.
 \end_layout
 
+\begin_deeper
+\begin_layout Itemize
+Installed on your system: 
+\begin_inset Info
+type  "package"
+arg   "covington"
+\end_inset
+
+.
+\end_layout
+
+\end_deeper
 \begin_layout Enumerate
 
 \emph on
@@ -184,6 +214,18 @@ description
 ).
 \end_layout
 
+\begin_deeper
+\begin_layout Itemize
+Installed on your system: 
+\begin_inset Info
+type  "package"
+arg   "enumitem"
+\end_inset
+
+.
+\end_layout
+
+\end_deeper
 \begin_layout Enumerate
 
 \emph on
@@ -205,6 +247,18 @@ Meaning
  language in use.
 \end_layout
 
+\begin_deeper
+\begin_layout Itemize
+Installed on your system: 
+\begin_inset Info
+type  "package"
+arg   "csquotes"
+\end_inset
+
+.
+\end_layout
+
+\end_deeper
 \begin_layout Enumerate
 
 \emph on
@@ -221,6 +275,18 @@ key "float"
  This package should be part of any LaTeX distribution.
 \end_layout
 
+\begin_deeper
+\begin_layout Itemize
+Installed on your system: 
+\begin_inset Info
+type  "package"
+arg   "float"
+\end_inset
+
+.
+\end_layout
+
+\end_deeper
 \begin_layout Section
 Numbered examples
 \end_layout
@@ -346,29 +412,24 @@ Here is a simple example:
 \end_layout
 
 \begin_layout Standard
-\begin_inset Flex Custom:Glosse
+\begin_inset Flex Glosse
 status open
 
 \begin_layout Plain Layout
+
 C'est un exemple simple
 \end_layout
 
 \begin_layout Plain Layout
+
 {This is} an example simple
 \end_layout
 
 \begin_layout Plain Layout
 
-\backslash
-glt 
-\begin_inset Quotes els
-\end_inset
-
-This is a simple example
-\begin_inset Quotes ers
-\end_inset
-
 
+\backslash
+glt This is a simple example
 \end_layout
 
 \end_inset
@@ -386,33 +447,29 @@ In the same vein, we can make a three-line gloss:
 \end_layout
 
 \begin_layout Standard
-\begin_inset Flex Custom:Tri-Glosse
+\begin_inset Flex Tri-Glosse
 status open
 
 \begin_layout Plain Layout
+
 C'est un exemple simple
 \end_layout
 
 \begin_layout Plain Layout
+
 {Das ist} ein Beispiel einfach
 \end_layout
 
 \begin_layout Plain Layout
+
 {This is} an example simple
 \end_layout
 
 \begin_layout Plain Layout
 
-\backslash
-glt 
-\begin_inset Quotes els
-\end_inset
-
-This is a simple example
-\begin_inset Quotes ers
-\end_inset
-
 
+\backslash
+glt This is a simple example
 \end_layout
 
 \end_inset
@@ -427,33 +484,29 @@ If you want to have numbered glosses, you can simply insert the gloss inset
 \end_layout
 
 \begin_layout Numbered Examples (consecutive)
-\begin_inset Flex Custom:Tri-Glosse
+\begin_inset Flex Tri-Glosse
 status open
 
 \begin_layout Plain Layout
+
 Mein Luftkissenfahrzeug ist voller Aale
 \end_layout
 
 \begin_layout Plain Layout
+
 My skeertuig is vol palings
 \end_layout
 
 \begin_layout Plain Layout
+
 My hovercraft is {full of} eels
 \end_layout
 
 \begin_layout Plain Layout
 
-\backslash
-glt 
-\begin_inset Quotes els
-\end_inset
-
-Do you have matches?
-\begin_inset Quotes ers
-\end_inset
-
 
+\backslash
+glt Do you have matches?
 \end_layout
 
 \end_inset
@@ -554,7 +607,7 @@ status open
 \align center
 \begin_inset Tabular
 <lyxtabular version="3" rows="5" columns="5">
-<features>
+<features tabularvalignment="middle">
 <column alignment="right" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
 <column alignment="center" valignment="top" width="0">
@@ -907,7 +960,7 @@ The Linguistics module comes with some character styles that are common
 
 \begin_layout Enumerate
 Concept (in small caps): 
-\begin_inset Flex CharStyle:Concepts
+\begin_inset Flex Concepts
 status collapsed
 
 \begin_layout Plain Layout
@@ -921,7 +974,7 @@ concept
 
 \begin_layout Enumerate
 Expression (emphasized): 
-\begin_inset Flex CharStyle:Expression
+\begin_inset Flex Expression
 status collapsed
 
 \begin_layout Plain Layout
@@ -935,7 +988,7 @@ expression
 
 \begin_layout Enumerate
 Meaning (in single quotes): 
-\begin_inset Flex CharStyle:Meaning
+\begin_inset Flex Meaning
 status collapsed
 
 \begin_layout Plain Layout
@@ -1133,6 +1186,7 @@ key "linguistlyx"
 \end_layout
 
 \begin_layout Bibliography
+\labelwidthstring References
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "covington"
@@ -1154,6 +1208,7 @@ http://www.ctan.org/tex-archive/macros/latex/contrib/covington/
 \end_layout
 
 \begin_layout Bibliography
+\labelwidthstring References
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "csquotes"
@@ -1175,6 +1230,7 @@ http://www.ctan.org/tex-archive/macros/latex/contrib/csquotes/
 \end_layout
 
 \begin_layout Bibliography
+\labelwidthstring References
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "enumitem"
@@ -1196,6 +1252,7 @@ http://www.ctan.org/tex-archive/macros/latex/contrib/enumitem/
 \end_layout
 
 \begin_layout Bibliography
+\labelwidthstring References
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "float"
@@ -1217,6 +1274,7 @@ http://www.ctan.org/tex-archive/macros/latex/contrib/float/
 \end_layout
 
 \begin_layout Bibliography
+\labelwidthstring References
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "linguistlyx"
@@ -1240,6 +1298,7 @@ http://wiki.lyx.org/LyX/LinguistLyX
 \end_layout
 
 \begin_layout Bibliography
+\labelwidthstring References
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "preview"
@@ -1261,6 +1320,7 @@ http://www.ctan.org/tex-archive/macros/latex/contrib/preview/
 \end_layout
 
 \begin_layout Bibliography
+\labelwidthstring References
 \begin_inset CommandInset bibitem
 LatexCommand bibitem
 key "tipa"