Skip to content

Commit

Permalink
Merge pull request #4 from henze-research-group/remove-acronyms-from-…
Browse files Browse the repository at this point in the history
…contents

Fix shell escape and remove acronyms from content page
  • Loading branch information
nllong authored Apr 9, 2024
2 parents 4b9397c + 1c84308 commit 120657e
Show file tree
Hide file tree
Showing 9 changed files with 1,386 additions and 1,373 deletions.
1 change: 0 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
"name": "makeglossaries",
"command": "makeglossaries",
"args": [
"--shell-escape",
"%DOCFILE%"
],
"env": {}
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ One catch is that to see the acronyms the `makeglossaries` command needs to be i
"name": "makeglossaries",
"command": "makeglossaries",
"args": [
"--shell-escape",
"%DOCFILE%"
],
"env": {}
Expand Down
62 changes: 31 additions & 31 deletions listings-modelica.cfg.tex
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@

\lstdefinelanguage{modelica}
{
morekeywords=[1]{
algorithm,and,annotation,as,assert,block,break,case,class,connect,connector,
constant,constrainedby,der,discrete,each,else,elseif,elsewhen,encapsulated,
end,enumeration,equality,equation,expandable,extends,external,failure,final,
flow,for,function,guard,if,import,in,initial,inner,input,List,local,loop,
match,matchcontinue,model,not,operator,Option,or,outer,output,package,parameter,
partial,protected,public,record,redeclare,replaceable,return,stream,
subtypeof,then,Tuple,type,uniontype,when,while},
morekeywords=[2]{true, false},
% Do not make true,false keywords because fn(true,x, false ) shows up as fn(true,x, *false*)
morekeywords=[3]{optimization,constraint}, % Optimica keywords
morekeywords=[4]{objective,startTime,finalTime,initialGuess},
sensitive=true,
comment=[l]//,
morecomment=[s]{/*}{*/},
alsodigit={.,-},
morestring=[b]',
morestring=[b]",
morekeywords=[1]{
algorithm,and,annotation,as,assert,block,break,case,class,connect,connector,
constant,constrainedby,der,discrete,each,else,elseif,elsewhen,encapsulated,
end,enumeration,equality,equation,expandable,extends,external,failure,final,
flow,for,function,guard,if,import,in,initial,inner,input,List,local,loop,
match,matchcontinue,model,not,operator,Option,or,outer,output,package,parameter,
partial,protected,public,record,redeclare,replaceable,return,stream,
subtypeof,then,Tuple,type,uniontype,when,while},
morekeywords=[2]{true, false},
% Do not make true,false keywords because fn(true,x, false ) shows up as fn(true,x, *false*)
morekeywords=[3]{optimization,constraint}, % Optimica keywords
morekeywords=[4]{objective,startTime,finalTime,initialGuess},
sensitive=true,
comment=[l]//,
morecomment=[s]{/*}{*/},
alsodigit={.,-},
morestring=[b]',
morestring=[b]",
}[keywords,comments,strings]

\definecolor{keywordcolor1}{rgb}{0,0,.4}
Expand All @@ -47,19 +47,19 @@
% \definecolor{listingbgcolor}{rgb}{0.95,0.95,0.95}

\lstset{
breaklines=true,
language=modelica,
basicstyle=\ttfamily,
keywordstyle=[1]\color{keywordcolor1}\bfseries,
keywordstyle=[2]\color{keywordcolor2},
keywordstyle=[3]\color{keywordcolor3}\bfseries,
keywordstyle=[4]\color{keywordcolor4},
stringstyle=\color{stringcolor},
% backgroundcolor=\color{listingbgcolor},
framexleftmargin=5pt,
xleftmargin=5pt,
xrightmargin=5pt,
showstringspaces=false
breaklines=true,
language=modelica,
basicstyle=\ttfamily,
keywordstyle=[1]\color{keywordcolor1}\bfseries,
keywordstyle=[2]\color{keywordcolor2},
keywordstyle=[3]\color{keywordcolor3}\bfseries,
keywordstyle=[4]\color{keywordcolor4},
stringstyle=\color{stringcolor},
% backgroundcolor=\color{listingbgcolor},
framexleftmargin=5pt,
xleftmargin=5pt,
xrightmargin=5pt,
showstringspaces=false
}

\newcommand{\code}[1]{\lstinline|#1|}
Expand Down
Binary file modified main-cu-phd-thesis.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion main-cu-phd-thesis.tex
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
\usepackage{subfiles}
\usepackage{subcaption}
\usepackage[export]{adjustbox} % allow margin definition in tables (center images)
\usepackage[acronym,toc,nomain]{glossaries}
\usepackage[acronym,nomain]{glossaries}
\loadglsentries{acronyms}
\makeglossaries % for acronyms
\renewcommand*{\glspostdescription}{} % Removes dots at the end of each entry.
Expand Down
Binary file modified main-cu-prospectus.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions main-cu-prospectus.tex
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
colorlinks = true, %Colours links instead of ugly boxes
urlcolor = blue, %Colour for external hyperlinks
linkcolor = blue, %Colour of internal links
citecolor = blue %Colour of citations
citecolor = blue %Colour of citations
}

% custom added
\usepackage{subfiles}
\usepackage{subcaption}
\usepackage[export]{adjustbox} % allow margin definition in tables (center images)
\usepackage[acronym,toc,nomain]{glossaries}
\usepackage[acronym,nomain]{glossaries}
\loadglsentries{acronyms}
\makeglossaries % for acronyms
\renewcommand*{\glspostdescription}{} % Removes dots at the end of each entry.
Expand Down
Loading

0 comments on commit 120657e

Please sign in to comment.