Use ObsoletedBy in fixme and todonotes modules.

diff --git a/lib/layouts/fixme.module b/lib/layouts/fixme.module
index 404b0a55dfdf5632ef2f16076e8e4091afd7b587..8d7358ef5aae197057d4c041af4270211afa8008 100644 (file)
--- a/lib/layouts/fixme.module
+++ b/lib/layouts/fixme.module
@@ -12,7 +12,7 @@
 # Authors: Mark Edgington <edgimar@gmail.com>
 #          Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 48
+Format 53
 
 #
 # List of FIXMEs
@@ -221,37 +221,36 @@ End
 # Backwards compatibility to user-provided
 # modules on the LyX wiki
 #
-# FIXME: uncomment these when #9000 is fixed.
 
-#InsetLayout FxNote
-#      ObsoletedBy           Flex:Fixme_Note
-#End
-#
-#InsetLayout FxNote*
-#      ObsoletedBy           Flex:Fixme_Note_(Targeted)
-#End
-#
-#InsetLayout FxWarning
-#      ObsoletedBy           Flex:Fixme_Warning
-#End
-#
-#InsetLayout FxWarning*
-#      ObsoletedBy           Flex:Fixme_Warning_(Targeted)
-#End
-#
-#InsetLayout FxError
-#      ObsoletedBy           Flex:Fixme_Error
-#End
-#
-#InsetLayout FxError*
-#      ObsoletedBy           Flex:Fixme_Error_(Targeted)
-#End
-#
-#InsetLayout FxFatal
-#      ObsoletedBy           Flex:Fixme_Fatal
-#End
-#
-#InsetLayout FxFatal*
-#      ObsoletedBy           Flex:Fixme_Fatal_(Targeted)
-#End
+InsetLayout Flex:FxNote
+       ObsoletedBy           Flex:Fixme_Note
+End
+
+InsetLayout Flex:FxNote*
+       ObsoletedBy           Flex:Fixme_Note_(Targeted)
+End
+
+InsetLayout Flex:FxWarning
+       ObsoletedBy           Flex:Fixme_Warning
+End
+
+InsetLayout Flex:FxWarning*
+       ObsoletedBy           Flex:Fixme_Warning_(Targeted)
+End
+
+InsetLayout Flex:FxError
+       ObsoletedBy           Flex:Fixme_Error
+End
+
+InsetLayout Flex:FxError*
+       ObsoletedBy           Flex:Fixme_Error_(Targeted)
+End
+
+InsetLayout Flex:FxFatal
+       ObsoletedBy           Flex:Fixme_Fatal
+End
+
+InsetLayout Flex:FxFatal*
+       ObsoletedBy           Flex:Fixme_Fatal_(Targeted)
+End
 

diff --git a/lib/layouts/todonotes.module b/lib/layouts/todonotes.module
index 535ab60f03d3a6199d1a1f1f9493ea9f1536a796..569c0bb1371f3d77cb0610ccbfe2fbcdef16a444 100644 (file)
--- a/lib/layouts/todonotes.module
+++ b/lib/layouts/todonotes.module
@@ -8,7 +8,7 @@
 # Authors: Stephen <stephen4mailinglists@googlemail.com>
 #          Jürgen Spitzmüller <spitz@lyx.org>
 
-Format 48
+Format 53
 
 #
 # List of TODOs
@@ -108,25 +108,24 @@ End
 # Backwards compatibility to user-provided
 # modules on the LyX wiki
 #
-# FIXME: uncomment these when #9000 is fixed.
 
-#InsetLayout TODO
-#      ObsoletedBy           Flex:TODO_Note_(Margin)
-#End
-#
-#InsetLayout MakeTableOfToDos
-#      ObsoletedBy           List_of_TODOs
-#End
-#
-#InsetLayout Todo[Inline]
-#      ObsoletedBy           Flex:TODO_Note_(inline)
-#End
-#
-#InsetLayout Todo[margin]
-#      ObsoletedBy           Flex:TODO_Note_(Margin)
-#End
-#
-#InsetLayout MissingFigure
-#      ObsoletedBy           Flex:Missing_Figure
-#End
+InsetLayout Flex:TODO
+       ObsoletedBy           Flex:TODO_Note_(Margin)
+End
+
+InsetLayout Flex:MakeTableOfToDos
+       ObsoletedBy           List_of_TODOs
+End
+
+InsetLayout Flex:Todo[Inline]
+       ObsoletedBy           Flex:TODO_Note_(inline)
+End
+
+InsetLayout Flex:Todo[margin]
+       ObsoletedBy           Flex:TODO_Note_(Margin)
+End
+
+InsetLayout Flex:MissingFigure
+       ObsoletedBy           Flex:Missing_Figure
+End