[LyX/master] Update layouts

[Enrico Forestieri]

On Sun, Sep 27, 2020 at 12:02:41PM -0400, Scott Kostyshak wrote:
> On Sun, Sep 27, 2020 at 05:22:45PM +0200, Scott Kostyshak wrote:
> > commit 5d7efd2fa934b138933ffed5a1e19c9d52e8d933
> > Author: Scott Kostyshak <skostysh at lyx.org>
> > Date:   Sun Sep 27 11:44:59 2020 -0400
> > 
> >     Update layouts
> >     
> >     Fixes a slight delay when cutting (#11988).
> 
> Can someone take a look at the following diffs from updating the layout?
> I checked layout2layout but the updates from 82 to 83 and 83 to 84 seem
> like they should not change anything.
> 
> 
> I see two main types of differences. The following is one example:
[...]
> Until we figure these diffs out, should we revert this commit?

I think the layout2layout script was not correctly updated at dab71087cf2,
ad18c194920, and 6998e76495d. If nothing has to be done, this does not
mean that the script should not be modified. I think the attached patch
is what is missing.

So, yes, the commit should be reverted and the layouts updated again after
correcting the layout2layout script.

-- 
Enrico
-------------- next part --------------
diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index 74119bb678..50b02e79a1 100644
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -538,6 +538,11 @@ def convert(lines, end_format):
                 i += 1
             continue
 
+        if 82 <= format <= 84
+            # nothing to do.
+            i += 1
+            continue
+
         if format == 81:
             match = re.compile(b'^(\\s*Header\\s+)("?\\w+"?)', re.IGNORECASE).match(lines[i])
             if match: