improved indentation and whitespace for markdown code blocks
All code blocks in markdown have been intended by at least 4 spaces. We add `--tab-stop=8` to all `pandoc(1)` executions in order to set a better tab stop indentation, especially for tab intended code blocks. Changed `bin/pandoc-wrapper.sh` VERSION from "1.5.3 2024-03-26" to "1.6 2024-03-31". Fixed `1991/brnstnd/sorta.README.md` so that the sorta code is code blocks. Removed unneeded paragraph group in copyright in `inc/footer.default.html`. Fixed excess whitespace after list Author on entry `index.html` page. Changed `bin/output-index-author.sh` VERSION from "1.5.2 2024-03-26" to "1.6 2024-03-31". Performed `make www` to perform the above and test under macOS. TODO: Fix the problem of the initial line of code being extra intended. TODO: Fix excess whitespace around code that is inline.
This commit is contained in:
Landon Curt Noll committed
1 parent
b84c27ce02
commit
a996f8d2b8
734 files changed
+16723
-16963
No files matched your search
+33
-33
@@ -1,25 +1,25 @@
|
||||
## To build:
|
||||
|
||||
```sh
|
||||
make
|
||||
make
|
||||
```
|
||||
|
||||
|
||||
## To use:
|
||||
|
||||
```sh
|
||||
./stewart width_and_height iterations file > file.xbm
|
||||
convert file.xbm file.png
|
||||
./stewart width_and_height iterations file > file.xbm
|
||||
convert file.xbm file.png
|
||||
```
|
||||
|
||||
where `file` is one of:
|
||||
|
||||
```
|
||||
altar box box2 box3 build carpet circles cross cross2 cross3
|
||||
crystal curve diamonds diamonds2 dragon dragon2 dragon3
|
||||
fern gasket gasket_mod gasket_mod2 ioccc maze octagon
|
||||
pentagon pentagons rings rings2 spirals spirals2 spirals3
|
||||
spirals4 squares stars stars2 tree tree2 tree3 tree4 triangle
|
||||
altar box box2 box3 build carpet circles cross cross2 cross3
|
||||
crystal curve diamonds diamonds2 dragon dragon2 dragon3
|
||||
fern gasket gasket_mod gasket_mod2 ioccc maze octagon
|
||||
pentagon pentagons rings rings2 spirals spirals2 spirals3
|
||||
spirals4 squares stars stars2 tree tree2 tree3 tree4 triangle
|
||||
```
|
||||
|
||||
NOTE: you cannot specify a different width from height; it's one number.
|
||||
@@ -30,7 +30,7 @@ NOTE: `convert(1)` belongs to [ImageMagick](https://imagemagick.org/index.php).
|
||||
## Try:
|
||||
|
||||
```sh
|
||||
./try.sh
|
||||
./try.sh
|
||||
```
|
||||
|
||||
After running the program on a few files it will ask you if you wish to run it
|
||||
@@ -59,16 +59,16 @@ a reasonably experienced user who can parse formats in their mind. :-)
|
||||
The program should be run with the following
|
||||
|
||||
```sh
|
||||
./stewart <m> <n> <ifs>
|
||||
./stewart <m> <n> <ifs>
|
||||
```
|
||||
|
||||
where:
|
||||
|
||||
```
|
||||
m = The size of the picture (picture will be m X m in size).
|
||||
n = The number of iterations to run (More will make for a
|
||||
clearer picture).
|
||||
ifs = The file to use as input.
|
||||
m = The size of the picture (picture will be m X m in size).
|
||||
n = The number of iterations to run (More will make for a
|
||||
clearer picture).
|
||||
ifs = The file to use as input.
|
||||
```
|
||||
|
||||
The program will spit out an [XBM image](https://en.wikipedia.org/wiki/X_BitMap)
|
||||
@@ -78,7 +78,7 @@ are 3. Wrong arguments will cause the program to bomb out.
|
||||
#### Example:
|
||||
|
||||
```sh
|
||||
./stewart 1024 1000000 gasket > gasket.xbm
|
||||
./stewart 1024 1000000 gasket > gasket.xbm
|
||||
```
|
||||
|
||||
### Compilation/Testing
|
||||
@@ -109,13 +109,13 @@ another kind of fractal, those from the [Iterated Function System
|
||||
The format of the input file is as follows:
|
||||
|
||||
```
|
||||
<num ifs> <x min> <y min> <x max> <y max>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
.
|
||||
.
|
||||
.
|
||||
<num ifs> <x min> <y min> <x max> <y max>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
.
|
||||
.
|
||||
.
|
||||
```
|
||||
|
||||
This file describe an IFS.
|
||||
@@ -123,20 +123,20 @@ This file describe an IFS.
|
||||
One of the most well known would be the [Sierpinski Gasket](gasket):
|
||||
|
||||
```
|
||||
3 0 0 1 1
|
||||
.5 0 0 .5 0 0 .33
|
||||
.5 0 0 .5 .5 0 .33
|
||||
.5 0 0 .5 .25 .433 .34
|
||||
3 0 0 1 1
|
||||
.5 0 0 .5 0 0 .33
|
||||
.5 0 0 .5 .5 0 .33
|
||||
.5 0 0 .5 .25 .433 .34
|
||||
```
|
||||
|
||||
or the [fern](fern):
|
||||
|
||||
```
|
||||
4 -5.5 0 5.5 11
|
||||
0 0 0 .16 0 0 .01
|
||||
.85 .04 -.04 .85 0 1.6 .85
|
||||
.2 -.26 .23 .22 0 1.6 .07
|
||||
-.15 .28 .26 .24 0 .44 .07
|
||||
4 -5.5 0 5.5 11
|
||||
0 0 0 .16 0 0 .01
|
||||
.85 .04 -.04 .85 0 1.6 .85
|
||||
.2 -.26 .23 .22 0 1.6 .07
|
||||
-.15 .28 .26 .24 0 .44 .07
|
||||
```
|
||||
|
||||
etc...
|
||||
@@ -158,8 +158,8 @@ The `a b c d e f` are used to iterative find points that lie in the IFS
|
||||
from the algorithm
|
||||
|
||||
```
|
||||
x = a * prevx + b * prevy + e;
|
||||
y = c * prevx + d * prevy + f;
|
||||
x = a * prevx + b * prevy + e;
|
||||
y = c * prevx + d * prevy + f;
|
||||
```
|
||||
|
||||
The `p` is for the probability that the equation will run.
|
||||
|
||||
+34
-35
@@ -132,8 +132,7 @@
|
||||
<h2 id="author"><a name="author"></a>Author:</h2>
|
||||
<ul>
|
||||
<li>Name: <a href="../../authors.html#Thomas_Stewart">Thomas Stewart</a><br>
|
||||
Location: <a href="../../location.html#US">US</a> - <em>United States of America</em> (<em>United States</em>)
|
||||
<br><br></li>
|
||||
Location: <a href="../../location.html#US">US</a> - <em>United States of America</em> (<em>United States</em>)</li>
|
||||
</ul>
|
||||
|
||||
<!-- END: next line ends content generated by: bin/output-index-author.sh -->
|
||||
@@ -142,20 +141,20 @@ Location: <a href="../../location.html#US">US</a> - <em>United States of America
|
||||
<!-- START: this line starts content for HTML phase 21 by: bin/pandoc-wrapper.sh via bin/md2html.sh -->
|
||||
|
||||
<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></span></code></pre></div>
|
||||
<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></span></code></pre></div>
|
||||
<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">./stewart</span> width_and_height iterations file <span class="op">></span> file.xbm</span>
|
||||
<span id="cb2-2"><a href="#cb2-2" aria-hidden="true" tabindex="-1"></a><span class="ex">convert</span> file.xbm file.png</span></code></pre></div>
|
||||
<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">./stewart</span> width_and_height iterations file <span class="op">></span> file.xbm</span>
|
||||
<span id="cb2-2"><a href="#cb2-2" aria-hidden="true" tabindex="-1"></a> <span class="ex">convert</span> file.xbm file.png</span></code></pre></div>
|
||||
<p>where <code>file</code> is one of:</p>
|
||||
<pre><code>altar box box2 box3 build carpet circles cross cross2 cross3
|
||||
crystal curve diamonds diamonds2 dragon dragon2 dragon3
|
||||
fern gasket gasket_mod gasket_mod2 ioccc maze octagon
|
||||
pentagon pentagons rings rings2 spirals spirals2 spirals3
|
||||
spirals4 squares stars stars2 tree tree2 tree3 tree4 triangle</code></pre>
|
||||
<pre><code> altar box box2 box3 build carpet circles cross cross2 cross3
|
||||
crystal curve diamonds diamonds2 dragon dragon2 dragon3
|
||||
fern gasket gasket_mod gasket_mod2 ioccc maze octagon
|
||||
pentagon pentagons rings rings2 spirals spirals2 spirals3
|
||||
spirals4 squares stars stars2 tree tree2 tree3 tree4 triangle</code></pre>
|
||||
<p>NOTE: you cannot specify a different width from height; it’s one number.</p>
|
||||
<p>NOTE: <code>convert(1)</code> belongs to <a href="https://imagemagick.org/index.php">ImageMagick</a>.</p>
|
||||
<h2 id="try">Try:</h2>
|
||||
<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="ex">./try.sh</span></span></code></pre></div>
|
||||
<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="ex">./try.sh</span></span></code></pre></div>
|
||||
<p>After running the program on a few files it will ask you if you wish to run it
|
||||
on the remaining files.</p>
|
||||
<p>The script will try converting the xbm files created by the program to png
|
||||
@@ -172,17 +171,17 @@ a reasonably experienced user who can parse formats in their mind. :-)</p>
|
||||
<h2 id="authors-remarks">Author’s remarks:</h2>
|
||||
<h3 id="execution">Execution</h3>
|
||||
<p>The program should be run with the following</p>
|
||||
<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">./stewart</span> <span class="op"><</span>m<span class="op">></span> <span class="op"><</span>n<span class="op">></span> <span class="op"><</span>ifs<span class="op">></span></span></code></pre></div>
|
||||
<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">./stewart</span> <span class="op"><</span>m<span class="op">></span> <span class="op"><</span>n<span class="op">></span> <span class="op"><</span>ifs<span class="op">></span></span></code></pre></div>
|
||||
<p>where:</p>
|
||||
<pre><code>m = The size of the picture (picture will be m X m in size).
|
||||
n = The number of iterations to run (More will make for a
|
||||
clearer picture).
|
||||
ifs = The file to use as input.</code></pre>
|
||||
<pre><code> m = The size of the picture (picture will be m X m in size).
|
||||
n = The number of iterations to run (More will make for a
|
||||
clearer picture).
|
||||
ifs = The file to use as input.</code></pre>
|
||||
<p>The program will spit out an <a href="https://en.wikipedia.org/wiki/X_BitMap">XBM image</a>
|
||||
on standard out. Minimal checking is done on the arguments mainly that there
|
||||
are 3. Wrong arguments will cause the program to bomb out.</p>
|
||||
<h4 id="example">Example:</h4>
|
||||
<div class="sourceCode" id="cb7"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true" tabindex="-1"></a><span class="ex">./stewart</span> 1024 1000000 gasket <span class="op">></span> gasket.xbm</span></code></pre></div>
|
||||
<div class="sourceCode" id="cb7"><pre class="sourceCode sh"><code class="sourceCode bash"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true" tabindex="-1"></a> <span class="ex">./stewart</span> 1024 1000000 gasket <span class="op">></span> gasket.xbm</span></code></pre></div>
|
||||
<h3 id="compilationtesting">Compilation/Testing</h3>
|
||||
<p>The program compiles without warning with <code>gcc -ansi -Wall</code>.
|
||||
<code>lint</code> also seems to like the code. This must be a bug in <code>lint</code>.</p>
|
||||
@@ -200,25 +199,25 @@ another kind of fractal, those from the <a href="https://en.wikipedia.org/wiki/I
|
||||
(IFS)</a>.</p>
|
||||
<h3 id="input-file">Input File</h3>
|
||||
<p>The format of the input file is as follows:</p>
|
||||
<pre><code><num ifs> <x min> <y min> <x max> <y max>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
.
|
||||
.
|
||||
.</code></pre>
|
||||
<pre><code> <num ifs> <x min> <y min> <x max> <y max>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
<a> <b> <c> <d> <e> <f> <p>
|
||||
.
|
||||
.
|
||||
.</code></pre>
|
||||
<p>This file describe an IFS.</p>
|
||||
<p>One of the most well known would be the <a href="gasket">Sierpinski Gasket</a>:</p>
|
||||
<pre><code>3 0 0 1 1
|
||||
.5 0 0 .5 0 0 .33
|
||||
.5 0 0 .5 .5 0 .33
|
||||
.5 0 0 .5 .25 .433 .34</code></pre>
|
||||
<pre><code> 3 0 0 1 1
|
||||
.5 0 0 .5 0 0 .33
|
||||
.5 0 0 .5 .5 0 .33
|
||||
.5 0 0 .5 .25 .433 .34</code></pre>
|
||||
<p>or the <a href="fern">fern</a>:</p>
|
||||
<pre><code>4 -5.5 0 5.5 11
|
||||
0 0 0 .16 0 0 .01
|
||||
.85 .04 -.04 .85 0 1.6 .85
|
||||
.2 -.26 .23 .22 0 1.6 .07
|
||||
-.15 .28 .26 .24 0 .44 .07</code></pre>
|
||||
<pre><code> 4 -5.5 0 5.5 11
|
||||
0 0 0 .16 0 0 .01
|
||||
.85 .04 -.04 .85 0 1.6 .85
|
||||
.2 -.26 .23 .22 0 1.6 .07
|
||||
-.15 .28 .26 .24 0 .44 .07</code></pre>
|
||||
<p>etc…</p>
|
||||
<p>Included in my submission will be a tarball of some IFS files,
|
||||
including one that attempts (not very well) to mimic the IOCCC logo
|
||||
@@ -231,8 +230,8 @@ enough to condense it down to something that is coherent.</p>
|
||||
in the XBM image file.</p>
|
||||
<p>The <code>a b c d e f</code> are used to iterative find points that lie in the IFS
|
||||
from the algorithm</p>
|
||||
<pre><code>x = a * prevx + b * prevy + e;
|
||||
y = c * prevx + d * prevy + f;</code></pre>
|
||||
<pre><code> x = a * prevx + b * prevy + e;
|
||||
y = c * prevx + d * prevy + f;</code></pre>
|
||||
<p>The <code>p</code> is for the probability that the equation will run.</p>
|
||||
<h3 id="obfuscations">Obfuscations</h3>
|
||||
<p>The main obfuscation is using a <code>void *</code> as my only variable (aside from
|
||||
|
||||
Reference in new issue
Block a user