force use of pandoc version >= 3.1.12.2
The `bin/pandoc-wrapper.sh` tool will verify that the ssytem has a recent enough version of `pandoc(1)`. We explain why we insist on `pandoc(1)`. version >= 3.1.12.2 in comments where the $PANDOC_MIN_VERSION is set. Added `--wrap=preserve` as a default argument to `pandoc(1)`. While this change will impact every HTML file generated, we believe this will improve the ability of someone to look at the generated HTML and correlate with the original markdown. Changed `bin/pandoc-wrapper.sh` VERSION from "1.4.2 2024-03-17" to "1.4.3 2024-03-18". Performed `make www` to achieve all of the above and to generate HTML using the new `--wrap=preserve` `pandoc(1)` mode.
This commit is contained in:
Landon Curt Noll committed
1 parent
9eb7a54e9f
commit
b0b212acb1
402 files changed
+37061
-55132
No files matched your search
+61
-97
@@ -129,9 +129,9 @@
|
||||
|
||||
<h2 id="author"><a name="author"></a>Author:</h2>
|
||||
<ul>
|
||||
<li>Name: <a href="../../authors.html#Brian_Westley">Brian
|
||||
Westley</a><br> Location: <a href="../../location.html#US">US</a> -
|
||||
<em>United States of America</em> (<em>United States</em>) <br><br></li>
|
||||
<li>Name: <a href="../../authors.html#Brian_Westley">Brian Westley</a><br>
|
||||
Location: <a href="../../location.html#US">US</a> - <em>United States of America</em> (<em>United States</em>)
|
||||
<br><br></li>
|
||||
</ul>
|
||||
|
||||
<!-- END: next line ends content generated by: bin/output-index-author.sh -->
|
||||
@@ -141,9 +141,9 @@ Westley</a><br> Location: <a href="../../location.html#US">US</a> -
|
||||
|
||||
<h2 id="to-build">To build:</h2>
|
||||
<div class="sourceCode" id="cb1"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="fu">make</span> all</span></code></pre></div>
|
||||
<p>There is another version which is the original entry. See <a
|
||||
href="#alternate-code">alternate version</a> for details as to how to
|
||||
use and why it was made the alt version.</p>
|
||||
<p>There is another version which is the original entry. See <a href="#alternate-code">alternate
|
||||
version</a> for details as to how to use and why it was made the
|
||||
alt version.</p>
|
||||
<h2 id="to-use">To use:</h2>
|
||||
<div class="sourceCode" id="cb2"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a><span class="ex">./clock1.sh</span></span>
|
||||
<span id="cb2-2"><a href="#cb2-2" aria-hidden="true" tabindex="-1"></a><span class="ex">./clock2.sh</span></span>
|
||||
@@ -151,127 +151,91 @@ use and why it was made the alt version.</p>
|
||||
<h2 id="try">Try:</h2>
|
||||
<div class="sourceCode" id="cb3"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a><span class="ex">./try.sh</span></span></code></pre></div>
|
||||
<h2 id="alternate-code">Alternate code:</h2>
|
||||
<p>The original version had a display problem in modern systems which
|
||||
somewhat affected the usability of the program. This alternate code, the
|
||||
original, is provided, to show the differences.</p>
|
||||
<p>The original version had a display problem in modern systems which somewhat
|
||||
affected the usability of the program. This alternate code, the original, is
|
||||
provided, to show the differences.</p>
|
||||
<h3 id="alternate-build">Alternate build:</h3>
|
||||
<div class="sourceCode" id="cb4"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true" tabindex="-1"></a><span class="fu">make</span> alt</span></code></pre></div>
|
||||
<h3 id="alternate-try">Alternate try:</h3>
|
||||
<div class="sourceCode" id="cb5"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="ex">./try.alt.sh</span></span></code></pre></div>
|
||||
<h2 id="judges-remarks">Judges’ remarks:</h2>
|
||||
<p>Time and time again, Brian Westley seems to come up with a winning
|
||||
entry! We are amazed at how much is being done with only one relatively
|
||||
short line. We think you will as well if you take the time to understand
|
||||
it.</p>
|
||||
<p>Time and time again, Brian Westley seems to come up with a winning entry!
|
||||
We are amazed at how much is being done with only one relatively
|
||||
short line. We think you will as well if you take the time to
|
||||
understand it.</p>
|
||||
<h2 id="authors-remarks">Author’s remarks:</h2>
|
||||
<p>This 1-line program allows various analog ASCII clocks to print out
|
||||
the time; the ASCII clock is built from the command line arguments, so
|
||||
many different types of clocks can be generated. Three different scripts
|
||||
are supplied to print out a grandfather clock, a mantle clock that runs
|
||||
backwards, and a linear-style clock. (they are <a
|
||||
href="clock1.sh">clock1.sh</a>, <a href="clock2.sh">clock2.sh</a>, and
|
||||
<p>This 1-line program allows various analog ASCII clocks to print out the time;
|
||||
the ASCII clock is built from the command line arguments, so many different
|
||||
types of clocks can be generated. Three different scripts are supplied to print
|
||||
out a grandfather clock, a mantle clock that runs backwards, and a linear-style
|
||||
clock. (they are <a href="clock1.sh">clock1.sh</a>, <a href="clock2.sh">clock2.sh</a>, and
|
||||
<a href="clock3.sh">clock3.sh</a>)</p>
|
||||
<p>The program makes the following (possibly non-portable)
|
||||
assumptions:</p>
|
||||
<p>The program makes the following (possibly non-portable) assumptions:</p>
|
||||
<ol type="1">
|
||||
<li><p>Command line strings can be written to.</p></li>
|
||||
<li><p><code>argv[0]</code> can be written to as if it were a
|
||||
<code>long *</code>.</p></li>
|
||||
<li><p>The first three elements of the <code>struct *</code> returned by
|
||||
<code>localtime(3)</code> are seconds, minutes, hours, and all are
|
||||
<code>int</code>s.</p></li>
|
||||
<li><p>My sample scripts assume ASCII, though this is not inherent in
|
||||
the code, just my sample scripts.</p></li>
|
||||
<li><p><code>argv[0]</code> can be written to as if it were a <code>long *</code>.</p></li>
|
||||
<li><p>The first three elements of the <code>struct *</code> returned by <code>localtime(3)</code> are
|
||||
seconds, minutes, hours, and all are <code>int</code>s.</p></li>
|
||||
<li><p>My sample scripts assume ASCII, though this is not inherent in the code, just
|
||||
my sample scripts.</p></li>
|
||||
</ol>
|
||||
<p>These assumptions are pretty reasonable. 2) can be eliminated but
|
||||
makes the code larger.</p>
|
||||
<p>These assumptions are pretty reasonable. 2) can be eliminated but makes the code
|
||||
larger.</p>
|
||||
<p>The code is simple; the arguments passed are:</p>
|
||||
<div class="sourceCode" id="cb6"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb6-1"><a href="#cb6-1" aria-hidden="true" tabindex="-1"></a><span class="ex">./westley</span> minute_map hour_map hand_symbol clock_image</span></code></pre></div>
|
||||
<p>The program merely takes the minute (0-59) and the hour (0-23)
|
||||
values, looks up the offsets in <code>minute_map</code> and
|
||||
<code>hour_map</code> and writes the <code>hand_symbol</code> for each
|
||||
into the <code>clock_image</code> string. This string is then
|
||||
printed.</p>
|
||||
<p>The <code>for()</code> loop starts by calling <code>time()</code>
|
||||
with <code>argv[0]</code>, so the time value (a <code>long</code>) is
|
||||
written into the program name. The <code>for()</code> control value is
|
||||
<code>argc</code>, which starts at <code>5</code>, but the
|
||||
<code>/=2</code> statement is executed before the test, so the
|
||||
<code>for()</code> loop is executed twice, with <code>h=2</code>, then
|
||||
<code>h=1</code> (for hour & minute).</p>
|
||||
values, looks up the offsets in <code>minute_map</code> and <code>hour_map</code>
|
||||
and writes the <code>hand_symbol</code> for each into the <code>clock_image</code>
|
||||
string. This string is then printed.</p>
|
||||
<p>The <code>for()</code> loop starts by calling <code>time()</code> with <code>argv[0]</code>, so
|
||||
the time value (a <code>long</code>) is written into the program name.
|
||||
The <code>for()</code> control value is <code>argc</code>, which starts at <code>5</code>, but
|
||||
the <code>/=2</code> statement is executed before the test, so the <code>for()</code>
|
||||
loop is executed twice, with <code>h=2</code>, then <code>h=1</code> (for hour & minute).</p>
|
||||
<p>The statement of the <code>for()</code> loop takes the hour or minute
|
||||
field of the struct returned by <code>localtime(3)</code> by casting it
|
||||
to an <code>int *</code> and dereferencing element <code>[h]</code>. It
|
||||
is slightly smaller to use the trick <code>h[(int*)localtime(*m)]</code>
|
||||
instead of <code>((int*)localtime(*m))[h]</code>.</p>
|
||||
<p>This value is in turn indexed into the <code>hour_map</code> or
|
||||
<code>minute_map</code> parameter to determine where the ‘hand’ symbol
|
||||
should be written into the <code>clock_image</code>.</p>
|
||||
<p>Note that the hands move in a quantum fashion; 3:59 looks deceptively
|
||||
like 2:59, since the hour hand will be at the 3 position. It won’t move
|
||||
until both hands click over at 4:00.</p>
|
||||
<h2 id="copyright-and-cc-by-sa-4.0-license">Copyright and CC BY-SA 4.0
|
||||
License:</h2>
|
||||
<p>This file is Copyright (c) 2023 by Landon Curt Noll. All Rights
|
||||
Reserved. You are free to share and adapt this file under the terms of
|
||||
this license:</p>
|
||||
to an <code>int *</code> and dereferencing element <code>[h]</code>. It is slightly
|
||||
smaller to use the trick <code>h[(int*)localtime(*m)]</code> instead of
|
||||
<code>((int*)localtime(*m))[h]</code>.</p>
|
||||
<p>This value is in turn indexed into the <code>hour_map</code> or <code>minute_map</code>
|
||||
parameter to determine where the ‘hand’ symbol should be
|
||||
written into the <code>clock_image</code>.</p>
|
||||
<p>Note that the hands move in a quantum fashion; 3:59 looks
|
||||
deceptively like 2:59, since the hour hand will be at the 3
|
||||
position. It won’t move until both hands click over at 4:00.</p>
|
||||
<h2 id="copyright-and-cc-by-sa-4.0-license">Copyright and CC BY-SA 4.0 License:</h2>
|
||||
<p>This file is Copyright (c) 2023 by Landon Curt Noll. All Rights Reserved.
|
||||
You are free to share and adapt this file under the terms of this license:</p>
|
||||
<pre><code>Creative Commons Attribution-ShareAlike 4.0 International (CC BY-SA 4.0)</code></pre>
|
||||
<p>For more information, see:
|
||||
https://creativecommons.org/licenses/by-sa/4.0/</p>
|
||||
<p>For more information, see: https://creativecommons.org/licenses/by-sa/4.0/</p>
|
||||
|
||||
<!-- END: this line ends content for HTML phase 21 by: bin/pandoc-wrapper.sh via bin/md2html.sh -->
|
||||
<!-- START: this line starts content for HTML phase 22 by: bin/output-index-inventory.sh via bin/md2html.sh -->
|
||||
|
||||
<!-- START: this line starts content generated by: bin/output-index-inventory.sh -->
|
||||
|
||||
<h1 id="inventory-for-1996westley"><a name="inventory"></a>Inventory for
|
||||
1996/westley</h1>
|
||||
<h1 id="inventory-for-1996westley"><a name="inventory"></a>Inventory for 1996/westley</h1>
|
||||
<p><a href="#top">Jump to top</a></p>
|
||||
<h2 id="primary-files">Primary files</h2>
|
||||
<ul>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/westley.c">westley.c</a>
|
||||
- entry source</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/Makefile">Makefile</a>
|
||||
- entry Makefile</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/westley.alt.c">westley.alt.c</a>
|
||||
- alternative source</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/westley.orig.c">westley.orig.c</a>
|
||||
- original source</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/clock1.sh">clock1.sh</a>
|
||||
- how to run</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/clock2.sh">clock2.sh</a>
|
||||
- how to run</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/clock3.sh">clock3.sh</a>
|
||||
- how to run</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/try.alt.sh">try.alt.sh</a>
|
||||
- how to run alternative code</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/try.sh">try.sh</a>
|
||||
- how to run</li>
|
||||
<li><a href="1996_westley.tar.bz2">1996_westley.tar.bz2</a> - download
|
||||
entry source</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/westley.c">westley.c</a> - entry source</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/Makefile">Makefile</a> - entry Makefile</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/westley.alt.c">westley.alt.c</a> - alternative source</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/westley.orig.c">westley.orig.c</a> - original source</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/clock1.sh">clock1.sh</a> - how to run</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/clock2.sh">clock2.sh</a> - how to run</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/clock3.sh">clock3.sh</a> - how to run</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/try.alt.sh">try.alt.sh</a> - how to run alternative code</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/try.sh">try.sh</a> - how to run</li>
|
||||
<li><a href="1996_westley.tar.bz2">1996_westley.tar.bz2</a> - download entry source</li>
|
||||
</ul>
|
||||
<h2 id="secondary-files">Secondary files</h2>
|
||||
<ul>
|
||||
<li><a href="index.html">index.html</a> - entry home page</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/.entry.json">.entry.json</a>
|
||||
- description of entry in JSON</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/.gitignore">.gitignore</a>
|
||||
- list of files that should not be committed under git</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/.entry.json">.entry.json</a> - description of entry in JSON</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/.gitignore">.gitignore</a> - list of files that should not be committed under git</li>
|
||||
<li><a href=".path">.path</a> - directory path from top directory</li>
|
||||
<li><a
|
||||
href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/README.md">README.md</a>
|
||||
- markdown source for index.html</li>
|
||||
<li><a href="https://github.com/ioccc-src/temp-test-ioccc/blob/master/1996/westley/README.md">README.md</a> - markdown source for index.html</li>
|
||||
</ul>
|
||||
|
||||
<!-- END: next line ends content generated by: bin/output-index-inventory.sh -->
|
||||
|
||||
Reference in new issue
Block a user