From: Richard Heck <rgheck@comcast.net>
Date: Sun, 5 Oct 2008 19:39:09 +0000 (+0000)
Subject: Forgot this bit from last commit.
X-Git-Tag: 1.6.10~3159
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7c61874c702c852a40f0cb397d0cf806ae94debe;p=features.git

Forgot this bit from last commit.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26758 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index 7254b0c212..e10bfc8118 100644
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -29,7 +29,11 @@ import os, re, string, sys
 # Incremented to format 8, 25 July 2008 by rgh
 # UseModule tag added to layout files
 # CopyStyle added to InsetLayout
-currentFormat = 8
+
+# Incremented to format 9, 5 October 2008 by rgh
+# ForcePlain and CustomPars tags added to InsetLayout
+
+currentFormat = 9
 
 
 def usage(prog_name):
@@ -172,15 +176,8 @@ def convert(lines):
                 i += 1
             continue
 
-        if format == 7:
-          i += 1
-          continue
-
-        if format == 6:
-          i += 1
-          continue
-
-        if format == 5:
+        # These just involved new features, not any changes to old ones
+        if format >= 5 and format <= 8:
           i += 1
           continue