diff --git a/src/eoatex2imxml.py b/src/eoatex2imxml.py index 23376a0..40a96f8 100755 --- a/src/eoatex2imxml.py +++ b/src/eoatex2imxml.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8; mode: python -*- -# Time-stamp: <2020-09-04 19:14:09 (kthoden)> +# Time-stamp: <2020-09-29 11:26:51 (kthoden)> """ Converts Latex files into a customized DocBook XML file. @@ -1038,7 +1038,11 @@ def process_references(xmlTree): eoarefs = xmlTree.xpath("//EOAref") for ref in eoarefs: - ref.set("type", "number") + reftype = ref.get("type") + if reftype == "text": + pass + else: + ref.set("type", "number") ref_element = ref.find("./ref") target_attribute = ref.xpath("./ref/@target") ref_label = ref.find("./Label").text diff --git a/src/imxml2django.py b/src/imxml2django.py index 8bdd37d..db0e988 100755 --- a/src/imxml2django.py +++ b/src/imxml2django.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8; mode: python -*- -# Time-stamp: <2020-09-11 16:38:19 (kthoden)> +# Time-stamp: <2020-09-29 11:38:15 (kthoden)> """ Create an XML file that can be inserted into the Django database @@ -1702,14 +1702,23 @@ def bring_footnote_down_django(footnote, fragment, footnote_number, object_numbe tmpTail = xmlReference.tail or "" originalcontents = xmlReference.find("originalcontents") - if xmlReference.get("type") == "collage": + + ref_is_text = False + ref_is_collage = False + + reference_type = xmlReference.get("type") + if reference_type == "collage": ref_is_collage = True - else: - ref_is_collage = False + elif reference_type == "text": + ref_is_text = True + reference_text = xmlReference.text.strip() + xmlReference.clear() if originalcontents is not None: logging.info("Found originalcontents") xmlReference.append(originalcontents) + elif ref_is_text: + xmlReference.text = reference_text else: xmlReference.text = strResult xmlReference.tail = tmpTail