strictdoc 0.0.59a2__tar.gz → 0.1.0__tar.gz

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: strictdoc
-Version: 0.0.59a2
+Version: 0.1.0
 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/
@@ -12,20 +12,18 @@ License-File: NOTICE
 Classifier: License :: OSI Approved :: BSD License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.7
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy
-Requires-Python: >=3.7
+Requires-Python: >=3.8
 Requires-Dist: beautifulsoup4==4.*,>=4.12.0
 Requires-Dist: docutils==0.*,>=0.16
 Requires-Dist: fastapi>=0.83.0
 Requires-Dist: html5lib>=1.1
 Requires-Dist: jinja2>=2.11.2
-Requires-Dist: lxml==4.*,>=4.6.2
 Requires-Dist: pygments==2.*,>=2.10.0
 Requires-Dist: python-datauri==2.*,>=2.1.1
 Requires-Dist: python-multipart
@@ -35,6 +33,9 @@ Requires-Dist: selenium
 Requires-Dist: spdx-tools
 Requires-Dist: textx==3.*,>=3.0.0
 Requires-Dist: toml
+Requires-Dist: tree-sitter
+Requires-Dist: tree-sitter-c
+Requires-Dist: tree-sitter-python
 Requires-Dist: uvicorn[standard]>=0.14.0
 Requires-Dist: webdriver-manager
 Requires-Dist: websockets

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/pyproject.toml

@@ -6,17 +6,18 @@ build-backend = "hatchling.build"
 path = "strictdoc/__init__.py"
 
 [tool.hatch.build]
-exclude = [
-  "/.*",
-  "/developer",
-  "/docs",
-  "/tests",
+include = [
+    "/strictdoc/",
+    "LICENSE",
+    "NOTICE",
+    "README.md",
+    "pyproject.toml"
 ]
 
-#[tool.hatch.build.targets.sdist]
-#include = [
-#    "/uvicorn",
-#]
+exclude = [
+    # Without this, the folder is still included to the output tar.gz because it has a Markdown file.
+    "/developer",
+]
 
 [project]
 name = "strictdoc"
@@ -24,7 +25,7 @@ dynamic = ["version"]
 description = "StrictDoc is open-source software for technical documentation and requirements management."
 readme = "README.md"
 license = "Apache-2.0"
-requires-python = ">=3.7"
+requires-python = ">=3.8"
 authors = [
     { name = "Stanislav Pankevich", email = "s.pankevich@gmail.com" },
     { name = "Maryna Balioura", email = "mettta@gmail.com" },
@@ -36,7 +37,6 @@ classifiers = [
     "License :: OSI Approved :: BSD License",
     "Operating System :: OS Independent",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.7",
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
@@ -56,12 +56,14 @@ dependencies = [
     # Parsing and rendering RST.
     "docutils >= 0.16, == 0.*",
 
+    # Tree Sitter is used for language/AST-aware parsing of Python, C and other files.
+    "tree-sitter",
+    "tree-sitter-c",
+    "tree-sitter-python",
+
     # Requirements-to-source traceability. Colored syntax for source files.
     "pygments >= 2.10.0, == 2.*",
 
-    # TODO: Only used by reqif. Remove.
-    "lxml >= 4.6.2, == 4.*",
-
     # Static HTML export with embedded assets.
     "beautifulsoup4 >= 4.12.0, == 4.*",
     "html5lib>=1.1",  # Used by beautifulsoup4 as an optional plugin.

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/__init__.py

@@ -1,6 +1,6 @@
 from strictdoc.core.environment import SDocRuntimeEnvironment
 
-__version__ = "0.0.59a2"
+__version__ = "0.1.0"
 
 
 environment = SDocRuntimeEnvironment(__file__)

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/excel/import_/excel_to_sdoc_converter.py

@@ -185,7 +185,7 @@ class ExcelToSDocConverter:
 
         template_requirement = SDocObjectFactory.create_requirement(
             document,
-            requirement_type="REQUIREMENT",
+            node_type="REQUIREMENT",
             title=title,
             uid=uid,
             level=None,
@@ -214,7 +214,7 @@ class ExcelToSDocConverter:
             template_requirement.relations = [reference]
         requirement = SDocNode(
             parent=template_requirement.parent,
-            requirement_type=template_requirement.requirement_type,
+            node_type=template_requirement.node_type,
             fields=list(template_requirement.enumerate_fields()),
             relations=template_requirement.relations,
         )

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/reqif/p01_sdoc/reqif_to_sdoc_converter.py

@@ -404,7 +404,7 @@ class P01_ReqIFToSDocConverter:
             )
             node: SDocNode = SDocNode(
                 parent=section,
-                requirement_type="TEXT",
+                node_type="TEXT",
                 fields=[node_field],
                 relations=[],
             )
@@ -533,7 +533,7 @@ class P01_ReqIFToSDocConverter:
             )
         requirement = SDocNode(
             parent=parent_section,
-            requirement_type=grammar_element.tag,
+            node_type=grammar_element.tag,
             fields=fields,
             relations=[],
         )

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/reqif/p01_sdoc/sdoc_to_reqif_converter.py

@@ -485,7 +485,7 @@ class P01_SDocToReqIFObjectConverter:
         else:
             requirement_identifier = generate_unique_identifier("REQUIREMENT")
 
-        grammar_element = grammar.elements_by_type[requirement.requirement_type]
+        grammar_element = grammar.elements_by_type[requirement.node_type]
 
         attributes: List[SpecObjectAttribute] = []
         for field in requirement.fields_as_parsed:
@@ -574,7 +574,7 @@ class P01_SDocToReqIFObjectConverter:
         spec_object_type: ReqIFSpecObjectType = (
             context.map_grammar_node_tags_to_spec_object_type[
                 requirement.document
-            ][requirement.requirement_type]
+            ][requirement.node_type]
         )
         spec_object = ReqIFSpecObject.create(
             identifier=requirement_identifier,

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/error_handling.py

@@ -1,4 +1,6 @@
 # mypy: disable-error-code="attr-defined,no-untyped-call,no-untyped-def,union-attr"
+from typing import Optional
+
 from textx import TextXSyntaxError
 
 from strictdoc.backend.sdoc.models.document import SDocDocument
@@ -25,7 +27,13 @@ def get_textx_syntax_error_message(exception: TextXSyntaxError):
 
 class StrictDocSemanticError(Exception):
     def __init__(
-        self, title, hint, example, line=None, col=None, filename=None
+        self,
+        title: str,
+        hint: Optional[str],
+        example: Optional[str],
+        line: Optional[int] = None,
+        col: Optional[int] = None,
+        filename: Optional[str] = None,
     ):
         super().__init__(title, hint, line, col, filename)
         self.title = title
@@ -36,9 +44,9 @@ class StrictDocSemanticError(Exception):
         self.file_path = filename
 
     @staticmethod
-    def unknown_requirement_type(node: SDocNode, path_to_sdoc_file: str):
+    def unknown_node_type(node: SDocNode, path_to_sdoc_file: str):
         return StrictDocSemanticError(
-            title=f"Invalid requirement type: {node.requirement_type}.",
+            title=f"Invalid node type: {node.node_type}.",
             hint=None,
             example=None,
             line=node.ng_line_start,
@@ -54,14 +62,12 @@ class StrictDocSemanticError(Exception):
         document_grammar: DocumentGrammar,
         path_to_sdoc_file: str,
     ):
-        grammar_dump = document_grammar.dump_fields(
-            requirement.requirement_type
-        )
+        grammar_dump = document_grammar.dump_fields(requirement.node_type)
         return StrictDocSemanticError(
             title=f"Invalid requirement field: {field_name}",
             hint=(
                 f"Compare with the document grammar: [{grammar_dump}] "
-                f"for type: {requirement.requirement_type}."
+                f"for type: {requirement.node_type}."
             ),
             example=None,
             line=requirement.ng_line_start,
@@ -76,7 +82,7 @@ class StrictDocSemanticError(Exception):
         document_grammar: DocumentGrammar,
         path_to_sdoc_file: str,
     ):
-        grammar_fields = document_grammar.dump_fields(node.requirement_type)
+        grammar_fields = document_grammar.dump_fields(node.node_type)
         return StrictDocSemanticError(
             title=(
                 f"Requirement is missing a field that is required by "
@@ -99,7 +105,7 @@ class StrictDocSemanticError(Exception):
         document_grammar: DocumentGrammar,
         path_to_sdoc_file: str,
     ):
-        grammar_fields = document_grammar.dump_fields(node.requirement_type)
+        grammar_fields = document_grammar.dump_fields(node.node_type)
         return StrictDocSemanticError(
             title=(
                 f"Unexpected field outside grammar: "
@@ -126,13 +132,13 @@ class StrictDocSemanticError(Exception):
             problematic_field, SDocNodeField
         ), f"{problematic_field}"
         requirement_dump = node.dump_fields_as_parsed()
-        grammar_dump = document_grammar.dump_fields(node.requirement_type)
+        grammar_dump = document_grammar.dump_fields(node.node_type)
         return StrictDocSemanticError(
             title=f"Wrong field order for requirement: [{requirement_dump}].",
             hint=(
                 f"Problematic field: {problematic_field.field_name}. "
                 f"Compare with the document grammar: [{grammar_dump}] "
-                f"for type: {node.requirement_type}."
+                f"for type: {node.node_type}."
             ),
             example=None,
             line=node.ng_line_start,
@@ -156,9 +162,9 @@ class StrictDocSemanticError(Exception):
                 f"Problematic field: {requirement_field.field_name}. "
                 f"Compare with the document grammar: "
                 f"["
-                f"{document_grammar.dump_fields(node.requirement_type)}"
+                f"{document_grammar.dump_fields(node.node_type)}"
                 f"] "
-                f"for type: {node.requirement_type}."
+                f"for type: {node.node_type}."
             ),
             example=None,
             line=node.ng_line_start,
@@ -182,9 +188,9 @@ class StrictDocSemanticError(Exception):
                 f"Problematic field: {requirement_field.field_name}. "
                 f"Compare with the document grammar: "
                 f"["
-                f"{document_grammar.dump_fields(node.requirement_type)}"
+                f"{document_grammar.dump_fields(node.node_type)}"
                 f"] "
-                f"for type: {node.requirement_type}."
+                f"for type: {node.node_type}."
             ),
             example=None,
             line=node.ng_line_start,

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/grammar/grammar.py

@@ -174,7 +174,7 @@ ReservedKeyword[noskipws]:
 ;
 
 SDocNode[noskipws]:
-  '[' !'SECTION' !SDocCompositeNodeTagName requirement_type = RequirementType ']' '\n'
+  '[' !'SECTION' !SDocCompositeNodeTagName node_type = RequirementType ']' '\n'
   fields *= SDocNodeField
   (
     'RELATIONS:' '\n'
@@ -210,7 +210,7 @@ SDocNodeField[noskipws]:
 ;
 
 SDocCompositeNode[noskipws]:
-  '[COMPOSITE_' requirement_type = RequirementType ']' '\n'
+  '[COMPOSITE_' node_type = RequirementType ']' '\n'
 
   fields *= SDocNodeField
   (

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/grammar/type_system.py

@@ -47,6 +47,8 @@ FileEntry[noskipws]:
   ('  FORMAT: ' g_file_format = FileEntryFormat '\n')?
    '  VALUE: ' g_file_path = /.*$/ '\n'
   ('  LINE_RANGE: ' g_line_range = /.*$/ '\n')?
+  ('  FUNCTION: ' function = /.*$/ '\n')?
+  ('  CLASS: ' clazz = /.*$/ '\n')?
 ;
 
 FileEntryFormat[noskipws]:

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/models/document.py

@@ -151,7 +151,7 @@ class SDocDocument:
                     return True
                 continue
             if section_or_requirement.is_requirement:
-                if section_or_requirement.requirement_type == "TEXT":
+                if section_or_requirement.node_type == "TEXT":
                     continue
                 return True
             assert section_or_requirement.is_section, section_or_requirement

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/models/document_grammar.py

@@ -294,12 +294,12 @@ class DocumentGrammar:
             f"Could not find a grammar element with MID: {element_mid}"
         )
 
-    def dump_fields(self, requirement_type) -> str:
+    def dump_fields(self, node_type) -> str:
         return ", ".join(
             list(
                 map(
                     lambda g: g.title,
-                    self.elements_by_type[requirement_type].fields,
+                    self.elements_by_type[node_type].fields,
                 )
             )
         )

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/models/document_view.py

@@ -25,9 +25,9 @@ class ViewElement:
         self.hidden_tags: Optional[List[ViewElementHiddenTag]] = hidden_tags
         self.name: Optional[str] = name
 
-    def includes_field(self, requirement_type: str, field_name: str) -> bool:
+    def includes_field(self, node_type: str, field_name: str) -> bool:
         for tag_ in self.tags:
-            if tag_.object_type == requirement_type:
+            if tag_.object_type == node_type:
                 field_: ViewElementField
                 for field_ in tag_.visible_fields:
                     if field_.name == field_name:
@@ -43,7 +43,7 @@ class DefaultViewElement(ViewElement):
            works fine for now.
     """
 
-    def includes_field(self, requirement_type: str, field_name: str) -> bool:  # noqa: ARG002
+    def includes_field(self, node_type: str, field_name: str) -> bool:  # noqa: ARG002
         return True
 
 

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/models/node.py

@@ -97,21 +97,21 @@ class SDocNode(SDocObject):
     def __init__(
         self,
         parent: Union[SDocDocument, SDocSection, "SDocCompositeNode"],
-        requirement_type: str,
+        node_type: str,
         fields: List[SDocNodeField],
         relations: List[Reference],
         requirements: Optional[List["SDocNode"]] = None,
         basic_free_text: bool = False,
     ) -> None:
         assert parent
-        assert isinstance(requirement_type, str)
+        assert isinstance(node_type, str)
         assert isinstance(relations, list), relations
 
         self.parent: Union[SDocDocument, SDocSection, SDocCompositeNode] = (
             parent
         )
 
-        self.requirement_type: str = requirement_type
+        self.node_type: str = node_type
 
         ordered_fields_lookup: OrderedDict[str, List[SDocNodeField]] = (
             OrderedDict()
@@ -178,17 +178,17 @@ class SDocNode(SDocObject):
         return "requirement"
 
     def get_node_type_string(self) -> Optional[str]:
-        return self.requirement_type
+        return self.node_type
 
     def get_node_type_string_lower(self) -> Optional[str]:
-        return self.requirement_type.lower()
+        return self.node_type.lower()
 
     def get_display_title(self) -> str:
         if self.reserved_title is not None:
             return self.reserved_title
         if self.reserved_uid is not None:
             return self.reserved_uid
-        return f"{self.requirement_type} with no title/UID"
+        return f"{self.node_type} with no title/UID"
 
     @property
     def is_root_included_document(self) -> bool:
@@ -233,14 +233,14 @@ class SDocNode(SDocObject):
 
     def has_reserved_statement(self) -> bool:
         element: GrammarElement = self.document.grammar.elements_by_type[
-            self.requirement_type
+            self.node_type
         ]
         return element.content_field[0] in self.ordered_fields_lookup
 
     @property
     def reserved_statement(self) -> Optional[str]:
         element: GrammarElement = self.document.grammar.elements_by_type[
-            self.requirement_type
+            self.node_type
         ]
         return self._get_cached_field(
             element.content_field[0], singleline_only=False
@@ -259,7 +259,7 @@ class SDocNode(SDocObject):
         return True
 
     def is_text_node(self) -> bool:
-        return self.requirement_type == "TEXT"
+        return self.node_type == "TEXT"
 
     # FIXME: Remove @property.
     @property
@@ -335,13 +335,13 @@ class SDocNode(SDocObject):
 
     def get_content_field_name(self) -> str:
         element: GrammarElement = self.document.grammar.elements_by_type[
-            self.requirement_type
+            self.node_type
         ]
         return element.content_field[0]
 
     def get_content_field(self) -> SDocNodeField:
         element: GrammarElement = self.document.grammar.elements_by_type[
-            self.requirement_type
+            self.node_type
         ]
         return self.ordered_fields_lookup[element.content_field[0]][0]
 
@@ -456,7 +456,7 @@ class SDocNode(SDocObject):
         self, skip_single_lines: bool = False, skip_multi_lines: bool = False
     ) -> Generator[Tuple[str, SDocNodeField], None, None]:
         element: GrammarElement = self.document.grammar.elements_by_type[
-            self.requirement_type
+            self.node_type
         ]
         grammar_field_titles = list(map(lambda f: f.title, element.fields))
         statement_field_index: int = element.content_field[1]
@@ -489,14 +489,14 @@ class SDocNode(SDocObject):
 
     def get_field_human_title(self, field_name: str) -> str:
         element: GrammarElement = self.document.grammar.elements_by_type[
-            self.requirement_type
+            self.node_type
         ]
         field_human_title = element.fields_map[field_name]
         return field_human_title.get_field_human_name()
 
     def get_field_human_title_for_statement(self) -> str:
         element: GrammarElement = self.document.grammar.elements_by_type[
-            self.requirement_type
+            self.node_type
         ]
         field_human_title = element.fields_map[element.content_field[0]]
         return field_human_title.get_field_human_name()
@@ -567,9 +567,7 @@ class SDocNode(SDocObject):
         assert grammar_or_none is not None
         grammar: DocumentGrammar = grammar_or_none
 
-        element: GrammarElement = grammar.elements_by_type[
-            self.requirement_type
-        ]
+        element: GrammarElement = grammar.elements_by_type[self.node_type]
         grammar_field_titles = list(map(lambda f: f.title, element.fields))
         field_index = grammar_field_titles.index(field_name)
 

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/models/object_factory.py

@@ -23,7 +23,7 @@ class SDocObjectFactory:
     @staticmethod
     def create_requirement(
         parent,
-        requirement_type: Optional[str] = "REQUIREMENT",
+        node_type: Optional[str] = "REQUIREMENT",
         uid: Optional[str] = None,
         level: Optional[str] = None,
         title: Optional[str] = None,
@@ -127,7 +127,7 @@ class SDocObjectFactory:
                 )
         requirement = SDocNode(
             parent=parent,
-            requirement_type=requirement_type,
+            node_type=node_type,
             fields=fields,
             relations=[],
         )
@@ -175,7 +175,7 @@ class SDocObjectFactory:
 
         requirement = SDocObjectFactory.create_requirement(
             parent=parent,
-            requirement_type="REQUIREMENT",
+            node_type="REQUIREMENT",
             uid=uid,
             level=None,
             title=title,

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/models/type_system.py

@@ -56,6 +56,8 @@ class FileEntry:
         g_file_format: Optional[str],
         g_file_path: str,
         g_line_range: Optional[str],
+        function: Optional[str],
+        clazz: Optional[str],
     ):
         self.parent = parent
 
@@ -85,6 +87,14 @@ class FileEntry:
                 int(range_components_str[1]),
             )
 
+        # textX parses an optional element as an empty string. We make it to None ourselves.
+        self.function: Optional[str] = (
+            function if function is not None and len(function) > 0 else None
+        )
+        self.clazz: Optional[str] = (
+            clazz if clazz is not None and len(clazz) > 0 else None
+        )
+
 
 class FileEntryFormat:
     SOURCECODE = "Sourcecode"

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/processor.py

@@ -71,7 +71,7 @@ class SDocParsingProcessor:
             ]
             text_node = SDocNode(
                 parent=parent_node,
-                requirement_type="TEXT",
+                node_type="TEXT",
                 fields=fields,
                 relations=[],
                 requirements=None,

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/validations/sdoc_validator.py

@@ -158,16 +158,13 @@ class SDocValidator:
         path_to_sdoc_file: str,
         auto_uid_mode: bool = True,
     ):
-        if (
-            requirement.requirement_type
-            not in document_grammar.registered_elements
-        ):
-            raise StrictDocSemanticError.unknown_requirement_type(
+        if requirement.node_type not in document_grammar.registered_elements:
+            raise StrictDocSemanticError.unknown_node_type(
                 requirement, path_to_sdoc_file
             )
 
         grammar_element = document_grammar.elements_by_type[
-            requirement.requirement_type
+            requirement.node_type
         ]
         registered_fields: Set[str] = set(grammar_element.get_field_titles())
 
@@ -181,7 +178,7 @@ class SDocValidator:
                 )
 
         grammar_element: GrammarElement = document_grammar.elements_by_type[
-            requirement.requirement_type
+            requirement.node_type
         ]
         grammar_fields_iterator: Iterator[GrammarElementField] = iter(
             grammar_element.fields

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc/writer.py

@@ -294,7 +294,7 @@ class SDWriter:
             # Special case for backward compatibility.
             if (
                 not convert_free_text_to_text
-                and root_node.requirement_type == "TEXT"
+                and root_node.node_type == "TEXT"
                 and root_node.basic_free_text
             ):
                 output += self._print_free_text(root_node)
@@ -302,11 +302,11 @@ class SDWriter:
                 return output
             if isinstance(root_node, SDocCompositeNode):
                 output += "[COMPOSITE_"
-                output += root_node.requirement_type
+                output += root_node.node_type
                 output += "]\n"
             else:
                 output += "["
-                output += root_node.requirement_type
+                output += root_node.node_type
                 output += "]\n"
 
             output += self._print_requirement_fields(
@@ -323,7 +323,7 @@ class SDWriter:
                     )
 
                 output += "[/COMPOSITE_"
-                output += root_node.requirement_type
+                output += root_node.node_type
                 output += "]\n"
                 output += "\n"
 
@@ -401,9 +401,7 @@ class SDWriter:
         current_view: ViewElement = document.view.get_current_view(
             self.project_config.view
         )
-        element = document.grammar.elements_by_type[
-            section_content.requirement_type
-        ]
+        element = document.grammar.elements_by_type[section_content.node_type]
 
         for element_field in element.fields:
             field_name = element_field.title
@@ -414,7 +412,7 @@ class SDWriter:
                     output += "\n"
                 continue
             if not current_view.includes_field(
-                section_content.requirement_type, field_name
+                section_content.node_type, field_name
             ):
                 continue
             fields = section_content.ordered_fields_lookup[field_name]

{strictdoc-0.0.59a2 → strictdoc-0.1.0}/strictdoc/backend/sdoc_source_code/grammar.py

@@ -18,21 +18,36 @@ RangeMarker[noskipws]:
   // It is a hard-won result: it is important that the "@sdoc" is within the
   // regex. Putting it next to the regex as "@sdoc" does not work.
   // TODO: It would be great to check this with the TextX developers.
+  (
   /^.*?@sdoc/
   (begin_or_end = "[/" | begin_or_end = "[")
   (reqs_objs += Req[', ']) ']' '\n'?
+  )
+  |
+  (
+  /^.*?@relation/
+  '('
+  (reqs_objs += Req[', ']) ', scope=' scope=/(range_start|range_end)/ ')' '\n'?
+  )
 ;
 
 LineMarker[noskipws]:
   // It is a hard-won result: it is important that the "@sdoc" is within the
   // regex. Putting it next to the regex as "@sdoc" does not work.
   // TODO: It would be great to check this with the TextX developers.
+  (
   /^.*?@sdoc/
   "(" (reqs_objs += Req[', ']) ')' '\n'?
+  )
+  |
+  (
+  /^.*?@relation/
+  "(" (reqs_objs += Req[', ']) ', scope=line)' '\n'?
+  )
 ;
 
 Req[noskipws]:
-  uid = /[A-Za-z][A-Za-z0-9\\-]+/
+  uid = /(?!scope=)[A-Za-z][A-Za-z0-9\\-]+/
 ;
 
 SingleLineString[noskipws]: