Port PDF generation to reportlab

doc/manual.xml

@@ -1396,24 +1396,16 @@
 		Bold-Italic).</para>
 
 		<para>Each font setting has two parts: a 'Name' field and a 'File'
-		field. The 'Name' field is the Postscript name of the font and is
-		used by the PDF viewer application to recognize the font to use.
-		Some examples of the names that would go here are 'AndaleMono',
-		'CourierNewPSMT', and 'BitstreamVeraSansMono-Roman'. These names
-		are, in general, impossible for human beings to know for arbitrary
-		fonts. See the next paragraphs for ways around this.</para>
+		field. The 'Name' field is the internal Postscript name of the font and
+		is used by the PDF viewer application to recognize the font to use.
+		</para>
 
 		<para>The 'File' field is the filename of the TrueType font to
 		use. If you fill in this field, the font file is embedded in the
-		generated PDF files. If you leave this field empty but fill in the
-		'Name' field, the font file is not embedded in the PDF file, just
-		the 'Name' reference is used to indicate what font the PDF viewer
-		application should use.</para>
-
-		<para>There are many factors affecting whether you should embed a
-		font or not. Embedding a font makes it much more likely that the
-		PDF file will display properly on other people's computers and/or
-		print properly. However, it will also increase the size of the PDF
+		generated PDF files.
+		</para>
+
+		<para>Embedding a font  will increase the size of the PDF
 		files drastically, and not all fonts allow embedding in their
 		license terms.</para>
 

requirements.txt

@@ -1,4 +1,5 @@
 setuptools
 wxPython
 lxml
+reportlab
 pytest>=7.0

src/cfgdlg.py

@@ -1401,10 +1401,8 @@ def __init__(self, parent, id, cfg):
             "Leave all the fields empty to use the default PDF Courier\n"
             "fonts. This is highly recommended.\n"
             "\n"
-            "Otherwise, fill in the font name (e.g. AndaleMono) to use\n"
-            "the specified TrueType font. If you want to embed the font\n"
-            "in the generated PDF files, fill in the font filename as well.\n"
-            "\n"
+            "Otherwise, fill in the the font filename to use\n"
+            "the specified TrueType font. \n"
             "See the manual for the full details.\n"))
 
         hsizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -1449,12 +1447,22 @@ def __init__(self, parent, id, cfg):
 
     # check that all embedded TrueType fonts are OK
     def checkForErrors(self):
+        userHasSetFontNameWithoutFile = False
+
         for pfi in self.cfg.getPDFFontIds():
             pf = self.cfg.getPDFFont(pfi)
 
+            if pf.name and not pf.filename:
+                userHasSetFontNameWithoutFile = True
+
             if pf.filename:
                 self.getFontPostscriptName(pf.filename)
 
+        if userHasSetFontNameWithoutFile:
+            wx.MessageBox(
+                'You need to select a file when specifying a custom font. Select a file or remove the font name you provided.',
+                'Error', wx.OK, cfgFrame)
+
     def addEntry(self, name, descr, parent, sizer):
         sizer.Add(wx.StaticText(parent, -1, descr), 0,
                   wx.ALIGN_CENTER_VERTICAL)

src/characterreport.py

@@ -1,5 +1,3 @@
-from typing import AnyStr
-
 import misc
 import pdf
 import pml

src/dialoguechart.py

@@ -1,4 +1,4 @@
-from typing import List, AnyStr
+from typing import List
 
 import gutil
 import misc

src/gutil.py

@@ -1,5 +1,3 @@
-from typing import AnyStr
-
 import config
 from error import MiscError,TrelbyError
 import misc
@@ -84,7 +82,10 @@ def showTempPDF(pdfData: bytes, cfgGl: 'config.ConfigGlobal', mainFrame: wx.TopL
                                             suffix = ".pdf")
 
             try:
-                os.write(fd, pdfData)
+                if isinstance(pdfData, str):
+                    os.write(fd, pdfData)
+                else:
+                    os.write(fd, pdfData)
             finally:
                 os.close(fd)
 

src/locationreport.py

@@ -1,5 +1,3 @@
-from typing import AnyStr
-
 import misc
 import pdf
 import pml