Commit b069aad5 authored by Miguel Angel Reina Ortega's avatar Miguel Angel Reina Ortega
Browse files

Get right path for soffice depending on the platform

parent 13955f93

config.ini

+4 −2
Original line number Diff line number Diff line
@@ -200,5 +200,7 @@ f0f3 = 266c743b2d3e 
[media]

; The following configurations specifies the cli command to convert a single .emf file to the.png and .svg image formats.

; If no conversion should or can be done, remove or comment the lines.

emfConverterPng = /usr/bin/soffice --headless --convert-to png "{infile}" --outdir "{outdir}"

emfConverterSvg = /usr/bin/soffice --headless --convert-to svg "{infile}" --outdir "{outdir}"
 
emfConverterPngMac = /Applications/LibreOffice.app/Contents/MacOS/soffice --headless --convert-to png "{infile}" --outdir "{outdir}"

emfConverterSvgMac = /Applications/LibreOffice.app/Contents/MacOS/soffice --headless --convert-to svg "{infile}" --outdir "{outdir}"

emfConverterPngLinux = /usr/bin/soffice --headless --convert-to png "{infile}" --outdir "{outdir}"

emfConverterSvgLinux = /usr/bin/soffice --headless --convert-to svg "{infile}" --outdir "{outdir}"

spec2md.py

+8 −2
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ from rich import inspect 
import configparser, zipfile

from lxml import etree as ET



from platform import system as platformSystem



from gridTable import markdownToGrid, isGridTableStart, handleMultiLineGridTable, \

	formatGridTable, colspanMarker, rowspanMarker
@@ -232,8 +234,12 @@ class DocumentConfiguration(object): 
				self.characters[int(c, 16)] = binascii.unhexlify(config.get('characters', c)).decode('utf-8')	# type: ignore [attr-defined]



		# Media & Converter

		self.emfConverterPng = config.get('media', 'emfConverterPng', fallback = None)

		self.emfConverterSvg = config.get('media', 'emfConverterSvg', fallback = None)

		if platformSystem() == 'Darwin':

			self.emfConverterPng = config.get('media', 'emfConverterPngMac', fallback = None)

			self.emfConverterSvg = config.get('media', 'emfConverterSvgMac', fallback = None)

		elif platformSystem() == 'Linux':

			self.emfConverterPng = config.get('media', 'emfConverterPngLinux', fallback = None)

			self.emfConverterSvg = config.get('media', 'emfConverterSvgLinux', fallback = None)





def richString(text:str) -> str: