code.H3RALD.com — hastyscribe: a4799ca4fa2d0849d318e578461681a9bab98bea

Fixed #46; implemented substitution macros.

h3rald h3rald@h3rald.com

Sun, 09 Oct 2016 12:15:42 +0200

commit

a4799ca4fa2d0849d318e578461681a9bab98bea

parent

61f29221a610629db6ad7c54838666f9006b3739

5 files changed, 131 insertions(+), 41 deletions(-)

jump to

LICENSE.md

doc/HastyScribe_UserGuide.htm

doc/HastyScribe_UserGuide.md

hastyscribe.nim

hastyscribe.nimble

M LICENSE.md → LICENSE.md

@@ -1,12 +1,12 @@ 
 ## HastyScribe (program/library)
 
-Copyright (c) 2013-2014 Fabio Cevasco
+Copyright (c) 2013-2016 Fabio Cevasco
 
 Released under the terms of the [MIT License](http://opensource.org/licenses/MIT).
 
 ## HastyScribe (font)
 
-Copyright (c) 2013-2014, Fabio Cevasco, with Reserved Font Name 'HastyScribe'.
+Copyright (c) 2013-2016, Fabio Cevasco, with Reserved Font Name 'HastyScribe'.
 
 Released under the terms of the [Open Font License](http://scripts.sil.org/OFL).

M doc/HastyScribe_UserGuide.htm → doc/HastyScribe_UserGuide.htm

@@ -84,6 +84,7 @@ <li><a href="#Standard.Markdown">Standard Markdown</a></li>
     <li><a href="#Discount.Extensions">Discount Extensions</a></li>
     <li><a href="#Text.Snippets">Text Snippets</a></li>
     <li><a href="#Custom.Fields">Custom Fields</a></li>
+    <li><a href="#Substitution.Macros">Substitution Macros</a></li>
     <li><a href="#Image..and.font..Embedding">Image (and font) Embedding</a></li>
     <li><a href="#FontAwesome.Icons">FontAwesome Icons</a></li>
     <li><a href="#Notes..tips..warnings..sidebars.and.badges">Notes, tips, warnings, sidebars and badges</a></li>
@@ -113,6 +114,7 @@ <ul>
    <li><a href="#Document.Headers">Document Headers</a></li>
    <li><a href="#Snippets">Snippets</a></li>
    <li><a href="#Fields">Fields</a></li>
+   <li><a href="#Macros">Macros</a></li>
    <li><a href="#Inline.Formatting">Inline Formatting</a>
    <ul>
     <li><a href="#SmartyPants.Substitutions">SmartyPants Substitutions</a></li>
@@ -210,6 +212,10 @@ <h4 id="Custom.Fields">Custom Fields<a href="#document-top" title="Go to top"></a></h4>
 
 <p>HastyScribe also supports <a href="#Fields">fields</a> to easily include things like the current date or time, but also custom values specified as command-line parameters.</p>
 
+<h4 id="Substitution.Macros">Substitution Macros<a href="#document-top" title="Go to top"></a></h4>
+
+<p>If you find yourself writing chunks of text that follows the same format except for some content, you can define simple text substitution <a href="#Macros">macros</a> for even higher content reuse.</p>
+
 <h4 id="Image..and.font..Embedding">Image (and font) Embedding<a href="#document-top" title="Go to top"></a></h4>
 
 <p>HastyScribe only produces single HTML files. With <em>no dependencies</em>:</p>
@@ -247,12 +253,12 @@ 
 <p>The easiest way to get HastyScribe is by downloading one of the prebuilt binaries from the <a href="https://github.com/h3rald/hastyscribe/releases/download/v">Github Release Page</a>:</p>
 
 <ul>
-<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v/hastyscribe_v_macosx_x64.zip">HastyScribe for Mac OS X (x64)</a> &ndash; Compiled on OS X El Capitan (LLVM CLANG 7.0)</li>
-<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v/hastyscribe_v_windows_x64.zip">HastyScribe for Windows (x64)</a> &ndash; Cross-compiled on OS X El Capitan (MinGW-w64 GCC 4.8.2)</li>
-<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v/hastyscribe_v_windows_x86.zip">HastyScribe for Windows (x86)</a> &ndash; Cross-compiled on OS X El Capitan (MinGW-w64 GCC 4.8.2)</li>
-<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v/hastyscribe_v_linux_x64.zip">HastyScribe for Linux (x64)</a> &ndash; Cross-compiled on OS X El Capitan (GNU GCC 4.8.1)</li>
-<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v/hastyscribe_v_linux_x86.zip">HastyScribe for Linux (x86)</a> &ndash; Cross-compiled on OS X El Capitan (GNU GCC 4.8.1)</li>
-<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v/hastyscribe_v_linux_arm.zip">HastyScribe for Linux (ARM)</a> &ndash; Cross-compiled on OS X El Capitan (GNU GCC 4.8.2)</li>
+<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.3.0/hastyscribe_v1.3.0_macos_x64.zip">HastyScribe for Mac OS X (x64)</a> &ndash; Compiled on Mac OS X Sierra (LLVM CLANG 8.0.0)</li>
+<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.3.0/hastyscribe_v1.3.0_windows_x64.zip">HastyScribe for Windows (x64)</a> &ndash; Cross-compiled on Mac OS X Sierra (MinGW-w64 GCC 4.8.2)</li>
+<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.3.0/hastyscribe_v1.3.0_windows_x86.zip">HastyScribe for Windows (x86)</a> &ndash; Cross-compiled on Mac OS X Sierra (MinGW-w64 GCC 4.8.2)</li>
+<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.3.0/hastyscribe_v1.3.0_linux_x64.zip">HastyScribe for Linux (x64)</a> &ndash; Cross-compiled on Mac OS X Sierra (GNU GCC 4.8.1)</li>
+<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.3.0/hastyscribe_v1.3.0_linux_x86.zip">HastyScribe for Linux (x86)</a> &ndash; Cross-compiled on Mac OS X Sierra (GNU GCC 4.8.1)</li>
+<li><a href="https://github.com/h3rald/hastyscribe/releases/download/v1.3.0/hastyscribe_v1.3.0_linux_arm.zip">HastyScribe for Linux (ARM)</a> &ndash; Cross-compiled on Mac OS X Sierra (GNU GCC 4.8.2)</li>
 </ul>
 
 
@@ -396,59 +402,59 @@ </thead>
 <tbody>
 <tr>
 <td><code>{{$timestamp}}</code>             </td>
-<td> 1466790332</td>
+<td> 1476008117</td>
 </tr>
 <tr>
 <td><code>{{$date}}</code>                  </td>
-<td> 2016-06-24</td>
+<td> 2016-10-09</td>
 </tr>
 <tr>
 <td><code>{{$full-date}}</code>             </td>
-<td> Friday, June 24, 2016</td>
+<td> Sunday, October 9, 2016</td>
 </tr>
 <tr>
 <td><code>{{$long-date}}</code>             </td>
-<td> June 24, 2016</td>
+<td> October 9, 2016</td>
 </tr>
 <tr>
 <td><code>{{$medium-date}}</code>           </td>
-<td> Jun 24, 2016</td>
+<td> Oct 9, 2016</td>
 </tr>
 <tr>
 <td><code>{{$short-date}}</code>            </td>
-<td> 6/24/16</td>
+<td> 10/9/16</td>
 </tr>
 <tr>
 <td><code>{{$short-time}}</code>            </td>
-<td> 19:45 PM</td>
+<td> 12:15 PM</td>
 </tr>
 <tr>
 <td><code>{{$short-time-24}}</code>         </td>
-<td> 19:45</td>
+<td> 12:15</td>
 </tr>
 <tr>
 <td><code>{{$time}}</code>                  </td>
-<td> 19:45:32 PM</td>
+<td> 12:15:17 PM</td>
 </tr>
 <tr>
 <td><code>{{$time-24}}</code>               </td>
-<td> 19:45:32</td>
+<td> 12:15:17</td>
 </tr>
 <tr>
 <td><code>{{$day}}</code>                   </td>
-<td> 24</td>
+<td> 09</td>
 </tr>
 <tr>
 <td><code>{{$short-day}}</code>             </td>
-<td> 24</td>
+<td> 9</td>
 </tr>
 <tr>
 <td><code>{{$month}}</code>                 </td>
-<td> 06</td>
+<td> 10</td>
 </tr>
 <tr>
 <td><code>{{$short-month}}</code>           </td>
-<td> 6</td>
+<td> 10</td>
 </tr>
 <tr>
 <td><code>{{$year}}</code>                  </td>
@@ -460,19 +466,19 @@ <td> 16</td>
 </tr>
 <tr>
 <td><code>{{$weekday}}</code>               </td>
-<td> Friday</td>
+<td> Sunday</td>
 </tr>
 <tr>
 <td><code>{{$weekday-abbr}}</code>          </td>
-<td> 24</td>
+<td> 09</td>
 </tr>
 <tr>
 <td><code>{{$month-name}}</code>            </td>
-<td> June</td>
+<td> October</td>
 </tr>
 <tr>
 <td><code>{{$month-name-abbr}}</code>       </td>
-<td> Jun</td>
+<td> Oct</td>
 </tr>
 <tr>
 <td><code>{{$timezone}}</code>              </td>
@@ -491,6 +497,25 @@ 
 <div class="terminal"><p>hastyscribe my-document.md &ndash;field/product:HastyScribe &ndash;field/version:1.2.0</p></div>
 
 <p>In this case it will be possible to access the <span class="kwd">product</span> and <span class="kwd">product</span> fields within <span class="file">my-document.md</span> using <code>{{$product}}</code> and <code>{{$version}}</code>.</p>
+
+<h3 id="Macros">Macros<a href="#document-top" title="Go to top"></a></h3>
+
+<p>If snippets are not enough, and you want to reuse chunks of <em>similar</em> content, you can define substitution macros using the following syntax:</p>
+
+<p><code>{#greet -> Hello, $1! Are you $2?#}</code></p>
+
+<p>This defines a macro called <span class="kwd">greet</span> that takes two parameters which will be substituted instead of <span class="kwd">$1</span> and <span class="kwd">$2</span>. To use the macro, use the following syntax:</p>
+
+<p><code>{#greet||Fabio||ready#}</code></p>
+
+<div class="note"><p>Note</p>
+
+<ul>
+<li>Like snippets, macros can be multiline.</li>
+<li>Spaces and newline character are preseved ad the start and end of parameters.</li>
+<li>You can use snippets and fields within macros (but you cannot nest macros inside other macros).</li>
+</ul>
+</div>
 
 <h3 id="Inline.Formatting">Inline Formatting<a href="#document-top" title="Go to top"></a></h3>
 
@@ -1341,7 +1366,7 @@ 
 <p style="text-align:center;"> <img src="data:image/png;base64,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" alt="Creative Commons Attribution-Noncommercial-No Derivative Works 3.0 Unported License" /></p>
     </div>
     <div id="footer">
-      <p><span class="copy"></span> Fabio Cevasco &ndash; June 24, 2016</p>
+      <p><span class="copy"></span> Fabio Cevasco &ndash; October 9, 2016</p>
       <p><span>Powered by</span> <a href="https://h3rald.com/hastyscribe"><span class="hastyscribe"></span></a></p>
     </div>
   </div>

M doc/HastyScribe_UserGuide.md → doc/HastyScribe_UserGuide.md

@@ -47,6 +47,11 @@ #### Custom Fields
 
 {{hs}} also supports [fields](#Fields) to easily include things like the current date or time, but also custom values specified as command-line parameters. 
 
+
+#### Substitution Macros
+
+If you find yourself writing chunks of text that follows the same format except for some content, you can define simple text substitution [macros](#Macros) for even higher content reuse.
+
 #### Image (and font) Embedding
 
 {{hs}} only produces single HTML files. With _no dependencies_:
@@ -79,14 +84,16 @@ ## Getting Started
 
 ### Downloading Pre-built Binaries
 
+{# release -> [HastyScribe for $1]({{release}}{{$version}}/hastyscribe_v{{$version}}_$2.zip) -- $3 #}
+
 The easiest way to get {{hs}} is by downloading one of the prebuilt binaries from the [Github Release Page][release]:
 
-  * [HastyScribe for Mac OS X (x64)]({{release}}{{$version}}/hastyscribe_v{{$version}}_macosx_x64.zip) -- Compiled on OS X El Capitan (LLVM CLANG 7.0)
-  * [HastyScribe for Windows (x64)]({{release}}{{$version}}/hastyscribe_v{{$version}}_windows_x64.zip) -- Cross-compiled on OS X El Capitan (MinGW-w64 GCC 4.8.2)
-  * [HastyScribe for Windows (x86)]({{release}}{{$version}}/hastyscribe_v{{$version}}_windows_x86.zip) -- Cross-compiled on OS X El Capitan (MinGW-w64 GCC 4.8.2)
-  * [HastyScribe for Linux (x64)]({{release}}{{$version}}/hastyscribe_v{{$version}}_linux_x64.zip) -- Cross-compiled on OS X El Capitan (GNU GCC 4.8.1)
-  * [HastyScribe for Linux (x86)]({{release}}{{$version}}/hastyscribe_v{{$version}}_linux_x86.zip) -- Cross-compiled on OS X El Capitan (GNU GCC 4.8.1)
-  * [HastyScribe for Linux (ARM)]({{release}}{{$version}}/hastyscribe_v{{$version}}_linux_arm.zip) -- Cross-compiled on OS X El Capitan (GNU GCC 4.8.2)
+  * {#release||Mac OS X (x64)||macos_x64||Compiled on {{osx -> Mac OS X Sierra}} (LLVM CLANG 8.0.0)#}
+  * {#release||Windows (x64)||windows_x64||{{xcc -> Cross-compiled on}} {{osx}} (MinGW-w64 GCC 4.8.2)#}
+  * {#release||Windows (x86)||windows_x86||{{xcc}} {{osx}} (MinGW-w64 GCC 4.8.2)#}
+  * {#release||Linux (x64)||linux_x64||{{xcc}} {{osx}} (GNU GCC 4.8.1)#}
+  * {#release||Linux (x86)||linux_x86||{{xcc}} {{osx}} (GNU GCC 4.8.1)#}
+  * {#release||Linux (ARM)||linux_arm||{{xcc}} {{osx}} (GNU GCC 4.8.2)#}
 
 ### Installing using Nimble
 
@@ -242,6 +249,23 @@ > %terminal%
 > hastyscribe my-document.md --field/product:HastyScribe --field/version:1.2.0
 
 In this case it will be possible to access the [product](class:kwd) and [product](class:kwd) fields within [my-document.md](class:file) using <code>\{\{$product\}\}</code> and <code>\{\{$version\}\}</code>.
+
+### Macros
+
+If snippets are not enough, and you want to reuse chunks of _similar_ content, you can define substitution macros using the following syntax:
+
+<code>\{#greet -> Hello, $1! Are you $2?#\}</code>
+
+This defines a macro called [greet](class:kwd) that takes two parameters which will be substituted instead of [$1](class:kwd) and [$2](class:kwd). To use the macro, use the following syntax:
+
+<code>\{#greet||Fabio||ready#\}</code>
+
+> %note%
+> Note
+> 
+> * Like snippets, macros can be multiline.
+> * Spaces and newline character are preseved ad the start and end of parameters.
+> * You can use snippets and fields within macros (but you cannot nest macros inside other macros).
 
 ### Inline Formatting

M hastyscribe.nim → hastyscribe.nim

@@ -73,7 +73,7 @@ peg_img = peg"""
     image <- '<img' \s+ 'src=' ["] {file} ["]
     file <- [^"]+
   """
-  peg_def = peg"""
+  peg_snippet_def = peg"""
     definition <- '{{' \s* {id} \s* '->' {@} '}}'
     id <- [a-zA-Z0-9_-]+
   """
@@ -85,11 +85,19 @@ peg_field = peg"""
     field <- '{{' \s* '$' {id} \s* '}}'
     id <- [a-zA-Z0-9_-]+
   """
+  peg_macro_def = peg"""
+    definition <- '{#' \s* {id} \s* '->' {@} '#}'
+    id <- [a-zA-Z0-9_-]+
+  """
+  peg_macro_instance = peg"""
+    instance <- "{#" \s* {id} \s*  "||" \s* {@}  "#}"
+    id <- [a-zA-Z0-9_-]+
+  """
 
 var FIELDS = initTable[string, proc():string]()
 
 
-var NOW:TimeInfo
+var NOW:TimeInfo = getTime().getLocalTime()
 
 FIELDS["timestamp"] = proc():string =
   return $NOW.toTime.toSeconds().int
@@ -232,7 +240,8 @@ if imgfile.startsWith(peg"'data:'"):
       continue
     elif imgfile.startsWith(peg"http[s]?'://'"):
       try:
-        imgcontent = encode_image(getContent(imgfile, timeout = 5000), imgformat)
+        let client = newHttpClient()
+        imgcontent = encode_image(client.getContent(imgfile), imgformat)
       except:
         stderr.writeLine "Warning: Unable to download '" & imgfile & "'"
         stderr.writeLine "  Reason: " & getCurrentExceptionMsg()
@@ -280,6 +289,36 @@ 
 proc embed_fonts*(): string=
   return style_tag(fonts.join);
 
+# Macro Definition:
+# {{#test -> This is a $1}}
+#
+# Macro Usage:
+# {{#test||simple test}}
+proc parse_macros*(document: string): string =
+  var macros:Table[string, string] = initTable[string, string]()
+  var doc = document
+  for def in findAll(document, peg_macro_def):
+    var matches: array[0..1, string]
+    discard def.match(peg_macro_def, matches)
+    let id = matches[0].strip
+    let value = matches[1].strip
+    macros[id] = value
+    doc = doc.replace(def, "")
+  for instance in findAll(doc, peg_macro_instance):
+    var matches: array[0..1, string]
+    discard instance.match(peg_macro_instance, matches)
+    let id = matches[0].strip
+    let value = matches[1].strip
+    let params = value.split("||")
+    if macros.hasKey(id):
+      try:
+        doc = doc.replace(instance, macros[id] % params)
+      except:
+        stderr.writeLine "Warning: Incorrect number of parameters specified for macro '$1'\n  -> Instance: $2" % [id, instance]
+    else:
+      stderr.writeLine "Warning: Macro '" & id & "' not defined."
+      doc = doc.replace(instance, "")
+  return doc
 
 # Field Usage:
 # {{$timestamp}}
@@ -310,9 +349,9 @@ type
     TSnippetDef = array[0..1, string]
     TSnippet = array[0..0, string]
   var doc = document
-  for def in findAll(document, peg_def):
+  for def in findAll(document, peg_snippet_def):
     var matches:TSnippetDef
-    discard def.match(peg_def, matches)
+    discard def.match(peg_snippet_def, matches)
     var id = matches[0].strip
     var value = matches[1].strip(true, false)
     snippets[id] = value
@@ -337,9 +376,10 @@ output_file = inputsplit.dir/inputsplit.name & ".htm"
 
   var source = input_file.readFile
 
-  # Parse fields and snippets
+  # Parse fields, snippets, and macros
   source = parse_fields(source)
   source = parse_snippets(source)
+  source = parse_macros(source)
 
   # Document Variables
   var metadata = TMDMetaData(title:"", author:"", date:"", toc:"", css:"")
@@ -443,6 +483,7 @@ of "output-file":
         output_file = val
       else:
         if key.startsWith("field/"):
+          let val = val
           FIELDS[key.replace("field/", "")] = proc(): string =
             return val
         discard

M hastyscribe.nimble → hastyscribe.nimble

@@ -1,6 +1,6 @@ 
 [Package]
 name          = "hastyscribe"
-version       = "1.2.1"
+version       = "1.3.0"
 author        = "Fabio Cevasco"
 description   = "Self-contained markdown compiler generating self-contained HTML documents"
 license       = "MIT"
@@ -45,4 +45,4 @@ vendor/libmarkdown_linux_arm.a
 """
 
 [Deps]
-Requires: "nimrod >= 0.14.0"
+Requires: "nimrod >= 0.15.0"

all repos — hastyscribe @ a4799ca4fa2d0849d318e578461681a9bab98bea

A professional markdown compiler.