Adapt forest (linguistic structure tree) to new syntax of the package

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

diff --git a/lib/examples/fr/linguistics.lyx b/lib/examples/fr/linguistics.lyx
index 4cde60d5cb2a3b87fd752c3773baddc278e7f8eb..311c04c0ce82509e85686a4dcf7781f3e39eddc5 100644 (file)
--- a/lib/examples/fr/linguistics.lyx
+++ b/lib/examples/fr/linguistics.lyx
@@ -9,6 +9,27 @@
 %% 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
@@ -1733,8 +1754,57 @@ Les toits peuvent être facilement engendrés via l'option
 \begin_inset Quotes fld
 \end_inset
 
-triangle
+roof
 \begin_inset Quotes frd
+\end_inset
+
+
+\begin_inset Foot
+status open
+
+\begin_layout Plain Layout
+\noindent
+
+\lang english
+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
+
+ instead of 
+\begin_inset Quotes eld
+\end_inset
+
+roof
+\begin_inset Quotes erd
+\end_inset
+
+.
+\end_layout
+
 \end_inset
 
  (notez que la virgule a une signification spéciale, puisqu’elle marque
@@ -1746,8 +1816,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