From: Scott Worley Date: Sun, 31 Dec 2023 21:48:21 +0000 (-0800) Subject: Use raw strings for less escaping X-Git-Url: http://git.scottworley.com/paperdoorknob/commitdiff_plain/67612898f2efcbb985da8534e0cce124152601db?ds=sidebyside Use raw strings for less escaping --- diff --git a/glowfic.py b/glowfic.py index 8561cd7..bda6d19 100644 --- a/glowfic.py +++ b/glowfic.py @@ -114,7 +114,7 @@ def makeChunk(chunk_dom: Tag, image_store: ImageStore) -> Chunk: def renderIcon(icon_path: str | None, image_size: float) -> bytes | None: if icon_path is None: return None - return b'\\includegraphics[width=%fmm,height=%fmm,keepaspectratio]{%s}' % ( + return br'\includegraphics[width=%fmm,height=%fmm,keepaspectratio]{%s}' % ( image_size, image_size, icon_path.encode('UTF-8')) @@ -147,29 +147,29 @@ class BelowIconLayout(Layout): for x in [chunk.character, chunk.screen_name, chunk.author] if x is not None] - return b'''\\wrapstuffclear -\\begin{wrapstuff}[l] -\\fbox{ -\\begin{varwidth}{0.5\\textwidth} - \\smash{\\parbox[t][0pt]{0pt}{ - \\setlength{\\fboxrule}{0.2pt} - \\setlength{\\fboxsep}{0pt} - \\vspace{-3.4pt} - \\fbox{\\hspace{107mm}} - }\\\\*} - \\vspace{-1em} -\\begin{center} + return br'''\wrapstuffclear +\begin{wrapstuff}[l] +\fbox{ +\begin{varwidth}{0.5\textwidth} + \smash{\parbox[t][0pt]{0pt}{ + \setlength{\fboxrule}{0.2pt} + \setlength{\fboxsep}{0pt} + \vspace{-3.4pt} + \fbox{\hspace{107mm}} + }\\*} + \vspace{-1em} +\begin{center} %s -\\end{center} -\\end{varwidth} +\end{center} +\end{varwidth} } -\\end{wrapstuff} +\end{wrapstuff} -\\strut +\strut -\\noindent %s +\noindent %s ''' % ( - b'\\\\*'.join(meta), + br'\\*'.join(meta), self._texifier.texify(chunk.content)) @@ -189,20 +189,20 @@ class BesideIconLayout(Layout): # Why is \textwidth not the width of the text? # Why is the width of the text .765\textwidth? - return b'''\\noindent\\fbox{ + return br'''\noindent\fbox{ %s -\\parbox[b]{.765\\textwidth}{ -\\begin{center} +\parbox[b]{.765\textwidth}{ +\begin{center} %s -\\end{center} +\end{center} } -}\\\\* -\\vspace{-0.75em}\\\\* -\\noindent %s +}\\* +\vspace{-0.75em}\\* +\noindent %s -\\strut +\strut ''' % ( icon if icon else b'', - b'\\\\*'.join(self._texifier.texify(x) for x in meta if x is not None), + br'\\*'.join(self._texifier.texify(x) for x in meta if x is not None), self._texifier.texify(chunk.content)) diff --git a/paperdoorknob.py b/paperdoorknob.py index 72ec1a5..a19045c 100644 --- a/paperdoorknob.py +++ b/paperdoorknob.py @@ -22,20 +22,20 @@ def ilen(it: Iterable[Any]) -> int: def process(spec: Spec) -> None: - spec.texout.write(b'''\\documentclass{article} -\\usepackage{booktabs} -\\usepackage{graphicx} -\\usepackage{longtable} -\\usepackage{soul} -\\usepackage{varwidth} -\\usepackage{wrapstuff} + spec.texout.write(br'''\documentclass{article} +\usepackage{booktabs} +\usepackage{graphicx} +\usepackage{longtable} +\usepackage{soul} +\usepackage{varwidth} +\usepackage{wrapstuff} ''') if spec.geometry is not None: - spec.texout.write(b'\\usepackage[' + + spec.texout.write(br'\usepackage[' + spec.geometry.encode('UTF-8') + b']{geometry}\n') - spec.texout.write(b'''\\begin{document} -\\newcommand{\\href}[2]{#2\\footnote{\\detokenize{#1}}} + spec.texout.write(br'''\begin{document} +\newcommand{\href}[2]{#2\footnote{\detokenize{#1}}} ''') url = flatURL(spec.url) spec.log('Fetching HTML...\r')