UserGuide.lyx: fix some typographic issues spotted by Mike

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

diff --git a/lib/examples/linguistics.lyx b/lib/examples/linguistics.lyx
index 9ee295187d2c5e9a8366b1d9aa50129968b240f8..a93f2e067a597f75388c752043e8fd1f7f0f3f2d 100644 (file)
--- a/lib/examples/linguistics.lyx
+++ b/lib/examples/linguistics.lyx
@@ -1,13 +1,35 @@
 #LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 493
+\lyxformat 508
 \begin_document
 \begin_header
-\origin unavailable
+\save_transient_properties true
+\origin /systemlyxdir/examples/
 \textclass article
 \begin_preamble
 %% Uncomment the following for Tableaux captions on top:
 %\floatstyle{plaintop}
 %\restylefloat{tableau}
+
+% Backwards compatibility for forest 1.x
+% If you use forest 2.0.1 or later, you can delete this
+\@ifpackageloaded{forest}{%
+  \@ifpackagelater{forest}{2016/02/20}{}{%
+    \forestset{
+      roof/.style={edge path={\noexpand\path[\forestoption{edge}]%
+          (.north west)--(!u.south)--(.north east)--cycle
+          \forestoption{edge label};
+        }
+      },
+      sn edges/.style={
+        for tree={parent anchor=south, child anchor=north},
+      },
+      linguistics preamble/.style={sn edges, baseline, for tree={align=center}}
+    }
+    \preto\forest@do{%
+      \forestOpreto{\forest@root}{given options}{linguistics preamble,}%
+    }
+  }
+}{}
 \end_preamble
 \use_default_options false
 \begin_modules
@@ -18,16 +40,16 @@ linguistics
 \language_package default
 \inputencoding auto
 \fontencoding global
-\font_roman lmodern
-\font_sans default
-\font_typewriter default
-\font_math auto
+\font_roman "lmodern" "FreeSerif"
+\font_sans "default" "FreeSans"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
 \font_osf false
-\font_sf_scale 100
-\font_tt_scale 100
+\font_sf_scale 100 100
+\font_tt_scale 100 100
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -188,7 +210,7 @@ key "covington"
 \end_inset
 
 : This is the base package used for numbered examples and glosses.
-\begin_inset Separator parbreak
+\begin_inset Separator latexpar
 \end_inset
 
 
@@ -232,7 +254,7 @@ itemize
 description
 \emph default
 ).
-\begin_inset Separator parbreak
+\begin_inset Separator latexpar
 \end_inset
 
 
@@ -269,7 +291,7 @@ Meaning
  character style.
  The package provides context sensitive quotation marks, depending on the
  language in use.
-\begin_inset Separator parbreak
+\begin_inset Separator latexpar
 \end_inset
 
 
@@ -302,7 +324,7 @@ 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 parbreak
+\begin_inset Separator latexpar
 \end_inset
 
 
@@ -333,7 +355,7 @@ key "forest"
 \end_inset
 
 : This package is used to generate structure trees.
-\begin_inset Separator parbreak
+\begin_inset Separator latexpar
 \end_inset
 
 
@@ -395,7 +417,7 @@ Consecutive single examples get their own numbers
 This is a subexample
 \begin_inset CommandInset label
 LatexCommand label
-name "sub:subexample"
+name "subsec:subexample"
 
 \end_inset
 
@@ -428,7 +450,7 @@ reference "exa:single-example"
  and 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sub:subexample"
+reference "subsec:subexample"
 
 \end_inset
 
@@ -723,7 +745,7 @@ Settings\SpecialChar menuseparator
 LaTeX Preamble
 \family default
 :
-\begin_inset Separator parbreak
+\begin_inset Separator latexpar
 \end_inset
 
 
@@ -1638,7 +1660,7 @@ If you view the PDF output, you will see that the input
 \begin_layout Standard
 expands to a real structure tree.
  To view the result within the \SpecialChar LyX
- workarea, you can simply embed the Structure
+ work area, you can simply embed the Structure
  Tree inset into a Preview inset (
 \family sans
 Insert\SpecialChar menuseparator
@@ -1676,11 +1698,58 @@ Roofs can be easily generated by means of the
 \begin_inset Quotes eld
 \end_inset
 
+roof
+\begin_inset Quotes erd
+\end_inset
+
+ option
+\begin_inset Foot
+status collapsed
+
+\begin_layout Plain Layout
+\noindent
+Note that the 
+\begin_inset Quotes eld
+\end_inset
+
+roof
+\begin_inset Quotes erd
+\end_inset
+
+ option only exists as of 
+\family sans
+forest
+\family default
+ version 2.0.
+ We have added some code to the preamble of this manual to support previous
+ versions.
+ If you use a 
+\family sans
+forest
+\family default
+ version < 2.0, you either need to copy this code to your preamble or use
+ the old option 
+\begin_inset Quotes eld
+\end_inset
+
 triangle
 \begin_inset Quotes erd
 \end_inset
 
- option (note that the comma has special meaning, as it marks options):
+ instead of 
+\begin_inset Quotes eld
+\end_inset
+
+roof
+\begin_inset Quotes erd
+\end_inset
+
+.
+\end_layout
+
+\end_inset
+
+ (note that the comma has special meaning, as it marks options):
 \end_layout
 
 \begin_layout Standard
@@ -1688,8 +1757,7 @@ triangle
 status open
 
 \begin_layout Plain Layout
-[VP [DP[John]] [V' [V[sent]] [DP[Mary]] [DP[another letter, triangle]] ]
- ]
+[VP [DP[John]] [V' [V[sent]] [DP[Mary]] [DP[another letter, roof]] ] ]
 \end_layout
 
 \end_inset
@@ -1930,7 +1998,7 @@ after
 \begin_inset space ~
 \end_inset
 
-<space>+<Lingolabial from the IPA toolbar>
+<space>+<Linguolabial from the IPA toolbar>
 \family default
 ).
 \end_layout
@@ -1945,10 +2013,18 @@ after
 \family sans
  Tools\SpecialChar menuseparator
 Preferences\SpecialChar menuseparator
-Graphi
+Look
+\begin_inset space ~
+\end_inset
+
+&
+\begin_inset space ~
+\end_inset
+
+Feel\SpecialChar menuseparator
+Display
 \family default
-cs), you'll get a nice WYSIWYG preview as soon as the cursor leaves the
- box.
+), you'll get a nice WYSIWYG preview as soon as the cursor leaves the box.
  Alternatively to the toolbar, you can also insert the symbols directly
  via the shortcut notation which is described in the 
 \emph on
@@ -2133,7 +2209,7 @@ status collapsed
 
 \begin_layout Plain Layout
 
-http://www.ctan.org/tex-archive/macros/latex/contrib/forest/
+http://www.ctan.org/tex-archive/graphics/pgf/contrib/forest
 \end_layout
 
 \end_inset