From 4c8c93a810efd02c594f150f67d48cb0f7df4203 Mon Sep 17 00:00:00 2001
From: kthoden <kthoden@mpiwg-berlin.mpg.de>
Date: Mon, 15 Nov 2021 21:12:12 +0100
Subject: [PATCH] Avoid margins when converting figure

---
 src/imxml2django.py        | 12 +++++++-----
 src/utils/libeoaconvert.py |  7 ++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/imxml2django.py b/src/imxml2django.py
index 534839d..4ee9dea 100755
--- a/src/imxml2django.py
+++ b/src/imxml2django.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8; mode: python -*-
-# Time-stamp: <2021-07-09 13:48:22 (kthoden)>
+# Time-stamp: <2021-10-26 14:09:17 (kthoden)>
 
 """
 Create an XML file that can be inserted into the Django database
@@ -1542,7 +1542,8 @@ def bring_footnote_down_django(footnote, fragment, footnote_number, object_numbe
                     PUBLICATION_DIR / strInlineElementDirName / strInlineElementFileName,
                     TEMP_DIR,
                     GM_PATH,
-                    PDFCROP_EXEC
+                    PDFCROP_EXEC,
+                    margin=False
             )
             strInlineElementFileName = strInlineElementFileName.replace(".pdf", ".png")
 
@@ -1556,9 +1557,10 @@ def bring_footnote_down_django(footnote, fragment, footnote_number, object_numbe
         # shutil.copy(os.getcwd() + "/" + strInlineElementDirName + "/" +  strInlineElementFileName, os.getcwd() + "/CONVERT/django/images/embedded/"  + strInlineElementDirName + strInlineElementFileName)
         strNewImagePath = OUTPUT_DIR / "images/embedded" / (strInlineElementSubDirName + strInlineElementFileName)
         # strNewImagePath = os.getcwd() + "/CONVERT/django/images/embedded/" + strInlineElementDirName + strInlineElementFileName
-        strCommand = GM_PATH + " convert " + str(strNewImagePath) + " -resize 20x20 " + str(strNewImagePath)
-        listArguments = shlex.split(strCommand)
-        subprocess.check_output(listArguments, shell=False)
+        # strCommand = GM_PATH + " convert " + str(strNewImagePath) + " -resize 20x20 " + str(strNewImagePath)
+        # listArguments = shlex.split(strCommand)
+        # subprocess.check_output(listArguments, shell=False)
+
     # Change EOAcitenumeric into a span to create approriate link
     xmlEOAcitenumerics = xmlEOAchapter.findall(".//EOAcitenumeric")
     for xmlEOAcitenumeric in xmlEOAcitenumerics:
diff --git a/src/utils/libeoaconvert.py b/src/utils/libeoaconvert.py
index 06ec58d..184a354 100644
--- a/src/utils/libeoaconvert.py
+++ b/src/utils/libeoaconvert.py
@@ -72,6 +72,7 @@ def sanitizeImage(
         tmp_dir,
         GM_PATH,
         PDFCROP_EXEC,
+        margin=True
         # TL_PATH
 ):
     """Adjust and convert image for epub standard"""
@@ -125,8 +126,12 @@ def sanitizeImage(
         strNewImagepath = os.path.splitext(str(strImagepath))[0]
         clipped_file = str(strImagepath).replace(".pdf", "-clipped.pdf")
 
+        if margin:
+            margin_value = 10
+        else:
+            margin_value = 1
         exec_command(
-            f"{PDFCROP_EXEC} --margins 10 --clip --hires {strImagepath} {clipped_file}",
+            f"{PDFCROP_EXEC} --margins {margin_value} --clip --hires {strImagepath} {clipped_file}",
             # wd = tmp_image_dir
         )
         exec_command(