From 09030736c52569a15b4b0491815e8b37fafb969e Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 8 Dec 2023 11:31:04 +0100 Subject: [PATCH] Switch back to listings for code snippets --- .dir-locals.el | 19 +++++++++++++++++-- .gitignore | 2 -- book.org | 3 ++- build.el | 18 +++++++++++++++++- flake.nix | 8 ++------ 5 files changed, 38 insertions(+), 12 deletions(-) diff --git a/.dir-locals.el b/.dir-locals.el index 3baa4fa..fc7a611 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -5,11 +5,26 @@ ("\\section{%s}" . "\\addsec{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}")))) - (org-latex-src-block-backend . minted) + (org-latex-src-block-backend . listings) + (org-latex-listings-options . (("backgroundcolor" "\\color{white}") + ("commentstyle" "\\color{green}") + ("keywordstyle" "\\color{magenta}") + ("numberstyle" "\\color{gray}") + ("stringstyle" "\\color{purple}") + ("basicstyle" "\\ttfamily") + ("breakatwhitespace" "false") + ("breaklines" "true") + ("captionpos" "b") + ("keepspaces" "true") + ("numbers" "left") + ("numbersep" "5pt") + ("showspaces" "false") + ("showstringspaces" "false") + ("showtabs" "false") + ("tabsize" "2"))) (org-latex-prefer-user-labels . t) (org-html-prefer-user-labels . t) (org-latex-toc-command . "\\frontmatter\n\\addchap{Table of Contents}\n\\label{chap:toc}\n\\listoftoc*{toc}\n\n") - (org-latex-pdf-process . ("latexmk -f -pdf -%latex -interaction=nonstopmode -shell-escape -output-directory=%o %f")) (fill-column . 200))) (org-mode . ((eval . (progn (visual-line-mode) (org-toggle-link-display) diff --git a/.gitignore b/.gitignore index b646171..551a40b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ book.pdf book.tex diff.pdf -_minted-book -_minted-diff diff --git a/book.org b/book.org index 153b3ea..3cabb7a 100644 --- a/book.org +++ b/book.org @@ -5,7 +5,7 @@ #+LATEX_CLASS_OPTIONS: [paper=240mm:170mm,parskip] #+LATEX_COMPILER: lualatex #+LATEX_HEADER: \usepackage[inline]{enumitem} -#+LATEX_HEADER: \usepackage{minted} +#+LATEX_HEADER: \usepackage{listings} #+LATEX_HEADER: \usepackage{color} #+LATEX_HEADER: \usepackage{url} #+LATEX_HEADER: \usepackage[type=report]{ugent2016-title} @@ -1085,6 +1085,7 @@ The API for the R judge was designed to follow the visual structure of the feedb #+CAPTION: Sample evaluation code for a simple R exercise. #+NAME: lst:technicalrsample +#+ATTR_LATEX: :float t #+BEGIN_SRC r context({ testcase('The correct method was used', { diff --git a/build.el b/build.el index 26962d0..7bf793c 100644 --- a/build.el +++ b/build.el @@ -14,7 +14,23 @@ ("\\section{%s}" . "\\addsec{%s}") ("\\subsection{%s}" . "\\subsection*{%s}") ("\\subsubsection{%s}" . "\\subsubsection*{%s}"))) - org-latex-src-block-backend 'minted + org-latex-src-block-backend 'listings + org-latex-listings-options '(("backgroundcolor" "\\color{white}") + ("commentstyle" "\\color{green}") + ("keywordstyle" "\\color{magenta}") + ("numberstyle" "\\color{gray}") + ("stringstyle" "\\color{purple}") + ("basicstyle" "\\ttfamily") + ("breakatwhitespace" "false") + ("breaklines" "true") + ("captionpos" "b") + ("keepspaces" "true") + ("numbers" "left") + ("numbersep" "5pt") + ("showspaces" "false") + ("showstringspaces" "false") + ("showtabs" "false") + ("tabsize" "2")) org-latex-prefer-user-labels t org-latex-toc-command "\\frontmatter\n\\addchap{Table of Contents}\n\\label{chap:toc}\n\\listoftoc*{toc}\n\n") diff --git a/flake.nix b/flake.nix index 74204f7..7f0d446 100644 --- a/flake.nix +++ b/flake.nix @@ -27,9 +27,6 @@ full-texlive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-full; inherit ugent2016; }; build-diffed = pkgs.writeShellScriptBin "build-diffed" '' set -E - - export PATH=${pkgs.python311Packages.pygments}/bin:$PATH - atexit() { git worktree remove -f .sent rm book.tex sent.tex diff.tex -f @@ -44,8 +41,8 @@ popd mkdir build ${full-texlive}/bin/latexdiff --math-markup=whole -t CFONT sent.tex book.tex > diff.tex - ${full-texlive}/bin/latexmk -f -pdf -lualatex -shell-escape -interaction=nonstopmode -output-directory=build book.tex - ${full-texlive}/bin/latexmk -f -pdf -lualatex -shell-escape -interaction=nonstopmode -output-directory=build diff.tex + ${full-texlive}/bin/latexmk -f -pdf -lualatex -interaction=nonstopmode -output-directory=build book.tex + ${full-texlive}/bin/latexmk -f -pdf -lualatex -interaction=nonstopmode -output-directory=build diff.tex mv build/book.pdf build/diff.pdf . ''; ugent2016 = pkgs.stdenvNoCC.mkDerivation (finalAttrs: { @@ -107,7 +104,6 @@ packages = [ full-texlive pkgs.nixpkgs-fmt - pkgs.python310Packages.pygments ]; commands = [ {