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

[features.git] / lib / layouts / paper.layout

diff --git a/lib/layouts/paper.layout b/lib/layouts/paper.layout
index bb0725145357bc1cf4b9f53986e95a5ef8bc951d..44af30aae288badf78d92243c1c1dba77b271087 100644 (file)
--- a/lib/layouts/paper.layout
+++ b/lib/layouts/paper.layout
@@ -5,12 +5,24 @@
 # Created by Jean-Marc Lasgouttes (Jean-Marc.Lasgouttes@inria.fr)
 
 
-Format 85
+Format 95
 Columns                 1
 Sides                   1
 SecNumDepth             3
 TocDepth                3
 
+AddToPreamble
+  % Save and disable \example as this might
+  % clash with theorems
+  \let\paperclassexample\example
+  \let\endpaperclassexample\endexample
+  \let\example\relax
+  % If theorems hasn't been loaded, restore example
+  \AtBeginDocument{%
+    \@ifundefined{example}{\let\example\paperclassexample}{}
+  }
+EndPreamble
+
 Style Standard
        Category              MainText
        Margin                Static
@@ -162,6 +174,7 @@ Style SubTitle
        EndFont
        HTMLTitle             false
        DocBookTag            subtitle
+       DocBookInInfo         maybe
 End