Skip to content

Fix make draft and watermark #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huhong789 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix make draft and watermark #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0592ad5
Fix make draft and watermark
huhong789 Nov 21, 2020
08eed40
Merge branch 'tsgates:master' into master
huhong789 Mar 4, 2022
e33756b
fix the unbalanced reference due to minted
huhong789 Jul 9, 2022
ad8c902
update .gitignore
huhong789 Jan 16, 2025
ac1a1b1
fix some errors/warnings
huhong789 Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,19 @@
/*.out
/*.toc
/*.pdf
/bibexport.bib
/die.tar.gz
/rev.tex
*.synctex.gz
/abstract.txt
/code/*.tex
!/code/fmt.tex
!/figs/*.pdf
!/figs/*.eps
!/data/*.pdf
!/data/*.eps
!/fig/*.pdf
!/fig/*.eps
/data/*.pdf
/data/*.eps
/data/*.tex
.latexrun.db
/_minted-p/
/p.synctex.gz
/auto
/Users
.vscode/
*.swp
diff.tex
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ data/%.pdf: data/%.py ## generate plot

draft: $(DEPS) ## generate pdf with a draft info
echo -e '\\newcommand*{\\DRAFT}{}' >> rev.tex
@TEXINPUTS="sty:" bin/latexrun $(BTEX) $(MAIN)
@TEXINPUTS="sty:" bin/latexrun $(LTEX) $(BTEX) $(MAIN)

watermark: $(DEPS) ## generate pdf with a watermark
echo -e '\\usepackage[firstpage]{draftwatermark}' >> rev.tex
@TEXINPUTS="sty:" bin/latexrun $(BTEX) $(MAIN)
@TEXINPUTS="sty:" bin/latexrun $(LTEX) $(BTEX) $(MAIN)

spell: ## run a spell check
@for i in *.tex fig/*.tex; do bin/aspell.sh tex $$i; done
Expand Down
6 changes: 3 additions & 3 deletions bin/latexrun
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ class LaTeXFilter:
return self.__runaway()
if lookingatre(r'(Overfull|Underfull|Loose|Tight) \\[hv]box \('):
return self.__bad_box()
if lookingatre('(Package |Class |LaTeX |pdfTeX )?(\w+ )?warning: ', re.I):
if lookingatre(r'(Package |Class |LaTeX |pdfTeX )?(\w+ )?warning: ', re.I):
return self.__generic_warning()
if lookingatre('No file .*\\.tex\\.$', re.M):
# This happens with \includes of missing files. For
Expand Down Expand Up @@ -1357,7 +1357,7 @@ class LaTeXFilter:
stack = []
while self.__avail:
m1 = self.__lookingatre(r'<([a-z ]+|\*|read [^ >]*)> |\\.*(->|...)')
m2 = self.__lookingatre('l\.[0-9]+ ')
m2 = self.__lookingatre(r'l\.[0-9]+ ')
if m1:
found_context = True
pre = self.__consume_line().rstrip('\n')
Expand Down Expand Up @@ -1840,7 +1840,7 @@ class BibTeXFilter:
return ('warning', None, None, m.group(1))

if match('^.*> ERROR - (.*)$'):
m2 = re.match("BibTeX subsystem: (.*?), line (\d+), (.*)$", m.group(1))
m2 = re.match(r"BibTeX subsystem: (.*?), line (\d+), (.*)$", m.group(1))
if m2:
return ('error', m2.group(1), m2.group(2), m2.group(3))
return ('error', None, None, m.group(1))
Expand Down
2 changes: 1 addition & 1 deletion p.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
\usepackage[square,comma,numbers,sort&compress]{natbib}

% common packages
\include{pkgs}
\input{pkgs}

\newcommand{\sys}{\mbox{\textsc{Die}}\xspace}

Expand Down
10 changes: 7 additions & 3 deletions pkgs.tex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

\usepackage[hyphens]{url}
\usepackage[breaklinks,colorlinks]{hyperref}
\usepackage[usenames,dvipsnames]{xcolor}
\usepackage[dvipsnames]{xcolor}
\hypersetup{citecolor=blue,linkcolor=blue}
\usepackage{amsmath,amsopn,amssymb}
\usepackage{subfigure}
%\usepackage{subfigure}
\usepackage{endnotes,microtype,xspace,graphicx,fancyvrb,multirow}
\usepackage{booktabs}
\usepackage{array,underscore,relsize}
\usepackage[T1]{fontenc}
\usepackage{times}
\usepackage{fancyhdr,lastpage}
\usepackage{enumitem}
\usepackage[labelfont=bf,font=small,skip=5pt]{caption}
%\usepackage[labelfont=bf,font=small,skip=5pt]{caption}
\pagestyle{fancy}
\fancyhf{}
\renewcommand{\headrulewidth}{0pt}
Expand All @@ -24,6 +24,10 @@
\usepackage{siunitx}

% pseudo code
\makeatletter
\@namedef{ver@lineno.sty}{9999/12/31}
\@namedef{opt@lineno.sty}{}
\makeatother
\usepackage{minted}

% balance bibliography
Expand Down