From 5c28dd5cbab18b76a0097eab07c0e712dd570ecb Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Sun, 29 Apr 2018 20:38:45 +0100
Subject: [PATCH] Allow including images from `img` directory

---
 main.tex                |   2 ++
 packages.tex            |   1 +
 test/img/test-image.png | Bin 0 -> 801 bytes
 test/main.md            |   3 +++
 variables.lua           |  29 ++++++++++++++++++-----------
 5 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 test/img/test-image.png

diff --git a/main.tex b/main.tex
index 3345e3e..55f5b12 100644
--- a/main.tex
+++ b/main.tex
@@ -1,6 +1,8 @@
 \documentclass[12pt,titlepage,a4paper,twoside]{article}
     \include{packages}
 
+    \graphicspath{{$inputDir$/img/}}
+
     \renewcommand{\thesection}{}
     \renewcommand{\thesubsection}{\arabic{section}.\arabic{subsection}}
     \makeatletter
diff --git a/packages.tex b/packages.tex
index ee8475b..8b1436c 100644
--- a/packages.tex
+++ b/packages.tex
@@ -9,6 +9,7 @@
 \usepackage{url}
 \usepackage{ellipsis}
 \usepackage[margin=1in,includefoot]{geometry}
+\usepackage{graphicx}
 
 \hypersetup{
     hidelinks=true
diff --git a/test/img/test-image.png b/test/img/test-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..05e2bc8b733aa72867675a384c2fbc842a789ae8
GIT binary patch
literal 801
zcmeAS@N?(olHy`uVBq!ia0vp^8-TcpgAGVNV|Drgq}Y<Y-CY>|gW!U_%O?XxI14-?
ziy0WWg+Z8+Vb&Z8pdfpRr>`sfLsl*UORFUNU#}S$nAUl^IEGZ*dVAeAJ2+6{z{lsy
zJcD0$2V`oOPA=QDAfP}%Muw#{oIU(6L)Yqf2OZUOyEHlcN()z)eBkwVeY0T2jia}^
zx}0aL^?r}DZ}2);w4(KX{#jN3b7%k0xs#F_Ic;K4w$`Fb)0Z9VXEz&uDNvkrdxzY`
znf_Lfo;(V;v#-?RqtmI59pZv-mjp{GAAfW%;nvm=rZPiD<pco(4hhEQ2FC*m2`oHJ
zY(S<UP=uuiEFxe47I8cP6ah)%RL;ZX1~dS>a;RCzro)s&twu4uE<83mfBD=Cr<7-9
zem_}d-Tg02{pZ=Nt)EVOHhS5!rz7I_<+&BAsVQ%D{=U2s+xu@{)vbp9IXh;S39fBD
zG3)o_a}p=2AN_oF_euPTt&K-3g5o``9)G=Y(88)z@nz2%jievP{;n{&EEhL@y-fe~
z>3V8*jn{8=GM`h<UUv8GRi*BIy=R{=UVl}Y61c>^u{tZ0S+D!WStYGb{)b+BwSQGz
z{x_?F?bv(^lwkY6HY@e9>n%?E@a=n^e3=<+XlVHHyz;A5({E<{xxW|htK21$KVSFn
z*RN6MD|*U%m+XzTZ+m=t@y&>n_RFM$#3q(TdETqqU?lZ>mz%QEqsx!K&d5Cf_v5bj
zKZ|O#r){^@mzK2*c=ttbR-VuCouAXoYs~F4&K&hg&O2^@{P~~SJz3}9of0lwV<wrr
y^`!3l-xne~%I8-03skUyViPUyh>47{h4D2`t?sAF9@+sDGlQqApUXO@geCwu(nGcY

literal 0
HcmV?d00001

diff --git a/test/main.md b/test/main.md
index 460f471..31dfacb 100644
--- a/test/main.md
+++ b/test/main.md
@@ -8,3 +8,6 @@ subtitle: Test Document
 \lipsum[3-15]
 
 Foo is equal to \$foo\$.
+Input directory is at \$inputDir\$.
+
+\includegraphics[width=\textwidth]{test-image}
diff --git a/variables.lua b/variables.lua
index 77db379..871eac5 100644
--- a/variables.lua
+++ b/variables.lua
@@ -2,16 +2,23 @@ local vars = {}
 
 local additionalChars = {".", ",", "!", ":", ";"}
 
-local function getVars(meta)
+
+local function setVariable(meta, key, val)
+    local var_key = "$" .. key .. "$"
+    vars[var_key] = val
+    meta[key] = val
+    for _, char in pairs(additionalChars) do
+        vars[var_key .. char] = val .. char
+        vars[char .. var_key] = char .. val
+        meta[var_key .. char] = val .. char
+        meta[char .. var_key] = char .. val
+    end
+end
+
+local function getVarsFromMeta(meta)
     for k, v in pairs(meta) do
         if v.t == 'MetaInlines' then
-            local var_key = "$" .. k .. "$"
-            local var_value = table.unpack(v)["c"]
-            vars[var_key] = var_value
-            for _, char in pairs(additionalChars) do
-                vars[var_key .. char] = var_value .. char
-                vars[char .. var_key] = char .. var_value
-            end
+            setVariable(meta, k, table.unpack(v)["c"])
         end
     end
     return meta
@@ -20,9 +27,9 @@ end
 return {
     {
         Meta = function (meta)
-            meta = getVars(meta)
-            meta['outputFile'] = os.getenv("OUTPUT_FILE")
-            meta['inputDir'] = os.getenv("INPUT_DIR")
+            setVariable(meta, 'outputFile', os.getenv("OUTPUT_FILE"))
+            setVariable(meta, 'inputDir', os.getenv("INPUT_DIR"))
+            return getVarsFromMeta(meta)
         end
     },
     {