strictdoc 0.0.56a3__tar.gz → 0.0.57__tar.gz

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: strictdoc
-Version: 0.0.56a3
+Version: 0.0.57
 Summary: StrictDoc is open-source software for technical documentation and requirements management.
 Project-URL: Changelog, https://github.com/strictdoc-project/strictdoc/blob/main/CHANGELOG.md
 Project-URL: Homepage, https://strictdoc.readthedocs.io/en/stable/
@@ -23,7 +23,6 @@ Requires-Python: >=3.7
 Requires-Dist: beautifulsoup4==4.*,>=4.12.0
 Requires-Dist: docutils==0.*,>=0.16
 Requires-Dist: fastapi>=0.83.0
-Requires-Dist: graphviz>=0.20.1
 Requires-Dist: html5lib>=1.1
 Requires-Dist: jinja2>=2.11.2
 Requires-Dist: lxml==4.*,>=4.6.2

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/pyproject.toml

@@ -50,7 +50,6 @@ classifiers = [
 dependencies = [
     "textx >= 3.0.0, == 3.*",
     "jinja2 >= 2.11.2",
-    "graphviz >= 0.20.1",
     # Reading project config from strictdoc.toml file.
     "toml",
 

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/__init__.py

@@ -1,6 +1,6 @@
 from strictdoc.core.environment import SDocRuntimeEnvironment
 
-__version__ = "0.0.56a3"
+__version__ = "0.0.57"
 
 
 environment = SDocRuntimeEnvironment(__file__)

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/excel/export/excel_generator.py

@@ -132,12 +132,15 @@ class ExcelGenerator:
                         elif field_uc in ("COMMENT", "COMMENTS"):
                             # Using a transition marker to separate multiple
                             # comments
-                            if node.comments:
+                            comment_fields = node.get_comment_fields()
+                            if len(comment_fields) > 0:
                                 comment_row_value: str = ""
-                                for comment in node.comments:
+                                for comment_field_ in comment_fields:
                                     if len(comment_row_value) > 0:
                                         comment_row_value += "\n----------\n"
-                                    comment_row_value += comment
+                                    comment_row_value += (
+                                        comment_field_.get_text_value()
+                                    )
                                 worksheet.write(row, idx, comment_row_value)
                                 if (
                                     comment_row_value
@@ -172,7 +175,7 @@ class ExcelGenerator:
                                     columns[field][MAX_WIDTH_KEY] = value_len
                         elif field_uc in node.ordered_fields_lookup.keys():
                             req_field = node.ordered_fields_lookup[field_uc][0]
-                            value: str = req_field.get_value()
+                            value: str = req_field.get_text_value()
                             worksheet.write(row, idx, value)
                             value_len = len(value)
                             if value_len > columns[field][MAX_WIDTH_KEY]:

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/excel/import_/excel_to_sdoc_converter.py

@@ -14,6 +14,7 @@ from strictdoc.backend.sdoc.models.node import SDocNode, SDocNodeField
 from strictdoc.backend.sdoc.models.object_factory import SDocObjectFactory
 from strictdoc.backend.sdoc.models.reference import ParentReqReference
 from strictdoc.backend.sdoc.models.type_system import GrammarElementFieldString
+from strictdoc.helpers.string import ensure_newline
 
 
 class RequirementColumns(NamedTuple):
@@ -129,8 +130,11 @@ class ExcelToSDocConverter:
             section_contents=[],
         )
 
+        # FIXME: This is becoming very limiting. It must work against a complete grammar.
         fields = list(
-            DocumentGrammar.create_default(document).elements[0].fields
+            DocumentGrammar.create_default(document)
+            .elements_by_type["REQUIREMENT"]
+            .fields
         )
 
         for _, name in extra_header_pairs:
@@ -172,7 +176,7 @@ class ExcelToSDocConverter:
             if comment in ("", "-"):
                 comments = None
             else:
-                comments = [comment]
+                comments = [ensure_newline(comment)]
         parent_uid = None
         if columns.parent_column is not None:
             parent_uid = row_values[columns.parent_column].strip()
@@ -186,7 +190,7 @@ class ExcelToSDocConverter:
             uid=uid,
             level=None,
             statement=None,
-            statement_multiline=statement,
+            statement_multiline=ensure_newline(statement),
             rationale=None,
             rationale_multiline=None,
             tags=None,
@@ -196,11 +200,11 @@ class ExcelToSDocConverter:
             value = row_values[i].strip()
             if value != "":
                 template_requirement.ordered_fields_lookup[name] = [
-                    SDocNodeField(
+                    SDocNodeField.create_from_string(
                         parent=None,
                         field_name=name,
-                        field_value=None,
-                        field_value_multiline=value,
+                        field_value=ensure_newline(value),
+                        multiline=True,
                     )
                 ]
         if parent_uid is not None:

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/reqif/p01_sdoc/reqif_to_sdoc_converter.py

@@ -37,6 +37,7 @@ from strictdoc.backend.sdoc.models.type_system import (
 )
 from strictdoc.helpers.string import (
     create_safe_requirement_tag_string,
+    ensure_newline,
     unescape,
 )
 
@@ -93,15 +94,6 @@ class P01_ReqIFToSDocConverter:
         )
         return spec_object_type.long_name == "SECTION"
 
-    @staticmethod
-    def is_spec_object_free_text(
-        spec_object: ReqIFSpecObject, reqif_bundle: ReqIFBundle
-    ):
-        spec_object_type = reqif_bundle.lookup.get_spec_type_by_ref(
-            spec_object.spec_object_type
-        )
-        return spec_object_type.long_name == "FREETEXT"
-
     @staticmethod
     def convert_requirement_field_from_reqif(field_name: str) -> str:
         if field_name in ReqIFRequirementReservedField.SET:
@@ -157,7 +149,7 @@ class P01_ReqIFToSDocConverter:
                 reqif_bundle=reqif_bundle,
             )
 
-            converted_node: Union[SDocSection, SDocNode, FreeText]
+            converted_node: Union[SDocSection, SDocNode]
             if is_section:
                 converted_node = (
                     P01_ReqIFToSDocConverter.create_section_from_spec_object(
@@ -167,18 +159,6 @@ class P01_ReqIFToSDocConverter:
                         reqif_bundle=reqif_bundle,
                     )
                 )
-            elif P01_ReqIFToSDocConverter.is_spec_object_free_text(
-                spec_object,
-                reqif_bundle=reqif_bundle,
-            ):
-                converted_node = (
-                    P01_ReqIFToSDocConverter.create_free_text_from_spec_object(
-                        spec_object=spec_object,
-                    )
-                )
-                if len(current_section_.free_texts) == 0:
-                    current_section_.free_texts.append(converted_node)
-                return converted_node, False
             else:
                 converted_node = P01_ReqIFToSDocConverter.create_requirement_from_spec_object(
                     spec_object=spec_object,
@@ -367,17 +347,6 @@ class P01_ReqIFToSDocConverter:
         else:
             raise NotImplementedError(spec_object, attribute_map)
 
-        free_texts = []
-        if ReqIFChapterField.TEXT in spec_object.attribute_map:
-            free_text = unescape(
-                spec_object.attribute_map[ReqIFChapterField.TEXT].value
-            )
-            free_texts.append(
-                FreeText(
-                    parent=None,
-                    parts=[free_text],
-                )
-            )
         # Sanitize the title. Titles can also come from XHTML attributes with
         # custom newlines such as:
         #             <ATTRIBUTE-VALUE-XHTML>
@@ -395,10 +364,31 @@ class P01_ReqIFToSDocConverter:
             custom_level=None,
             title=section_title,
             requirement_prefix=None,
-            free_texts=free_texts,
+            free_texts=[],
             section_contents=[],
         )
         section.ng_level = level
+
+        if ReqIFChapterField.TEXT in spec_object.attribute_map:
+            free_text = unescape(
+                spec_object.attribute_map[ReqIFChapterField.TEXT].value
+            )
+            node_field = SDocNodeField.create_from_string(
+                None,
+                field_name="STATEMENT",
+                field_value=free_text,
+                multiline=True,
+            )
+            node: SDocNode = SDocNode(
+                parent=section,
+                requirement_type="TEXT",
+                mid=None,
+                fields=[node_field],
+                relations=[],
+            )
+            node_field.parent = node
+            section.section_contents.append(node)
+
         return section
 
     @staticmethod
@@ -459,39 +449,46 @@ class P01_ReqIFToSDocConverter:
 
                 enum_values = ", ".join(enum_values_resolved)
                 fields.append(
-                    SDocNodeField(
+                    SDocNodeField.create_from_string(
                         parent=None,
                         field_name=sdoc_field_name,
                         field_value=enum_values,
-                        field_value_multiline=None,
+                        multiline=False,
                     )
                 )
                 continue
             assert isinstance(attribute.value, str)
             if long_name_or_none == "ReqIF.ForeignID":
                 foreign_key_id_or_none = attribute.definition_ref
-            attribute_value: Optional[str] = unescape(attribute.value)
-            attribute_multiline_value = None
+            attribute_value: str = unescape(attribute.value)
+            multiline: bool = False
             if (
                 "\n" in attribute_value
                 or attribute.attribute_type == SpecObjectAttributeType.XHTML
                 or field_name == ReqIFRequirementReservedField.TEXT
                 or field_name == ReqIFRequirementReservedField.COMMENT_NOTES
             ):
-                attribute_multiline_value = attribute_value.lstrip()
-                attribute_value = None
+                attribute_value = attribute_value.lstrip()
+                multiline = True
+                if attribute.attribute_type == SpecObjectAttributeType.XHTML:
+                    attribute_value = attribute.value_stripped_xhtml
+                    # Another strip() is hidden in .value_stripped_xhtml
+                    # but doing this anyway to highlight the intention.
+                    attribute_value = attribute_value.strip()
 
             sdoc_field_name = (
                 P01_ReqIFToSDocConverter.convert_requirement_field_from_reqif(
                     field_name,
                 )
             )
+            if multiline:
+                attribute_value = ensure_newline(attribute_value)
             fields.append(
-                SDocNodeField(
+                SDocNodeField.create_from_string(
                     parent=None,
                     field_name=sdoc_field_name,
                     field_value=attribute_value,
-                    field_value_multiline=attribute_multiline_value,
+                    multiline=multiline,
                 )
             )
 

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/reqif/p01_sdoc/sdoc_to_reqif_converter.py

@@ -47,7 +47,6 @@ from strictdoc.backend.sdoc.models.type_system import (
     GrammarElementFieldString,
     ReferenceType,
 )
-from strictdoc.backend.sdoc.writer import SDWriter
 from strictdoc.core.document_iterator import DocumentCachingIterator
 from strictdoc.core.document_tree import DocumentTree
 from strictdoc.helpers.cast import assert_cast
@@ -234,29 +233,7 @@ class P01_SDocToReqIFObjectConverter:
             )
 
             current_hierarchy = root_hierarchy
-            if len(document.free_texts) > 0:
-                # fmt: off
-                document_free_text_spec_object = (
-                    P01_SDocToReqIFObjectConverter
-                    ._convert_document_free_text_to_spec_object(
-                        document,
-                        context=context,
-                    )
-                )
-                # fmt: on
-                spec_objects.append(document_free_text_spec_object)
-                hierarchy = ReqIFSpecHierarchy(
-                    xml_node=None,
-                    is_self_closed=False,
-                    identifier=generate_unique_identifier("SPEC-HIERARCHY"),
-                    last_change=None,
-                    long_name=None,
-                    spec_object=document_free_text_spec_object.identifier,
-                    children=[],
-                    ref_then_children_order=True,
-                    level=document.ng_level + 1,
-                )
-                current_hierarchy.add_child(hierarchy)
+
             # FIXME: ReqIF must export complete documents including fragments.
             for node in document_iterator.all_content(
                 print_fragments=False, print_fragments_from_files=False
@@ -421,44 +398,6 @@ class P01_SDocToReqIFObjectConverter:
         )
         return reqif_bundle
 
-    @classmethod
-    def _convert_document_free_text_to_spec_object(
-        cls,
-        document: SDocDocument,
-        context: P01_SDocToReqIFBuildContext,
-    ) -> ReqIFSpecObject:
-        assert isinstance(document, SDocDocument)
-        assert len(document.free_texts) > 0
-        attributes = []
-        free_text_value = (
-            SDWriter.print_free_text_content(document.free_texts[0])
-        ).rstrip()
-        if context.multiline_is_xhtml:
-            attribute_type = SpecObjectAttributeType.XHTML
-        else:
-            attribute_type = SpecObjectAttributeType.STRING
-            free_text_value = escape(free_text_value)
-
-        free_text_attribute = SpecObjectAttribute(
-            xml_node=None,
-            attribute_type=attribute_type,
-            definition_ref=ReqIFChapterField.TEXT,
-            value=free_text_value,
-        )
-        attributes.append(free_text_attribute)
-        spec_object = ReqIFSpecObject(
-            xml_node=None,
-            description=None,
-            identifier=generate_unique_identifier("DOCUMENT_FREETEXT"),
-            last_change=None,
-            long_name=None,
-            spec_object_type=context.map_grammar_node_tags_to_spec_object_type[
-                document
-            ]["FREETEXT"].identifier,
-            attributes=attributes,
-        )
-        return spec_object
-
     @classmethod
     def _convert_section_to_spec_object(
         cls,
@@ -475,23 +414,6 @@ class P01_SDocToReqIFObjectConverter:
             value=section.title,
         )
         attributes.append(title_attribute)
-        if len(section.free_texts) > 0:
-            free_text_value = (
-                SDWriter.print_free_text_content(section.free_texts[0])
-            ).rstrip()
-            if context.multiline_is_xhtml:
-                attribute_type = SpecObjectAttributeType.XHTML
-            else:
-                attribute_type = SpecObjectAttributeType.STRING
-                free_text_value = escape(free_text_value)
-
-            free_text_attribute = SpecObjectAttribute(
-                xml_node=None,
-                attribute_type=attribute_type,
-                definition_ref=ReqIFChapterField.TEXT,
-                value=free_text_value,
-            )
-            attributes.append(free_text_attribute)
 
         """
         If MIDs is enabled and this section has an MID, use it for
@@ -551,7 +473,7 @@ class P01_SDocToReqIFObjectConverter:
                 for data_type in data_types:
                     if data_type_ref == data_type.identifier:
                         for data_type_value in data_type.values:
-                            if data_type_value.key == field.get_value():
+                            if data_type_value.key == field.get_text_value():
                                 enum_ref_value = data_type_value.identifier
                                 break
 
@@ -564,7 +486,7 @@ class P01_SDocToReqIFObjectConverter:
                     value=[enum_ref_value],
                 )
             elif isinstance(grammar_field, GrammarElementFieldMultipleChoice):
-                field_values: List[str] = field.get_value().split(",")
+                field_values: List[str] = field.get_text_value().split(",")
                 field_values = list(map(lambda v: v.strip(), field_values))
 
                 data_type_ref = data_types_lookup[field.field_name]
@@ -590,7 +512,7 @@ class P01_SDocToReqIFObjectConverter:
             elif isinstance(grammar_field, GrammarElementFieldString):
                 is_multiline_field = field.is_multiline()
 
-                field_value: str = field.get_value()
+                field_value: str = field.get_text_value().rstrip()
 
                 attribute_type: str
                 if context.multiline_is_xhtml:
@@ -742,13 +664,6 @@ class P01_SDocToReqIFObjectConverter:
             "SECTION"
         ] = section_spec_type
         spec_object_types.append(section_spec_type)
-        free_text_spec_type = (
-            P01_SDocToReqIFObjectConverter._create_free_text_spec_object_type()
-        )
-        context.map_grammar_node_tags_to_spec_object_type[grammar.parent][
-            "FREETEXT"
-        ] = free_text_spec_type
-        spec_object_types.append(free_text_spec_type)
 
         return spec_object_types
 
@@ -772,24 +687,3 @@ class P01_SDocToReqIFObjectConverter:
             attribute_definitions=attribute_definitions,
         )
         return spec_object_type
-
-    @classmethod
-    def _create_free_text_spec_object_type(
-        cls,
-    ):
-        attribute_definitions = []
-        chapter_name_attribute = SpecAttributeDefinition.create(
-            attribute_type=SpecObjectAttributeType.STRING,
-            identifier=ReqIFChapterField.TEXT,
-            datatype_definition=(StrictDocReqIFTypes.MULTI_LINE_STRING.value),
-            long_name=ReqIFChapterField.TEXT,
-        )
-        attribute_definitions.append(chapter_name_attribute)
-
-        spec_object_type_identifier = "FREE_TEXT_" + uuid.uuid4().hex
-        spec_object_type = ReqIFSpecObjectType.create(
-            identifier=spec_object_type_identifier,
-            long_name="FREETEXT",
-            attribute_definitions=attribute_definitions,
-        )
-        return spec_object_type

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/reqif/reqif_export.py

@@ -8,9 +8,6 @@ from reqif.unparser import ReqIFUnparser, ReqIFZUnparser
 from strictdoc.backend.reqif.p01_sdoc.sdoc_to_reqif_converter import (
     P01_SDocToReqIFObjectConverter,
 )
-from strictdoc.backend.reqif.p02_simple.sdoc_to_reqif_converter import (
-    P02_SDocToReqIFObjectConverter,
-)
 from strictdoc.backend.reqif.sdoc_reqif_fields import ReqIFProfile
 from strictdoc.core.project_config import ProjectConfig
 from strictdoc.core.traceability_index import TraceabilityIndex
@@ -32,12 +29,6 @@ class ReqIFExport:
                 multiline_is_xhtml=project_config.reqif_multiline_is_xhtml,
                 enable_mid=project_config.reqif_enable_mid,
             )
-        elif project_config.reqif_profile == ReqIFProfile.P02_SIMPLE:
-            reqif_bundle = P02_SDocToReqIFObjectConverter.convert_document_tree(
-                document_tree=traceability_index.document_tree,
-                multiline_is_xhtml=project_config.reqif_multiline_is_xhtml,
-                enable_mid=project_config.reqif_enable_mid,
-            )
         else:
             raise NotImplementedError(
                 f"Requirements profile does not implement the ReqIF export yet: "

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/reqif/reqif_import.py

@@ -8,12 +8,6 @@ from reqif.reqif_bundle import ReqIFBundle, ReqIFZBundle
 from strictdoc.backend.reqif.p01_sdoc.reqif_to_sdoc_converter import (
     P01_ReqIFToSDocConverter,
 )
-from strictdoc.backend.reqif.p02_simple.reqif_to_sdoc_converter import (
-    P02_ReqIFToSDocConverter,
-)
-from strictdoc.backend.reqif.p11_polarion.reqif_to_sdoc_converter import (
-    P11_ReqIFToSDocConverter,
-)
 from strictdoc.backend.reqif.sdoc_reqif_fields import ReqIFProfile
 from strictdoc.backend.sdoc.models.document import SDocDocument
 from strictdoc.cli.cli_arg_parser import ImportReqIFCommandConfig
@@ -65,10 +59,6 @@ class ReqIFImport:
             or import_config.profile == ReqIFProfile.P01_SDOC
         ):
             return P01_ReqIFToSDocConverter()
-        if import_config.profile == ReqIFProfile.P02_SIMPLE:
-            return P02_ReqIFToSDocConverter()
-        if import_config.profile == ReqIFProfile.P11_POLARION:
-            return P11_ReqIFToSDocConverter()
         raise NotImplementedError(
             f"Unsupported profile: {import_config.profile}"
         )

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/reqif/sdoc_reqif_fields.py

@@ -1,9 +1,7 @@
 class ReqIFProfile:
     P01_SDOC = "p01_sdoc"
-    P02_SIMPLE = "p02_simple"
-    P11_POLARION = "p11_polarion"
 
-    ALL = [P01_SDOC, P02_SIMPLE, P11_POLARION]
+    ALL = [P01_SDOC]
 
 
 SDOC_SPEC_OBJECT_TYPE_SINGLETON = "REQUIREMENT_OR_SECTION"

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/sdoc/error_handling.py

@@ -150,7 +150,7 @@ class StrictDocSemanticError(Exception):
         return StrictDocSemanticError(
             title=(
                 f"Requirement field has an invalid SingleChoice value: "
-                f"{requirement_field.field_value}."
+                f"{requirement_field.get_text_value()}."
             ),
             hint=(
                 f"Problematic field: {requirement_field.field_name}. "
@@ -176,7 +176,7 @@ class StrictDocSemanticError(Exception):
         return StrictDocSemanticError(
             title=(
                 f"Requirement field has an invalid MultipleChoice value: "
-                f"{requirement_field.field_value}."
+                f"{requirement_field.get_text_value()}."
             ),
             hint=(
                 f"Problematic field: {requirement_field.field_name}. "
@@ -201,7 +201,7 @@ class StrictDocSemanticError(Exception):
         return StrictDocSemanticError(
             title=(
                 f"Requirement field of type MultipleChoice is invalid: "
-                f"{requirement_field.field_value}."
+                f"{requirement_field.get_text_value()}."
             ),
             hint="MultipleChoice field requires ', '-separated values.",
             example=None,
@@ -219,7 +219,7 @@ class StrictDocSemanticError(Exception):
         return StrictDocSemanticError(
             title=(
                 f"Requirement field of type Tag is invalid: "
-                f"{requirement_field.field_value}."
+                f"{requirement_field.get_text_value()}."
             ),
             hint="Tag field requires ', '-separated values.",
             example=None,
@@ -365,7 +365,7 @@ class StrictDocSemanticError(Exception):
             filename=filename,
         )
 
-    def to_print_message(self):
+    def to_print_message(self) -> str:
         message = ""
         message += f"error: could not parse file: {self.file_path}.\n"
         message += f"Semantic error: {self.title}\n"

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/sdoc/free_text_reader.py

@@ -1,4 +1,6 @@
 # mypy: disable-error-code="no-untyped-call,no-untyped-def"
+from typing import Tuple
+
 from textx import metamodel_from_str
 
 from strictdoc.backend.sdoc.grammar.grammar_builder import SDocGrammarBuilder
@@ -11,7 +13,9 @@ from strictdoc.helpers.textx import drop_textx_meta
 
 class SDFreeTextReader:
     @staticmethod
-    def _read(input_string, file_path=None):
+    def _read(
+        input_string, file_path=None
+    ) -> Tuple[FreeTextContainer, ParseContext]:
         meta_model = metamodel_from_str(
             SDocGrammarBuilder.create_free_text_grammar(),
             classes=[FreeTextContainer, InlineLink, Anchor],
@@ -32,6 +36,7 @@ class SDFreeTextReader:
         return document, parse_context
 
     @staticmethod
-    def read(input_string, file_path=None):
+    def read(input_string: str, file_path=None) -> FreeTextContainer:
+        assert isinstance(input_string, str), input_string
         document, _ = SDFreeTextReader._read(input_string, file_path)
         return document

{strictdoc-0.0.56a3 → strictdoc-0.0.57}/strictdoc/backend/sdoc/grammar/grammar.py

@@ -1,4 +1,8 @@
 REGEX_UID = r"([A-Za-z0-9]+[A-Za-z0-9_\-]*)"
+
+NEGATIVE_MULTILINE_STRING_START = "(?!>>>\n)"
+NEGATIVE_MULTILINE_STRING_END = "(?!^<<<)"
+NEGATIVE_RELATIONS = "(?!^RELATIONS)"
 NEGATIVE_FREETEXT_END = "(?!^\\[\\/FREETEXT\\]\n)"
 NEGATIVE_INLINE_LINK_START = rf"(?!\[LINK: {REGEX_UID})"
 NEGATIVE_ANCHOR_START = rf"(?!^\[ANCHOR: {REGEX_UID})"
@@ -8,8 +12,12 @@ TextPart[noskipws]:
   (Anchor | InlineLink | NormalString)
 ;
 
+SingleLineTextPart[noskipws]:
+  (Anchor | InlineLink | /{NEGATIVE_MULTILINE_STRING_START}\S.*/)
+;
+
 NormalString[noskipws]:
-  (/(?ms){NEGATIVE_FREETEXT_END}{NEGATIVE_INLINE_LINK_START}{NEGATIVE_ANCHOR_START}./)+
+  (/(?ms){NEGATIVE_MULTILINE_STRING_END}{NEGATIVE_FREETEXT_END}{NEGATIVE_INLINE_LINK_START}{NEGATIVE_ANCHOR_START}./)+
 ;
 
 InlineLink[noskipws]:
@@ -21,6 +29,23 @@ Anchor[noskipws]:
   value = /{REGEX_UID}/ (', ' title = /\w+[\s\w+]*/)?
   /\](\Z|\n)/
 ;
+
+// According to the Strict Grammar Rule #3, both SingleLineString and
+// MultiLineString can never be empty strings.
+// Both must eventualy start with a non-space character.
+SingleLineString:
+  /{NEGATIVE_MULTILINE_STRING_START}\S.*$/
+;
+
+MultiLineString[noskipws]:
+  />>>\n/-
+    parts*=TextPart
+  /^<<</-
+;
+
+FieldName[noskipws]:
+  /{NEGATIVE_RELATIONS}[A-Z]+[A-Z_]*/
+;
 """
 
 FREE_TEXT_PARSER_GRAMMAR = r"""
@@ -148,7 +173,7 @@ ReservedKeyword[noskipws]:
 ;
 
 SDocNode[noskipws]:
-  '[' !SDocCompositeNodeTagName requirement_type = RequirementType ']' '\n'
+  '[' !'SECTION' !SDocCompositeNodeTagName requirement_type = RequirementType ']' '\n'
   ('MID: ' mid = SingleLineString '\n')?
   fields *= SDocNodeField
   (
@@ -165,8 +190,17 @@ SDocNodeField[noskipws]:
   (
     field_name = FieldName ':'
     (
-      ((' ' field_value = SingleLineString) '\n') |
-      (' ' (field_value_multiline = MultiLineString) '\n')
+        (' ' parts+=SingleLineTextPart '\n')
+        |
+        (
+          ' '
+          (
+            multiline__ = />>>\n/
+            parts+=TextPart
+            /^<<</
+          )
+          '\n'
+        )
     )
   )
 ;