Skip to content

Commit c14f426

Browse files
rsdoielrsdoiel
committed
converted to pandoc templates, adding go1.16 compiler support, M1 binary builds
1 parent 63e6295 commit c14f426

File tree

12 files changed

+344
-228
lines changed

12 files changed

+344
-228
lines changed

‎Makefile‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,18 @@ dist/windows-amd64:
4949
cd dist && zip -r $(PROJECT)-$(VERSION)-windows-amd64.zip README.md LICENSE INSTSALL.md bin/*
5050
rm -fR dist/bin
5151

52-
dist/macosx-amd64:
52+
dist/macos-amd64:
5353
mkdir -p dist/bin
5454
env GOOS=darwin GOARCH=amd64 go build -o dist/bin/fdx2txt cmd/fdx2txt/fdx2txt.go
5555
env GOOS=darwin GOARCH=amd64 go build -o dist/bin/txt2fdx cmd/txt2fdx/txt2fdx.go
56-
cd dist && zip -r $(PROJECT)-$(VERSION)-macosx-amd64.zip README.md LICENSE INSTSALL.md bin/*
56+
cd dist && zip -r $(PROJECT)-$(VERSION)-macos-amd64.zip README.md LICENSE INSTSALL.md bin/*
57+
rm -fR dist/bin
58+
59+
dist/macos-arm64:
60+
mkdir -p dist/bin
61+
env GOOS=darwin GOARCH=arm64 go build -o dist/bin/fdx2txt cmd/fdx2txt/fdx2txt.go
62+
env GOOS=darwin GOARCH=arm64 go build -o dist/bin/txt2fdx cmd/txt2fdx/txt2fdx.go
63+
cd dist && zip -r $(PROJECT)-$(VERSION)-macos-arm64.zip README.md LICENSE INSTSALL.md bin/*
5764
rm -fR dist/bin
5865

5966
dist/raspbian-arm7:
@@ -75,7 +82,7 @@ distribute_docs:
7582
cp -v README.md dist/
7683
cp -v LICENSE dist/
7784

78-
release: distribute_docs dist/linux-amd64 dist/windows-amd64 dist/macosx-amd64 dist/raspbian-arm7 dist/linux-arm64
85+
release: distribute_docs dist/linux-amd64 dist/windows-amd64 dist/macos-amd64 dist/macos-arm64 dist/raspbian-arm7 dist/linux-arm64
7986

8087
clean:
8188
if [ -d bin ]; then rm -fR bin; fi

‎TODO.html‎

Lines changed: 65 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,84 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title><no value></title>
4+
<title>…</title>
55
<link href="/css/site.css" rel="stylesheet" />
66
</head>
77
<body>
88
<header>
9-
<no value>
9+
…
1010
</header>
1111
<section>
12-
<h1>Action Items</h1>
13-
14-
<h2>Bugs</h2>
15-
16-
<h2>Next</h2>
17-
18-
<ul>
19-
<li>[ ] Review XML output from ToXML() after a FromFountain() call, see where I need to add mapping for Text elements and embedded styling</li>
20-
<li>[ ] validate that I am producing fdx files that Final Draft, FadeIn and Trelby can read</li>
12+
<h1 id="action-items">
13+
Action Items
14+
</h1>
15+
<h2 id="bugs">
16+
Bugs
17+
</h2>
18+
<h2 id="next">
19+
Next
20+
</h2>
21+
<ul class="task-list">
22+
<li>
23+
<input type="checkbox" disabled="" /> Review XML output from ToXML() after a FromFountain() call, see where I need to add mapping for Text elements and embedded styling
24+
</li>
25+
<li>
26+
<input type="checkbox" disabled="" /> validate that I am producing fdx files that Final Draft, FadeIn and Trelby can read
27+
</li>
2128
</ul>
22-
23-
<h2>Someday, Maybe</h2>
24-
25-
<ul>
26-
<li>[ ] Write and fdx2html using <a href="https://fountain.io/scrippets">scrippets</a> approach</li>
27-
<li>[ ] Left/Right alignment should be respected based based on Paragraph Type</li>
28-
<li>[ ] Plaintext formatting needs to be pickup and respected from whole FinalDraft document (e.g. respect definitions, Layout, etc)</li>
29-
<li>[ ] Screen Headers and Footers can have Text, Dynamic, SceneProperties in any order, right now converting back to XML renders them in fixed order because they are ignored when rendering and plaintext</li>
29+
<h2 id="someday-maybe">
30+
Someday, Maybe
31+
</h2>
32+
<ul class="task-list">
33+
<li>
34+
<input type="checkbox" disabled="" /> Write and fdx2html using <a href="https://fountain.io/scrippets">scrippets</a> approach
35+
</li>
36+
<li>
37+
<input type="checkbox" disabled="" /> Left/Right alignment should be respected based based on Paragraph Type
38+
</li>
39+
<li>
40+
<input type="checkbox" disabled="" /> Plaintext formatting needs to be pickup and respected from whole FinalDraft document (e.g. respect definitions, Layout, etc)
41+
</li>
42+
<li>
43+
<input type="checkbox" disabled="" /> Screen Headers and Footers can have Text, Dynamic, SceneProperties in any order, right now converting back to XML renders them in fixed order because they are ignored when rendering and plaintext
44+
</li>
3045
</ul>
31-
32-
<h2>Completed</h2>
33-
34-
<ul>
35-
<li>[x] Add ParseFile() to fdx.go</li>
36-
<li>[x] String() Paragraph needs to handle trailing new lines based on Paragraph Type</li>
37-
<li>[x] write tests that validate the source FDX content in <em>testout</em> version</li>
46+
<h2 id="completed">
47+
Completed
48+
</h2>
49+
<ul class="task-list">
50+
<li>
51+
<input type="checkbox" disabled="" checked="" /> Add ParseFile() to fdx.go
52+
</li>
53+
<li>
54+
<input type="checkbox" disabled="" checked="" /> String() Paragraph needs to handle trailing new lines based on Paragraph Type
55+
</li>
56+
<li>
57+
<input type="checkbox" disabled="" checked="" /> write tests that validate the source FDX content in <em>testout</em> version
58+
</li>
3859
</ul>
39-
4060
</section>
4161
<nav>
4262
<ul>
43-
<li><a href="/">Home</a></li>
44-
<li><a href="./">README</a></li>
45-
<li><a href="license.html">LICENSE</a></li>
46-
<li><a href="docs/">Documentation</a></li>
47-
<li><a href="testdata.html">Test Data</a></li>
48-
<li><a href="https://github.com/rsdoiel/fdx">Github</a></li>
63+
<li>
64+
<a href="/">Home</a>
65+
</li>
66+
<li>
67+
<a href="./">README</a>
68+
</li>
69+
<li>
70+
<a href="license.html">LICENSE</a>
71+
</li>
72+
<li>
73+
<a href="docs/">Documentation</a>
74+
</li>
75+
<li>
76+
<a href="testdata.html">Test Data</a>
77+
</li>
78+
<li>
79+
<a href="https://github.com/rsdoiel/fdx">Github</a>
80+
</li>
4981
</ul>
50-
5182
</nav>
5283
<footer>
5384
copyright (c) 2017 all rights reserved.

‎docs/fdx2txt.html‎

Lines changed: 48 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,71 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title><no value></title>
4+
<title>…</title>
55
<link href="/css/site.css" rel="stylesheet" />
66
</head>
77
<body>
88
<header>
9-
<no value>
9+
…
1010
</header>
1111
<section>
12-
<h1>USAGE</h1>
13-
14-
<pre><code>fdx2txt [OPTIONS]
15-
</code></pre>
16-
17-
<h2>SYNOPSIS</h2>
18-
19-
<p>fdx2txt is a command line program that reads an fdx file
20-
and returns plain text</p>
21-
22-
<h2>OPTIONS</h2>
23-
12+
<h1 id="usage">
13+
USAGE
14+
</h1>
15+
<pre><code>fdx2txt [OPTIONS]</code></pre>
16+
<h2 id="synopsis">
17+
SYNOPSIS
18+
</h2>
19+
<p>
20+
fdx2txt is a command line program that reads an fdx file and returns plain text
21+
</p>
22+
<h2 id="options">
23+
OPTIONS
24+
</h2>
2425
<pre><code> -generate-markdown-docs generate Markdown documentation
2526
-h, -help display help
2627
-i, -input set the input filename
2728
-l, -license display license
2829
-nl, -newline add a trailing newline
2930
-o, -output set the output filename
3031
-quiet suppress error messages
31-
-v, -version display version
32-
</code></pre>
33-
34-
<h2>EXAMPLES</h2>
35-
36-
<p>Cervert <em>screenplay.fdx</em> into <em>screenplay.txt</em>.</p>
37-
38-
<pre><code>fdx2txt -i screenplay.fdx -o screenplay.txt
39-
</code></pre>
40-
41-
<p>Or alternatively</p>
42-
43-
<pre><code>cat screenplay.fdx | fdx2txt &gt; screenplay.txt
44-
</code></pre>
45-
46-
<p>fdx2txt v0.0.0-dev</p>
47-
32+
-v, -version display version</code></pre>
33+
<h2 id="examples">
34+
EXAMPLES
35+
</h2>
36+
<p>
37+
Cervert <em>screenplay.fdx</em> into <em>screenplay.txt</em>.
38+
</p>
39+
<pre><code>fdx2txt -i screenplay.fdx -o screenplay.txt</code></pre>
40+
<p>
41+
Or alternatively
42+
</p>
43+
<pre><code>cat screenplay.fdx | fdx2txt &gt; screenplay.txt</code></pre>
44+
<p>
45+
fdx2txt v0.0.0-dev
46+
</p>
4847
</section>
4948
<nav>
5049
<ul>
51-
<li><a href="/">Home</a></li>
52-
<li><a href="../">README</a></li>
53-
<li><a href="../license.html">LICENSE</a></li>
54-
<li><a href="../testdata.html">Test Data</a></li>
55-
<li><a href="./">Documentation</a></li>
56-
<li><a href="https://github.com/rsdoiel/fdx">Github</a></li>
50+
<li>
51+
<a href="/">Home</a>
52+
</li>
53+
<li>
54+
<a href="../">README</a>
55+
</li>
56+
<li>
57+
<a href="../license.html">LICENSE</a>
58+
</li>
59+
<li>
60+
<a href="../testdata.html">Test Data</a>
61+
</li>
62+
<li>
63+
<a href="./">Documentation</a>
64+
</li>
65+
<li>
66+
<a href="https://github.com/rsdoiel/fdx">Github</a>
67+
</li>
5768
</ul>
58-
5969
</nav>
6070
<footer>
6171
copyright (c) 2017 all rights reserved.

‎docs/index.html‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,50 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<title><no value></title>
4+
<title>…</title>
55
<link href="/css/site.css" rel="stylesheet" />
66
</head>
77
<body>
88
<header>
9-
<no value>
9+
…
1010
</header>
1111
<section>
12-
<h1>Demonstration programs</h1>
13-
14-
<p>Here are two demonstration programs showing off how the fdx package works.</p>
15-
12+
<h1 id="demonstration-programs">
13+
Demonstration programs
14+
</h1>
15+
<p>
16+
Here are two demonstration programs showing off how the fdx package works.
17+
</p>
1618
<ul>
17-
<li><a href="fdx2txt.html">fdx2txt</a> - converts Final Draft fdx file to plain text (i.e. <a href="https://fountain.io">Fountain</a>)</li>
18-
<li><a href="txt2fdx.html">txt2fdx</a> - attempts to convert plain text file into Final Draft fdx file</li>
19+
<li>
20+
<a href="fdx2txt.html">fdx2txt</a> - converts Final Draft fdx file to plain text (i.e. <a href="https://fountain.io">Fountain</a>)
21+
</li>
22+
<li>
23+
<a href="txt2fdx.html">txt2fdx</a> - attempts to convert plain text file into Final Draft fdx file
24+
</li>
1925
</ul>
20-
2126
</section>
2227
<nav>
2328
<ul>
24-
<li><a href="/">Home</a></li>
25-
<li><a href="../">README</a></li>
26-
<li><a href="../license.html">LICENSE</a></li>
27-
<li><a href="../testdata.html">Test Data</a></li>
28-
<li><a href="./">Documentation</a></li>
29-
<li><a href="https://github.com/rsdoiel/fdx">Github</a></li>
29+
<li>
30+
<a href="/">Home</a>
31+
</li>
32+
<li>
33+
<a href="../">README</a>
34+
</li>
35+
<li>
36+
<a href="../license.html">LICENSE</a>
37+
</li>
38+
<li>
39+
<a href="../testdata.html">Test Data</a>
40+
</li>
41+
<li>
42+
<a href="./">Documentation</a>
43+
</li>
44+
<li>
45+
<a href="https://github.com/rsdoiel/fdx">Github</a>
46+
</li>
3047
</ul>
31-
3248
</nav>
3349
<footer>
3450
copyright (c) 2017 all rights reserved.

0 commit comments

Comments
 (0)