Attachment 13977 Details for Bug 28938 – first patch

[patch] first patch

lyx-2.3.6-layout2layout.patch (text/plain), 2.32 KB, created by katnatek on 2023-09-09 06:45:49 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: katnatek

Created: 2023-09-09 06:45:49 CEST

Size: 2.32 KB

patch

obsolete

>diff -ur lyx-2.3.6.1.orig/lib/scripts/layout2layout.py lyx-2.3.6.1/lib/scripts/layout2layout.py
>--- lyx-2.3.6.1.orig/lib/scripts/layout2layout.py	2020-12-29 16:50:44.000000000 +0000
>+++ lyx-2.3.6.1/lib/scripts/layout2layout.py	2022-02-03 15:40:44.529025561 +0000
>@@ -256,7 +256,7 @@
> 
> def trim_bom(line):
>     " Remove byte order mark."
>-    if line[0:3] == "\357\273\277":
>+    if line[0:3] == b"\357\273\277":
>         return line[3:]
>     else:
>         return line
>@@ -345,8 +345,8 @@
>     # for categories
>     re_Declaration = re.compile(b'^#\\s*\\Declare\\w+Class.*$')
>     re_ExtractCategory = re.compile(b'^(#\\s*\\Declare\\w+Class(?:\\[[^]]*?\\])?){([^(]+?)\\s+\$([^)]+?)\$\\s*}\\s*$')
>-    ConvDict = {"article": "Articles", "book" : "Books", "letter" : "Letters", "report": "Reports", \
>-                "presentation" : "Presentations", "curriculum vitae" : "Curricula Vitae", "handout" : "Handouts"}
>+    ConvDict = {b"article": b"Articles", b"book" : b"Books", b"letter" : b"Letters", b"report": b"Reports", \
>+                b"presentation" : b"Presentations", b"curriculum vitae" : b"Curricula Vitae", b"handout" : b"Handouts"}
>     # Arguments
>     re_OptArgs = re.compile(b'^(\\s*)OptionalArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE)
>     re_ReqArgs = re.compile(b'^(\\s*)RequiredArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE)
>@@ -485,7 +485,7 @@
>                 continue
>             col  = match.group(2)
>             if col == "collapsable":
>-                lines[i] = match.group(1) + "collapsible"
>+                lines[i] = match.group(1) + b"collapsible"
>             i += 1
>             continue
> 
>@@ -703,7 +703,7 @@
>             # Insert the required number of arguments at the end of the style definition
>             match = re_End.match(lines[i])
>             if match:
>-                newarg = ['']
>+                newarg = [b'']
>                 # First the optionals (this is the required order pre 2.1)
>                 if opts > 0:
>                     if opts == 1:
>@@ -1153,7 +1153,7 @@
>             if latextype == b"item_environment" and label.lower() == b"counter_enumi":
>                 lines[labeltype_line] = re_LabelType.sub(b'\\1\\2\\3Enumerate', lines[labeltype_line])
>                 # Don't add the LabelCounter line later
>-                counter = ""
>+                counter = b""
> 
>             # Replace
>             #

diff -ur lyx-2.3.6.1.orig/lib/scripts/layout2layout.py lyx-2.3.6.1/lib/scripts/layout2layout.py
--- lyx-2.3.6.1.orig/lib/scripts/layout2layout.py	2020-12-29 16:50:44.000000000 +0000
+++ lyx-2.3.6.1/lib/scripts/layout2layout.py	2022-02-03 15:40:44.529025561 +0000
@@ -256,7 +256,7 @@
 
 def trim_bom(line):
     " Remove byte order mark."
-    if line[0:3] == "\357\273\277":
+    if line[0:3] == b"\357\273\277":
         return line[3:]
     else:
         return line
@@ -345,8 +345,8 @@
     # for categories
     re_Declaration = re.compile(b'^#\\s*\\Declare\\w+Class.*$')
     re_ExtractCategory = re.compile(b'^(#\\s*\\Declare\\w+Class(?:\\[[^]]*?\\])?){([^(]+?)\\s+\\(([^)]+?)\\)\\s*}\\s*$')
-    ConvDict = {"article": "Articles", "book" : "Books", "letter" : "Letters", "report": "Reports", \
-                "presentation" : "Presentations", "curriculum vitae" : "Curricula Vitae", "handout" : "Handouts"}
+    ConvDict = {b"article": b"Articles", b"book" : b"Books", b"letter" : b"Letters", b"report": b"Reports", \
+                b"presentation" : b"Presentations", b"curriculum vitae" : b"Curricula Vitae", b"handout" : b"Handouts"}
     # Arguments
     re_OptArgs = re.compile(b'^(\\s*)OptionalArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE)
     re_ReqArgs = re.compile(b'^(\\s*)RequiredArgs(\\s+)(\\d+)\\D*$', re.IGNORECASE)
@@ -485,7 +485,7 @@
                 continue
             col  = match.group(2)
             if col == "collapsable":
-                lines[i] = match.group(1) + "collapsible"
+                lines[i] = match.group(1) + b"collapsible"
             i += 1
             continue
 
@@ -703,7 +703,7 @@
             # Insert the required number of arguments at the end of the style definition
             match = re_End.match(lines[i])
             if match:
-                newarg = ['']
+                newarg = [b'']
                 # First the optionals (this is the required order pre 2.1)
                 if opts > 0:
                     if opts == 1:
@@ -1153,7 +1153,7 @@
             if latextype == b"item_environment" and label.lower() == b"counter_enumi":
                 lines[labeltype_line] = re_LabelType.sub(b'\\1\\2\\3Enumerate', lines[labeltype_line])
                 # Don't add the LabelCounter line later
-                counter = ""
+                counter = b""
 
             # Replace
             #

Actions: View | Diff

Attachments on bug 28938: 12715 | 12716 | 13976 | 13977 | 13978 | 13979 | 13980 | 13981 | 13982 | 14139 | 14140 | 14193