Merge pull request #247 from AnEnglishmanInNorway/PR244ParaWrap

PR240 bullets, PR244 paragraph wrapping, vertical alignment, internal text box margins, CEWE 8.0.x format

Author: AnEnglishmanInNorway

.gitignore

@@ -68,3 +68,12 @@ nosetests.xml
 /junk*.pdf
 /tests/testIndex/test_index.mcf.*S.idx.png
 /tests/testIndexLarge/test_indexLarge.mcf.*S.idx.png
+.idea/cewe2pdf.iml
+.idea/misc.xml
+.idea/modules.xml
+.idea/vcs.xml
+.idea/inspectionProfiles/profiles_settings.xml
+.DS_Store
+# macOS custom folder icon file is stored as "Icon" plus a hidden control character.
+# Match that hidden-character variant anywhere in the repo.
+**/Icon?

.idea/.gitignore

@@ -310,17 +310,22 @@ Where-Object {
 ```
 and then delete them (via the recycle bin) with
 ```
-$shell = New-Object -ComObject Shell.Application
+Add-Type -AssemblyName Microsoft.VisualBasic
+
 Get-ChildItem -Recurse -File -Filter *.pdf |
 Where-Object {
     $_.FullName -notmatch '\\previous_result_pdfs\\' -and
-    $_.Name -match '^[^\\]*\d{8}[DS]\.pdf$'
+    $_.Name -match '^\w*\d{8}[DS]\.pdf$'
 } |
 ForEach-Object {
-    $shell.Namespace(0).ParseName($_.FullName).InvokeVerb("delete")
+    [Microsoft.VisualBasic.FileIO.FileSystem]::DeleteFile(
+        $_.FullName,
+        'OnlyErrorDialogs',
+        'SendToRecycleBin'
+    )
 }
 ```
-If you want a dry run first, just replace the `InvokeVerb("delete")` line with:
+If you want a dry run first, just replace the DeleteFile section with:
 ```
 Write-Output "Would delete: $($_.FullName)"
 ```

README.md

@@ -174,6 +174,13 @@
     <Content Include="tests\testTextArt\test_textart.mcf" />
     <Content Include="tests\testTextArt\test_textart.mcf~" />
     <Content Include="tests\testTextArt\test_textart_mcf-Dateien\folderid.xml~" />
+    <Content Include="tests\testTextBox\additional_fonts.txt" />
+    <Content Include="tests\testTextBox\cewe2pdf.ini" />
+    <Content Include="tests\testTextWrapVAlignBorder\cewe2pdf.ini" />
+    <Content Include="tests\testTextWrapVAlignBorder\previous_result_pdfs\test_textwrapvalignborder.mcf.20251216S.pdf" />
+    <Content Include="tests\testTextWrapVAlignBorder\previous_result_pdfs\test_textwrapvalignborder.mcf.20251217S.pdf" />
+    <Content Include="tests\testTextWrapVAlignBorder\test_textwrapvalignborder.mcf" />
+    <Content Include="tests\testTextWrapVAlignBorder\test_textwrapvalignborder_mcf-Dateien\folderid.xml" />
     <Content Include="tests\unittest_fotobook\additional_fonts.txt" />
     <Content Include="tests\unittest_fotobook\cewe2pdf.ini" />
     <Content Include="tests\hps\5026\.gitkeep" />
@@ -252,6 +259,7 @@
     <Content Include="tests\unittest_fotobook\previous_result_pdfs\unittest_fotobook.mcf.20250413D.pdf" />
     <Content Include="tests\unittest_fotobook\previous_result_pdfs\unittest_fotobook.mcf.20250413S.pdf" />
     <Content Include="tests\unittest_fotobook\previous_result_pdfs\unittest_fotobook.mcfx.20250413S.pdf" />
+    <Content Include="tests\testTextBox\testTextBox.mcf" />
     <Content Include="tests\unittest_fotobook\unittest_fotobook.mcf" />
     <Content Include="tests\unittest_fotobook\unittest_fotobook.mcf.pdf" />
     <Content Include="tests\unittest_fotobook\unittest_fotobook.mcfx" />
@@ -316,6 +324,8 @@
     <Compile Include="tests\testMcfxExtraction\test_McfxExtraction.py" />
     <Compile Include="tests\testPageNumbers\test_pagenumbers.py" />
     <Compile Include="tests\testTextArt\test_textart.py" />
+    <Compile Include="tests\testTextBox\test_textBox.py" />
+    <Compile Include="tests\testTextWrapVAlignBorder\test_textwrapvalignborder.py" />
     <Compile Include="tests\unittest_fotobook\test_simpleBook.py" />
     <Compile Include="tests\test_webp_loading\test_webp_loading.py" />
     <Compile Include="testutils.py">
@@ -382,6 +392,11 @@
     <Folder Include="tests\testTextArt\" />
     <Folder Include="tests\testTextArt\previous_result_pdfs\" />
     <Folder Include="tests\testTextArt\test_textart_mcf-Dateien\" />
+    <Folder Include="tests\testTextBox\" />
+    <Folder Include="tests\testTextBox\previous_result_pdfs\" />
+    <Folder Include="tests\testTextWrapVAlignBorder\" />
+    <Folder Include="tests\testTextWrapVAlignBorder\previous_result_pdfs\" />
+    <Folder Include="tests\testTextWrapVAlignBorder\test_textwrapvalignborder_mcf-Dateien\" />
     <Folder Include="tests\test_webp_loading\" />
     <Folder Include="tests\unittest_fotobook\" />
     <Folder Include="tests\Resources\" />

cewe2pdf.py

@@ -1,27 +1,31 @@
 import logging
 
+def getUncommentedConfigItem(configSection, itemName, defaultValue):
+    return str(configSection.get(itemName, defaultValue)).split('#', 1)[0].rstrip()
+
 def getConfigurationInt(configSection, itemName, defaultValue, minimumValue):
     returnValue = minimumValue
     if configSection is not None:
         try:
             # eg getConfigurationInt(defaultConfigSection, 'pdfImageResolution', '150', 100)
-            returnValue = int(configSection.get(itemName, defaultValue))
+            returnValue = int(getUncommentedConfigItem(configSection, itemName, defaultValue))
         except ValueError:
-            logging.error(f'Invalid configuration value supplied for {itemName}')
+            logging.error(f'Invalid int configuration value supplied for {itemName}')
             returnValue = int(defaultValue)
         if returnValue < minimumValue:
             logging.error(f'Configuration value supplied for {itemName} is less than {minimumValue}, using {minimumValue}')
             returnValue = minimumValue
     return returnValue
 
+
 def getConfigurationFloat(configSection, itemName, defaultValue, minimumValue):
     returnValue = minimumValue
     if configSection is not None:
         try:
             # eg getConfigurationFloat(defaultConfigSection, 'pdfImageResolution', '1.15', 1.0)
-            returnValue = float(configSection.get(itemName, defaultValue))
+            returnValue = float(getUncommentedConfigItem(configSection, itemName, defaultValue))
         except ValueError:
-            logging.error(f'Invalid configuration value supplied for {itemName}')
+            logging.error(f'Invalid float configuration value supplied for {itemName}')
             returnValue = float(defaultValue)
         if returnValue < minimumValue:
             logging.error(f'Configuration value supplied for {itemName} is less than {minimumValue}, using {minimumValue}')
@@ -33,9 +37,9 @@ def getConfigurationBool(configSection, itemName, defaultValue):
     if configSection is not None:
         try:
             # eg getConfigurationBool(defaultConfigSection, 'insideCoverWhite', 'False')
-            bv = configSection.get(itemName, defaultValue)
+            bv = getUncommentedConfigItem(configSection, itemName, defaultValue)
             returnValue = bv.lower() == "true"
         except ValueError:
-            logging.error(f'Invalid configuration value supplied for {itemName}')
+            logging.error(f'Invalid bool configuration value supplied for {itemName}')
             returnValue = bool(defaultValue)
     return returnValue

cewe2pdf.pyproj

@@ -301,7 +301,7 @@ def registerFontFamilies(fontFamilies, explicitlyRegisteredFamilyNames):
     "Calibri": "Liberation Sans Narrow",
     "CalligraphScript": "Dancing Script",
     "CEWE Head": "Liberation Sans",
-    "FranklinGothic": "Liberation Sans Narrow",
+    "FranklinGothic": "Archivo Narrow",
     "Pecita": "Dancing Script",
     "Stafford": "Liberation Sans Narrow",
     "Balloon Caps": "Liberation Sans Narrow",

configUtils.py

@@ -1,8 +1,8 @@
+import logging
+import re
 import cv2
 import fitz  # PyMuPDF
 import numpy as np
-import logging
-import re
 from reportlab.lib.units import mm
 from reportlab.pdfgen import canvas
 from PIL import Image
@@ -128,7 +128,7 @@ def SaveIndexPdf(self, outputFileName, albumTitle, pagesize):
 
     def SaveIndexPng(self, indexPdfFileName):
         if not self.indexing:
-            return
+            return None
         doc = fitz.open(indexPdfFileName)
         image = Index._convert_to_opencv(doc.load_page(0), dpi=150)
         transparent_image = Index._make_white_transparent(image)
@@ -225,7 +225,7 @@ def MergeAlbumAndIndexPng(self, albumPdfFileName, indexPngFileName):
                 for line in lines:
                     if pattern.search(line):  # Check regex against each line separately
                         markerFound = True
-                        markerRect = fitz.Rect(x0, y0, x1, y1)
+                        # markerRect = fitz.Rect(x0, y0, x1, y1)
                         # full block rect, this needs refining if the marker is to be removed
             if not markerFound:
                 continue

fontHandling.py

@@ -188,14 +188,14 @@ def horizontalPageNumberAdjustment(pnp, pageNumberingInfo, sideWidth, frameWidth
     if productStyle == ProductStyle.AlbumSingleSide:
         if pnp == PageNumberPosition.RIGHT:
             return sideWidth - pageNumberingInfo.horizontalMargin - frameWidth
-        elif pnp == PageNumberPosition.LEFT:
+        if pnp == PageNumberPosition.LEFT:
             return pageNumberingInfo.horizontalMargin
 
     # all other cases drop through here to original outer edge page number position
     if oddpage:
         return sideWidth - pageNumberingInfo.horizontalMargin - frameWidth
-    else:
-        return pageNumberingInfo.horizontalMargin
+
+    return pageNumberingInfo.horizontalMargin
 
 
 def getPageNumberXy(pnp, pageNumberingInfo, pdf, frameWidth, frameHeight, productStyle, oddpage):