From 102fab5956ae8b329859b7f3d893d3abdea6840b Mon Sep 17 00:00:00 2001 From: Maarten van Gompel Date: Thu, 19 Aug 2021 11:19:11 +0200 Subject: [PATCH] regenerated foliaspec and adapted to renamed test document (proycon/folia#101) --- folia-repo | 2 +- folia/main.py | 10 ++++++++-- folia/tests/maintest.py | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/folia-repo b/folia-repo index 090d128..89920c5 160000 --- a/folia-repo +++ b/folia-repo @@ -1 +1 @@ -Subproject commit 090d12857f49c0407d1dc3212118584cfffa3fc7 +Subproject commit 89920c5bf169fd84e7b78d600ae36b7fc8ee80f5 diff --git a/folia/main.py b/folia/main.py index 41c2a70..efef4c6 100644 --- a/folia/main.py +++ b/folia/main.py @@ -53,7 +53,7 @@ #foliaspec:version:FOLIAVERSION #The FoLiA version -FOLIAVERSION = "2.5.0" +FOLIAVERSION = "2.5.1" #foliaspec:namespace:NSFOLIA #The FoLiA XML namespace @@ -9353,7 +9353,7 @@ def validate(filename,schema=None,deep=False): #================================= FOLIA SPECIFICATION ========================================================== #foliaspec:header -#This file was last updated according to the FoLiA specification for version 2.5.0 on 2021-04-02 13:45:09, using foliaspec.py +#This file was last updated according to the FoLiA specification for version 2.5.1 on 2021-08-19 11:16:16, using foliaspec.py #Code blocks after a foliaspec comment (until the next newline) are automatically generated. **DO NOT EDIT THOSE** and **DO NOT REMOVE ANY FOLIASPEC COMMENTS** !!! #foliaspec:structurescope:STRUCTURESCOPE @@ -9585,6 +9585,7 @@ def validate(filename,schema=None,deep=False): AbstractElement.AUTH = True AbstractElement.AUTO_GENERATE_ID = False AbstractElement.HIDDEN = False +AbstractElement.IMPLICITSPACE = False AbstractElement.OCCURRENCES = 0 AbstractElement.OCCURRENCES_PER_SET = 0 AbstractElement.OPTIONAL_ATTRIBS = None @@ -9888,6 +9889,7 @@ def validate(filename,schema=None,deep=False): Hiddenword.XMLTAG = "hiddenw" #------ Hyphbreak ------- Hyphbreak.ANNOTATIONTYPE = AnnotationType.HYPHENATION +Hyphbreak.IMPLICITSPACE = True Hyphbreak.LABEL = "Hyphbreak" Hyphbreak.TEXTDELIMITER = "" Hyphbreak.XMLTAG = "t-hbr" @@ -9908,6 +9910,7 @@ def validate(filename,schema=None,deep=False): LevelFeature.XMLTAG = None #------ Linebreak ------- Linebreak.ANNOTATIONTYPE = AnnotationType.LINEBREAK +Linebreak.IMPLICITSPACE = True Linebreak.LABEL = "Linebreak" Linebreak.TEXTDELIMITER = "" Linebreak.XLINK = True @@ -10227,6 +10230,7 @@ def validate(filename,schema=None,deep=False): TextMarkupGap.XMLTAG = "t-gap" #------ TextMarkupHSpace ------- TextMarkupHSpace.ANNOTATIONTYPE = AnnotationType.HSPACE +TextMarkupHSpace.IMPLICITSPACE = True TextMarkupHSpace.TEXTDELIMITER = "" TextMarkupHSpace.XMLTAG = "t-hspace" #------ TextMarkupLanguage ------- @@ -10248,6 +10252,7 @@ def validate(filename,schema=None,deep=False): TextMarkupStyle.XMLTAG = "t-style" #------ TextMarkupWhitespace ------- TextMarkupWhitespace.ANNOTATIONTYPE = AnnotationType.WHITESPACE +TextMarkupWhitespace.IMPLICITSPACE = True TextMarkupWhitespace.PRIMARYELEMENT = False TextMarkupWhitespace.TEXTDELIMITER = "" TextMarkupWhitespace.XMLTAG = "t-whitespace" @@ -10275,6 +10280,7 @@ def validate(filename,schema=None,deep=False): ValueFeature.XMLTAG = None #------ Whitespace ------- Whitespace.ANNOTATIONTYPE = AnnotationType.WHITESPACE +Whitespace.IMPLICITSPACE = True Whitespace.LABEL = "Whitespace" Whitespace.TEXTDELIMITER = "" Whitespace.XMLTAG = "whitespace" diff --git a/folia/tests/maintest.py b/folia/tests/maintest.py index b540f89..68c5f5f 100755 --- a/folia/tests/maintest.py +++ b/folia/tests/maintest.py @@ -4460,7 +4460,7 @@ def test015_textwhitespace(self): class Test88b_Whitespace(unittest.TestCase): def setUp(self): - self.doc = folia.Document(file=os.path.join(FOLIAPATH,"examples/tests/issue88b.2.5.0.folia.xml")) + self.doc = folia.Document(file=os.path.join(FOLIAPATH,"examples/tests/issue88b.2.5.1.folia.xml")) def test001_doublenested(self): """Whitespace - Heavy markedup, double nested and multiline"""