diff --git a/Dockerfile b/Dockerfile index cfd4276..ed9d481 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM pandoc/latex:3.3.0 +FROM pandoc/typst:3.7.0 ARG ENVIRONMENT=production diff --git a/app/main.py b/app/main.py index cbef4b2..3256dca 100644 --- a/app/main.py +++ b/app/main.py @@ -39,10 +39,7 @@ async def convert(self): match self.doc_type: case "pdf": cmd = f"pandoc --from markdown --to pdf --standalone --embed-resources --no-highlight \ - -V 'mainfont:DejaVuSerif' \ - -V 'sansfont:DejaVuSans' \ - -V 'monofont:DejaVuSansMono' \ - --pdf-engine=lualatex {MD_FILE_NAME} -o {output_file_name}" + --pdf-engine=typst {MD_FILE_NAME} -o {output_file_name}" case "tex": cmd = f"pandoc --from markdown --to latex --standalone --embed-resources --no-highlight {MD_FILE_NAME} -o {output_file_name}" case _: diff --git a/tests/output_reference.docx b/tests/output_reference.docx index d10d143..f546bc0 100644 Binary files a/tests/output_reference.docx and b/tests/output_reference.docx differ diff --git a/tests/output_reference.pdf b/tests/output_reference.pdf index c56da17..c211b94 100644 Binary files a/tests/output_reference.pdf and b/tests/output_reference.pdf differ diff --git a/tests/output_reference.tex b/tests/output_reference.tex index aceec2b..6e94991 100644 --- a/tests/output_reference.tex +++ b/tests/output_reference.tex @@ -1,10 +1,11 @@ % Options for packages loaded elsewhere \PassOptionsToPackage{unicode}{hyperref} \PassOptionsToPackage{hyphens}{url} -% \documentclass[ ]{article} +\usepackage{xcolor} \usepackage{amsmath,amssymb} +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering \usepackage{iftex} \ifPDFTeX \usepackage[T1]{fontenc} @@ -35,11 +36,9 @@ }{% if KOMA class \KOMAoptions{parskip=half}} \makeatother -\usepackage{xcolor} \setlength{\emergencystretch}{3em} % prevent overfull lines \providecommand{\tightlist}{% \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} -\setcounter{secnumdepth}{-\maxdimen} % remove section numbering \usepackage{bookmark} \IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available \urlstyle{same} diff --git a/tests/output_reference_0.docx b/tests/output_reference_0.docx index 19d56fa..33f3b24 100644 Binary files a/tests/output_reference_0.docx and b/tests/output_reference_0.docx differ diff --git a/tests/output_reference_1.docx b/tests/output_reference_1.docx index 043514d..d04292c 100644 Binary files a/tests/output_reference_1.docx and b/tests/output_reference_1.docx differ diff --git a/tests/output_reference_10.docx b/tests/output_reference_10.docx index 7817e85..320890e 100644 Binary files a/tests/output_reference_10.docx and b/tests/output_reference_10.docx differ diff --git a/tests/output_reference_11.docx b/tests/output_reference_11.docx index d05db05..fa4f266 100644 Binary files a/tests/output_reference_11.docx and b/tests/output_reference_11.docx differ diff --git a/tests/output_reference_12.docx b/tests/output_reference_12.docx index 3a25ac0..77b0d46 100644 Binary files a/tests/output_reference_12.docx and b/tests/output_reference_12.docx differ diff --git a/tests/output_reference_13.docx b/tests/output_reference_13.docx index 199812d..e775535 100644 Binary files a/tests/output_reference_13.docx and b/tests/output_reference_13.docx differ diff --git a/tests/output_reference_14.docx b/tests/output_reference_14.docx index f3aadc3..5f4f437 100644 Binary files a/tests/output_reference_14.docx and b/tests/output_reference_14.docx differ diff --git a/tests/output_reference_15.docx b/tests/output_reference_15.docx index 9f58f9c..b4e929e 100644 Binary files a/tests/output_reference_15.docx and b/tests/output_reference_15.docx differ diff --git a/tests/output_reference_16.docx b/tests/output_reference_16.docx index e8946d9..5e5522c 100644 Binary files a/tests/output_reference_16.docx and b/tests/output_reference_16.docx differ diff --git a/tests/output_reference_17.docx b/tests/output_reference_17.docx index 99c0fd0..b97c7c1 100644 Binary files a/tests/output_reference_17.docx and b/tests/output_reference_17.docx differ diff --git a/tests/output_reference_18.docx b/tests/output_reference_18.docx index 74581a3..24a1b12 100644 Binary files a/tests/output_reference_18.docx and b/tests/output_reference_18.docx differ diff --git a/tests/output_reference_19.docx b/tests/output_reference_19.docx index aadfdfb..525a018 100644 Binary files a/tests/output_reference_19.docx and b/tests/output_reference_19.docx differ diff --git a/tests/output_reference_2.docx b/tests/output_reference_2.docx index dd6e95f..8e76096 100644 Binary files a/tests/output_reference_2.docx and b/tests/output_reference_2.docx differ diff --git a/tests/output_reference_3.docx b/tests/output_reference_3.docx index 5aab057..039d576 100644 Binary files a/tests/output_reference_3.docx and b/tests/output_reference_3.docx differ diff --git a/tests/output_reference_4.docx b/tests/output_reference_4.docx index a81183f..d0d66ee 100644 Binary files a/tests/output_reference_4.docx and b/tests/output_reference_4.docx differ diff --git a/tests/output_reference_5.docx b/tests/output_reference_5.docx index 187eab7..fd08600 100644 Binary files a/tests/output_reference_5.docx and b/tests/output_reference_5.docx differ diff --git a/tests/output_reference_6.docx b/tests/output_reference_6.docx index 0a8f85e..7148ea0 100644 Binary files a/tests/output_reference_6.docx and b/tests/output_reference_6.docx differ diff --git a/tests/output_reference_7.docx b/tests/output_reference_7.docx index 21131d1..92abb5b 100644 Binary files a/tests/output_reference_7.docx and b/tests/output_reference_7.docx differ diff --git a/tests/output_reference_8.docx b/tests/output_reference_8.docx index 6de03fb..964ffa0 100644 Binary files a/tests/output_reference_8.docx and b/tests/output_reference_8.docx differ diff --git a/tests/output_reference_9.docx b/tests/output_reference_9.docx index fa06514..cba8888 100644 Binary files a/tests/output_reference_9.docx and b/tests/output_reference_9.docx differ