[Libreoffice-commits] core.git: helpcontent2 librelogo/source

László Németh nemeth at numbertext.org
Mon Oct 28 03:50:07 PDT 2013


 helpcontent2                            |    2 +-
 librelogo/source/LibreLogo/LibreLogo.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 850871e04e247262242836180d8a5cf59b2f95ef
Author: László Németh <nemeth at numbertext.org>
Date:   Mon Oct 28 11:48:33 2013 +0100

    fdo#70951 librelogo: fix parsing problem of functions
    
    Change-Id: I2e85a795064ee9e58f3389aec94c942f6ae77612

diff --git a/helpcontent2 b/helpcontent2
index 35ad87c..0d8b37c 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 35ad87caa5923b90d8ef5e7d951059fa60d6ced8
+Subproject commit 0d8b37cd9e0b89d1136b09a81671c88fc91fee3e
diff --git a/librelogo/source/LibreLogo/LibreLogo.py b/librelogo/source/LibreLogo/LibreLogo.py
index e030fc8..33fe172 100644
--- a/librelogo/source/LibreLogo/LibreLogo.py
+++ b/librelogo/source/LibreLogo/LibreLogo.py
@@ -1595,7 +1595,7 @@ def __compil__(s):
             (?:[^\n]*(?<!\b(%(END)s))\n)* # 0 or more lines (not END)
             [^\n]*\b(?:%(OUTPUT)s)\b[^\n]*\n # line with OUTPUT (functions = procedures with OUTPUT)
             (?:[^\n]*(?<!\b(?:%(END)s))\n)* # 0 or more lines (not END)
-            (?:%(END)s)\b""" % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of "END" doesn't supported)
+            [ \t]*\b(?:%(END)s)\b""" % __l12n__(_.lng), s, re.X) ] # final END (XXX multiple names of "END" doesn't supported)
         # add line breaks before procedure calls
         procedures = set(subnames) - set(functions)
         if len(procedures) > 0:


More information about the Libreoffice-commits mailing list