French UserGuide.lyx: another update from Jean-Pierre

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

diff --git a/lib/examples/linguistics.lyx b/lib/examples/linguistics.lyx
index b8aec22e13af402a5e8a67951b92963cd46a7ce8..114cbcb7667ed08bb5088eeb662a27947981b44f 100644 (file)
--- a/lib/examples/linguistics.lyx
+++ b/lib/examples/linguistics.lyx
@@ -1,12 +1,35 @@
 #LyX 2.2 created this file. For more info see http://www.lyx.org/
-\lyxformat 488
+\lyxformat 506
 \begin_document
 \begin_header
+\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
@@ -17,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
@@ -394,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
 
@@ -427,7 +450,7 @@ reference "exa:single-example"
  and 
 \begin_inset CommandInset ref
 LatexCommand ref
-reference "sub:subexample"
+reference "subsec:subexample"
 
 \end_inset
 
@@ -874,6 +897,37 @@ textwidth
  in the example code) to fit the glosses to your actual page width.
 \end_layout
 
+\begin_layout Subsubsection*
+Footnotes in Glosses
+\end_layout
+
+\begin_layout Standard
+Although you can insert a footnote in a 
+\emph on
+Glosse
+\emph default
+ inset, LaTeX compilation will not succeed.
+ If you need footnotes, put 
+\family typewriter
+
+\backslash
+footnotemark
+\family default
+ in TeX mode in the glosse at the point where the footnote number should
+ appear, and
+\family typewriter
+ 
+\backslash
+footnotetext{Actual footnote ...}
+\family default
+, also in TeX mode, right behind the 
+\emph on
+Glosse
+\emph default
+ inset.
+ If you need several footnotes, just insert multiple of these constructs.
+\end_layout
+
 \begin_layout Subsubsection*
 Using Glosses (and Examples) in a Beamer Presentation
 \end_layout
@@ -1606,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
@@ -1644,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
@@ -1656,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
@@ -1898,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
@@ -1913,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
@@ -2101,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