OrgWiki/go-org-orgwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update chroma: v0.10.0 -> v2

Browse source
This commit is contained in:
Niklas Fasching 2022-05-30 17:16:31 +02:00
parent 2c87232bd4
commit 67951ec664
6 changed files with 113 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
blorg/testdata/public.md5 vendored
View file

@ -1,4 +1,4 @@
2ca8531fdbcfcae02959ba8c810dda76 testdata/public/about.html 8a40ba056a514e37926f908c65f76ffe testdata/public/about.html
b93d8331258932e6bb18d866329b5e4e testdata/public/another-post.html b93d8331258932e6bb18d866329b5e4e testdata/public/another-post.html
a4e5753838107f8cf44f8dfabc577c04 testdata/public/index.html a4e5753838107f8cf44f8dfabc577c04 testdata/public/index.html
6e770ea67bb154191530585cc60c8c2f testdata/public/some-post.html 6e770ea67bb154191530585cc60c8c2f testdata/public/some-post.html

176
blorg/testdata/public/about.html vendored
View file

@ -29,110 +29,110 @@
This site is generated from <a href="https://github.com/niklasfasching/go-org/tree/master/blorg/testdata/content">go-org/blorg/testdata/content</a> using the configuration in <a href="https://github.com/niklasfasching/go-org/blob/master/blorg/testdata/blorg.org">blorg.org</a></p> This site is generated from <a href="https://github.com/niklasfasching/go-org/tree/master/blorg/testdata/content">go-org/blorg/testdata/content</a> using the configuration in <a href="https://github.com/niklasfasching/go-org/blob/master/blorg/testdata/blorg.org">blorg.org</a></p>
<div class="src src-org"> <div class="src src-org">
<div class="highlight"> <div class="highlight">
<pre tabindex="0" style="background-color:#fff;"><code><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+AUTHOR</span><span style="color:#998;font-style:italic">: testdata</span> <pre tabindex="0" style="background-color:#fff;"><code><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+AUTHOR</span><span style="color:#998;font-style:italic;">: testdata</span>
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+TITLE</span><span style="color:#998;font-style:italic">: blorg</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+TITLE</span><span style="color:#998;font-style:italic;">: blorg</span>
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+BASE_URL</span><span style="color:#998;font-style:italic">: /go-org/blorg</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+BASE_URL</span><span style="color:#998;font-style:italic;">: /go-org/blorg</span>
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+OPTIONS</span><span style="color:#998;font-style:italic">: toc:nil title:nil</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+OPTIONS</span><span style="color:#998;font-style:italic;">: toc:nil title:nil</span>
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+CONTENT</span><span style="color:#998;font-style:italic">: ./content</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+CONTENT</span><span style="color:#998;font-style:italic;">: ./content</span>
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+PUBLIC</span><span style="color:#998;font-style:italic">: ./public</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+PUBLIC</span><span style="color:#998;font-style:italic;">: ./public</span>
</span></span><span style="display:flex;"><span> </span></span><span style="display:flex;"><span>
</span></span><span style="display:flex;"><span><span style="color:#999">*</span><span style="font-weight:bold"> templates</span> </span></span><span style="display:flex;"><span><span style="color:#999;">*</span><span style="font-weight:bold;"> templates</span>
</span></span><span style="display:flex;"><span><span style="color:#aaa">**</span> head </span></span><span style="display:flex;"><span><span style="color:#aaa;">**</span> head
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+name</span><span style="color:#998;font-style:italic">: head</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+name</span><span style="color:#998;font-style:italic;">: head</span>
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic">html</span><span style="color:#998;font-style:italic"> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic;">html</span><span style="color:#998;font-style:italic;">
</span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic"></span>&lt;<span style="color:#000080">head</span>&gt; </span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;"></span>&lt;<span style="color:#000080;">head</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">meta</span> <span style="color:#008080">charset</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;utf-8&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">meta</span> <span style="color:#008080;">charset</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;utf-8&#34;</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">meta</span> <span style="color:#008080">name</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;viewport&#34;</span> <span style="color:#008080">content</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;width=device-width, initial-scale=1&#34;</span> /&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">meta</span> <span style="color:#008080;">name</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;viewport&#34;</span> <span style="color:#008080;">content</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;width=device-width, initial-scale=1&#34;</span> /&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">link</span> <span style="color:#008080">rel</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;stylesheet&#34;</span> <span style="color:#008080">href</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;/go-org/blorg/style.css&#34;</span> <span style="color:#008080">type</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;text/css&#34;</span> /&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">link</span> <span style="color:#008080;">rel</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;stylesheet&#34;</span> <span style="color:#008080;">href</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;/go-org/blorg/style.css&#34;</span> <span style="color:#008080;">type</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;text/css&#34;</span> /&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">title</span>&gt;{{ .Title }}&lt;/<span style="color:#000080">title</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">title</span>&gt;{{ .Title }}&lt;/<span style="color:#000080;">title</span>&gt;
</span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080">head</span>&gt; </span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080;">head</span>&gt;
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+end_src</span> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+end_src</span>
</span></span><span style="display:flex;"><span><span style="color:#aaa">**</span> header </span></span><span style="display:flex;"><span><span style="color:#aaa;">**</span> header
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+name</span><span style="color:#998;font-style:italic">: header</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+name</span><span style="color:#998;font-style:italic;">: header</span>
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic">html</span><span style="color:#998;font-style:italic"> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic;">html</span><span style="color:#998;font-style:italic;">
</span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic"></span>&lt;<span style="color:#000080">header</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#39;header&#39;</span>&gt; </span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;"></span>&lt;<span style="color:#000080;">header</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#39;header&#39;</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">a</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;logo&#34;</span> <span style="color:#008080">href</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;/go-org/blorg&#34;</span>&gt;home&lt;/<span style="color:#000080">a</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">a</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;logo&#34;</span> <span style="color:#008080;">href</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;/go-org/blorg&#34;</span>&gt;home&lt;/<span style="color:#000080;">a</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">nav</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">nav</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">a</span> <span style="color:#008080">href</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;https://www.github.com/niklasfasching/go-org&#34;</span>&gt;github&lt;/<span style="color:#000080">a</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">a</span> <span style="color:#008080;">href</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;https://www.github.com/niklasfasching/go-org&#34;</span>&gt;github&lt;/<span style="color:#000080;">a</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">nav</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">nav</span>&gt;
</span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080">header</span>&gt; </span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080;">header</span>&gt;
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+end_src</span> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+end_src</span>
</span></span><span style="display:flex;"><span><span style="color:#aaa">**</span> item </span></span><span style="display:flex;"><span><span style="color:#aaa;">**</span> item
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+name</span><span style="color:#998;font-style:italic">: item</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+name</span><span style="color:#998;font-style:italic;">: item</span>
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic">html</span><span style="color:#998;font-style:italic"> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic;">html</span><span style="color:#998;font-style:italic;">
</span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic"></span><span style="color:#999;font-weight:bold;font-style:italic">&lt;!doctype html&gt;</span> </span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;"></span><span style="color:#999;font-weight:bold;font-style:italic;">&lt;!doctype html&gt;</span>
</span></span><span style="display:flex;"><span>&lt;<span style="color:#000080">html</span>&gt; </span></span><span style="display:flex;"><span>&lt;<span style="color:#000080;">html</span>&gt;
</span></span><span style="display:flex;"><span> {{ template &#34;head&#34; . }} </span></span><span style="display:flex;"><span> {{ template &#34;head&#34; . }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">body</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">body</span>&gt;
</span></span><span style="display:flex;"><span> {{ template &#34;header&#34; . }} </span></span><span style="display:flex;"><span> {{ template &#34;header&#34; . }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">div</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;container&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">div</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;container&#34;</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">h1</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;title&#34;</span>&gt;{{ .Title }} </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">h1</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;title&#34;</span>&gt;{{ .Title }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">br</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">br</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">span</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;subtitle&#34;</span>&gt;{{ .Subtitle }}&lt;/<span style="color:#000080">span</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">span</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;subtitle&#34;</span>&gt;{{ .Subtitle }}&lt;/<span style="color:#000080;">span</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">h1</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">h1</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">ul</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;tags&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">ul</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;tags&#34;</span>&gt;
</span></span><span style="display:flex;"><span> {{ range .Tags }} </span></span><span style="display:flex;"><span> {{ range .Tags }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">li</span>&gt;&lt;<span style="color:#000080">a</span> <span style="color:#008080">href</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;/go-org/blorg/tags/{{ . | Slugify }}&#34;</span>&gt;{{ . }}&lt;/<span style="color:#000080">a</span>&gt;&lt;/<span style="color:#000080">li</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">li</span>&gt;&lt;<span style="color:#000080;">a</span> <span style="color:#008080;">href</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;/go-org/blorg/tags/{{ . | Slugify }}&#34;</span>&gt;{{ . }}&lt;/<span style="color:#000080;">a</span>&gt;&lt;/<span style="color:#000080;">li</span>&gt;
</span></span><span style="display:flex;"><span> {{ end }} </span></span><span style="display:flex;"><span> {{ end }}
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">ul</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">ul</span>&gt;
</span></span><span style="display:flex;"><span> {{ .Content }} </span></span><span style="display:flex;"><span> {{ .Content }}
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">div</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">div</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">body</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">body</span>&gt;
</span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080">html</span>&gt; </span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080;">html</span>&gt;
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+end_src</span> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+end_src</span>
</span></span><span style="display:flex;"><span> </span></span><span style="display:flex;"><span>
</span></span><span style="display:flex;"><span><span style="color:#aaa">**</span> list </span></span><span style="display:flex;"><span><span style="color:#aaa;">**</span> list
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+name</span><span style="color:#998;font-style:italic">: list</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+name</span><span style="color:#998;font-style:italic;">: list</span>
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic">html</span><span style="color:#998;font-style:italic"> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic;">html</span><span style="color:#998;font-style:italic;">
</span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic"></span><span style="color:#999;font-weight:bold;font-style:italic">&lt;!doctype html&gt;</span> </span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;"></span><span style="color:#999;font-weight:bold;font-style:italic;">&lt;!doctype html&gt;</span>
</span></span><span style="display:flex;"><span>&lt;<span style="color:#000080">html</span>&gt; </span></span><span style="display:flex;"><span>&lt;<span style="color:#000080;">html</span>&gt;
</span></span><span style="display:flex;"><span> {{ template &#34;head&#34; . }} </span></span><span style="display:flex;"><span> {{ template &#34;head&#34; . }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">body</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">body</span>&gt;
</span></span><span style="display:flex;"><span> {{ template &#34;header&#34; . }} </span></span><span style="display:flex;"><span> {{ template &#34;header&#34; . }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">div</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;container&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">div</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;container&#34;</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">h1</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;title&#34;</span>&gt;{{ .Title }}&lt;/<span style="color:#000080">h1</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">h1</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;title&#34;</span>&gt;{{ .Title }}&lt;/<span style="color:#000080;">h1</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">ul</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;posts&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">ul</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;posts&#34;</span>&gt;
</span></span><span style="display:flex;"><span> {{ range .Pages }} </span></span><span style="display:flex;"><span> {{ range .Pages }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">li</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;post&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">li</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;post&#34;</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">a</span> <span style="color:#008080">href</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;{{ .PermaLink }}&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">a</span> <span style="color:#008080;">href</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;{{ .PermaLink }}&#34;</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">date</span>&gt;{{ .Date.Format &#34;02.01.2006&#34; }}&lt;/<span style="color:#000080">date</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">date</span>&gt;{{ .Date.Format &#34;02.01.2006&#34; }}&lt;/<span style="color:#000080;">date</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">span</span>&gt;{{ .Title }}&lt;/<span style="color:#000080">span</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">span</span>&gt;{{ .Title }}&lt;/<span style="color:#000080;">span</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">a</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">a</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">li</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">li</span>&gt;
</span></span><span style="display:flex;"><span> {{ end }} </span></span><span style="display:flex;"><span> {{ end }}
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">ul</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">ul</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">ul</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">ul</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">div</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">div</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">body</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">body</span>&gt;
</span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080">html</span>&gt; </span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080;">html</span>&gt;
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+end_src</span> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+end_src</span>
</span></span><span style="display:flex;"><span> </span></span><span style="display:flex;"><span>
</span></span><span style="display:flex;"><span><span style="color:#aaa">**</span> index </span></span><span style="display:flex;"><span><span style="color:#aaa;">**</span> index
</span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic">#+name</span><span style="color:#998;font-style:italic">: index</span> </span></span><span style="display:flex;"><span><span style="color:#999;font-weight:bold;font-style:italic;">#+name</span><span style="color:#998;font-style:italic;">: index</span>
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic">html</span><span style="color:#998;font-style:italic"> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+begin_src </span><span style="color:#999;font-weight:bold;font-style:italic;">html</span><span style="color:#998;font-style:italic;">
</span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic"></span><span style="color:#999;font-weight:bold;font-style:italic">&lt;!doctype html&gt;</span> </span></span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;"></span><span style="color:#999;font-weight:bold;font-style:italic;">&lt;!doctype html&gt;</span>
</span></span><span style="display:flex;"><span>&lt;<span style="color:#000080">html</span>&gt; </span></span><span style="display:flex;"><span>&lt;<span style="color:#000080;">html</span>&gt;
</span></span><span style="display:flex;"><span> {{ template &#34;head&#34; . }} </span></span><span style="display:flex;"><span> {{ template &#34;head&#34; . }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">body</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">body</span>&gt;
</span></span><span style="display:flex;"><span> {{ template &#34;header&#34; . }} </span></span><span style="display:flex;"><span> {{ template &#34;header&#34; . }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">div</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;container&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">div</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;container&#34;</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">h1</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;title&#34;</span>&gt;{{ .Title }}&lt;/<span style="color:#000080">h1</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">h1</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;title&#34;</span>&gt;{{ .Title }}&lt;/<span style="color:#000080;">h1</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">p</span>&gt;Only pages that have a date will be listed here - e.g. not &lt;<span style="color:#000080">a</span> <span style="color:#008080">href</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;about.html&#34;</span>&gt;about.html&lt;/<span style="color:#000080">a</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">p</span>&gt;Only pages that have a date will be listed here - e.g. not &lt;<span style="color:#000080;">a</span> <span style="color:#008080;">href</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;about.html&#34;</span>&gt;about.html&lt;/<span style="color:#000080;">a</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">ul</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;posts&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">ul</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;posts&#34;</span>&gt;
</span></span><span style="display:flex;"><span> {{ range .Pages }} </span></span><span style="display:flex;"><span> {{ range .Pages }}
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">li</span> <span style="color:#008080">class</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;post&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">li</span> <span style="color:#008080;">class</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;post&#34;</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">a</span> <span style="color:#008080">href</span><span style="color:#000;font-weight:bold">=</span><span style="color:#d14">&#34;{{ .PermaLink }}&#34;</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">a</span> <span style="color:#008080;">href</span><span style="color:#000;font-weight:bold;">=</span><span style="color:#d14;">&#34;{{ .PermaLink }}&#34;</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">date</span>&gt;{{ .Date.Format &#34;02.01.2006&#34; }}&lt;/<span style="color:#000080">date</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">date</span>&gt;{{ .Date.Format &#34;02.01.2006&#34; }}&lt;/<span style="color:#000080;">date</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">span</span>&gt;{{ .Title }}&lt;/<span style="color:#000080">span</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">span</span>&gt;{{ .Title }}&lt;/<span style="color:#000080;">span</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">a</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">a</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">li</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">li</span>&gt;
</span></span><span style="display:flex;"><span> {{ end }} </span></span><span style="display:flex;"><span> {{ end }}
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">ul</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">ul</span>&gt;
</span></span><span style="display:flex;"><span> &lt;<span style="color:#000080">ul</span>&gt; </span></span><span style="display:flex;"><span> &lt;<span style="color:#000080;">ul</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">div</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">div</span>&gt;
</span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080">body</span>&gt; </span></span><span style="display:flex;"><span> &lt;/<span style="color:#000080;">body</span>&gt;
</span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080">html</span>&gt; </span></span><span style="display:flex;"><span>&lt;/<span style="color:#000080;">html</span>&gt;
</span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic">#+end_src</span></span></span></code></pre> </span></span><span style="display:flex;"><span><span style="color:#998;font-style:italic;">#+end_src</span></span></span></code></pre>
</div> </div>
</div> </div>

8
blorg/util.go
View file

@ -5,10 +5,10 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/alecthomas/chroma" "github.com/alecthomas/chroma/v2"
"github.com/alecthomas/chroma/formatters/html" "github.com/alecthomas/chroma/v2/formatters/html"
"github.com/alecthomas/chroma/lexers" "github.com/alecthomas/chroma/v2/lexers"
"github.com/alecthomas/chroma/styles" "github.com/alecthomas/chroma/v2/styles"
"github.com/niklasfasching/go-org/org" "github.com/niklasfasching/go-org/org"
) )

9
go.mod
View file

@ -3,9 +3,14 @@ module github.com/niklasfasching/go-org
go 1.18 go 1.18
require ( require (
github.com/alecthomas/chroma v0.10.0 github.com/alecthomas/chroma/v2 v2.0.1
github.com/chaseadamsio/goorgeous v2.0.0+incompatible
github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib v1.0.0
github.com/russross/blackfriday v1.6.0
golang.org/x/net v0.0.0-20201224014010-6772e930b67b golang.org/x/net v0.0.0-20201224014010-6772e930b67b
) )
require github.com/dlclark/regexp2 v1.4.0 // indirect require (
github.com/dlclark/regexp2 v1.4.0 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
)

17
go.sum
View file

@ -1,21 +1,22 @@
github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek= github.com/alecthomas/chroma/v2 v2.0.1 h1:dyR7d3Dj5r3FoVabR91FTdM7SKc8RrJJ1KBTke+ipG4=
github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s= github.com/alecthomas/chroma/v2 v2.0.1/go.mod h1:vf4zrexSH54oEjJ7EdB65tGNHmH3pGZmVkgTP5RHvAs=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/alecthomas/repr v0.0.0-20220113201626-b1b626ac65ae h1:zzGwJfFlFGD94CyyYwCJeSuD32Gj9GTaSi5y9hoVzdY=
github.com/chaseadamsio/goorgeous v2.0.0+incompatible h1:yVG26EN0GdD0LnYyLg6jHA+eMvfC1Q4fAp8HlrcAvsk=
github.com/chaseadamsio/goorgeous v2.0.0+incompatible/go.mod h1:6QaC0vFoKWYDth94dHFNgRT2YkT5FHdQp/Yx15aAAi0=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E= github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw=
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

8
main.go
View file

@ -9,10 +9,10 @@ import (
"runtime/debug" "runtime/debug"
"strings" "strings"
"github.com/alecthomas/chroma" "github.com/alecthomas/chroma/v2"
"github.com/alecthomas/chroma/formatters/html" "github.com/alecthomas/chroma/v2/formatters/html"
"github.com/alecthomas/chroma/lexers" "github.com/alecthomas/chroma/v2/lexers"
"github.com/alecthomas/chroma/styles" "github.com/alecthomas/chroma/v2/styles"
"github.com/niklasfasching/go-org/blorg" "github.com/niklasfasching/go-org/blorg"
"github.com/niklasfasching/go-org/org" "github.com/niklasfasching/go-org/org"
) )