stdtoolbars.inc: correct place for \Diamond

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

diff --git a/lib/examples/linguistics.lyx b/lib/examples/linguistics.lyx
index e9603b452b6c8ea5d7be59b2bf60465624b11c4c..b8e1eb6a629f0765c759f6975ff4743f6b455768 100644 (file)
--- a/lib/examples/linguistics.lyx
+++ b/lib/examples/linguistics.lyx
@@ -1,5 +1,5 @@
-#LyX 1.6.0svn created this file. For more info see http://www.lyx.org/\r
-\lyxformat 344\r
+#LyX 1.6.5svn created this file. For more info see http://www.lyx.org/\r
+\lyxformat 345\r
 \begin_document\r
 \begin_header\r
 \textclass article\r
@@ -226,7 +226,7 @@ Numbered examples
 \end_layout\r
 \r
 \begin_layout Standard\r
-Numbered examples are inserted via the layout dropdown box in the toolbar.\r
+Numbered examples are inserted via the layout drop-down box in the toolbar.\r
  There are three variants:\r
 \end_layout\r
 \r
@@ -282,7 +282,7 @@ And another one
 \r
 \begin_layout Standard\r
 References to examples are produced as usual: insert a label to the example\r
- and a crossreference via \r
+ and a cross-reference via \r
 \family sans\r
 Insert\SpecialChar \menuseparator\r
 Cross references\r
@@ -320,11 +320,16 @@ Custom Insets
 \emph on\r
 Custom:Glosse\r
 \emph default\r
- provides a glosse that consists of two lines and a translation, the \r
+ provides a gloss that consists of two lines and a translation, the \r
 \emph on\r
 Custom:Tri-Glosse\r
 \emph default\r
  insets consists of three lines and a translation.\r
+ Each translation line might span multiple lines in the output, i.\r
+\begin_inset space \thinspace{}\r
+\end_inset\r
+\r
+e., the paragraphs are automatically broken if they exceed the text width.\r
  Note that the translation line is mandatory and must be preceded by the\r
  command \r
 \family typewriter\r
@@ -332,7 +337,7 @@ Custom:Tri-Glosse
 \backslash\r
 glt\r
 \family default\r
- which should be inserted verbatim in the Glosse inset (ERT is not needed,\r
+ which must be inserted verbatim in the gloss inset (TeX mode is not needed,\r
  and in fact not even possible).\r
 \end_layout\r
 \r
@@ -345,15 +350,18 @@ Here is a simple example:
 status open\r
 \r
 \begin_layout Plain Layout\r
+\r
 C'est un exemple simple\r
 \end_layout\r
 \r
 \begin_layout Plain Layout\r
+\r
 {This is} an example simple\r
 \end_layout\r
 \r
 \begin_layout Plain Layout\r
 \r
+\r
 \backslash\r
 glt \r
 \begin_inset Quotes els\r
@@ -372,8 +380,12 @@ This is a simple example
 \end_layout\r
 \r
 \begin_layout Standard\r
-Note that the braces hold together multi-word expressions.\r
- In the same vein, we can make a three-line glosse:\r
+\noindent\r
+Note how the braces hold together multi-word expressions.\r
+\end_layout\r
+\r
+\begin_layout Standard\r
+In the same vein, we can make a three-line gloss:\r
 \end_layout\r
 \r
 \begin_layout Standard\r
@@ -381,19 +393,23 @@ Note that the braces hold together multi-word expressions.
 status open\r
 \r
 \begin_layout Plain Layout\r
+\r
 C'est un exemple simple\r
 \end_layout\r
 \r
 \begin_layout Plain Layout\r
+\r
 {Das ist} ein Beispiel einfach\r
 \end_layout\r
 \r
 \begin_layout Plain Layout\r
+\r
 {This is} an example simple\r
 \end_layout\r
 \r
 \begin_layout Plain Layout\r
 \r
+\r
 \backslash\r
 glt \r
 \begin_inset Quotes els\r
@@ -412,7 +428,8 @@ This is a simple example
 \end_layout\r
 \r
 \begin_layout Standard\r
-If you want to have numbered glosses, you can simply insert the Glosse inset\r
+\noindent\r
+If you want to have numbered glosses, you can simply insert the gloss inset\r
  to a numbered examples paragraph, as follows:\r
 \end_layout\r
 \r
@@ -421,19 +438,23 @@ If you want to have numbered glosses, you can simply insert the Glosse inset
 status open\r
 \r
 \begin_layout Plain Layout\r
+\r
 Mein Luftkissenfahrzeug ist voller Aale\r
 \end_layout\r
 \r
 \begin_layout Plain Layout\r
+\r
 My skeertuig is vol palings\r
 \end_layout\r
 \r
 \begin_layout Plain Layout\r
+\r
 My hovercraft is {full of} eels\r
 \end_layout\r
 \r
 \begin_layout Plain Layout\r
 \r
+\r
 \backslash\r
 glt \r
 \begin_inset Quotes els\r
@@ -451,6 +472,53 @@ Do you have matches?
 \r
 \end_layout\r
 \r
+\begin_layout Standard\r
+Note that font changes are not allowed in glosses.\r
+ Hence, the \r
+\family sans\r
+Character Style\r
+\family default\r
+ dialog is disabled.\r
+ Since glosses are not hyphenated, an explicit language setting in the LaTeX\r
+ output is not required (in fact, it would break the output, since covington\r
+ does not support it).\r
+ However, you still might want to set the language for proper spell checking.\r
+ Currently, you have to do this as follows: select the text, and then issue\r
+ \r
+\begin_inset Info\r
+type  "shortcut"\r
+arg   "command-execute"\r
+\end_inset\r
+\r
+ \r
+\family sans\r
+language <lang>\r
+\family default\r
+, where \r
+\family sans\r
+<lang>\r
+\family default\r
+ should be replaced by the respective language, e.\r
+\begin_inset space \thinspace{}\r
+\end_inset\r
+\r
+g.\r
+ \r
+\family sans\r
+english\r
+\family default\r
+, \r
+\family sans\r
+french\r
+\family default\r
+ or \r
+\family sans\r
+ngerman\r
+\family default\r
+.\r
+ In the LaTeX output, this setting will be supressed.\r
+\end_layout\r
+\r
 \begin_layout Section\r
 Optimality Theory Tableaux\r
 \end_layout\r