diff --git a/docs/classes/pl.Date.html b/docs/classes/pl.Date.html
index 47d3d654..ab131b3e 100644
--- a/docs/classes/pl.Date.html
+++ b/docs/classes/pl.Date.html
@@ -274,7 +274,7 @@ <h2><a href="#Functions">Functions</a></h2>
 <h2><a href="#Methods">Methods</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#pl.Date:Date">pl.Date:Date (t, ...)</a></td>
+	<td class="name" nowrap><a href="#pl.date:Date">pl.date:Date (t, ...)</a></td>
 	<td class="summary">Date constructor.</td>
 	</tr>
 </table>
@@ -297,7 +297,7 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          seconds since epoch
         </li>
     </ul>
@@ -318,7 +318,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">ts</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          seconds ahead of UTC
         </li>
     </ul>
@@ -367,7 +367,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">y</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          Four-digit year
         </li>
     </ul>
@@ -388,7 +388,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">m</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          month
         </li>
     </ul>
@@ -409,7 +409,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">d</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          day
         </li>
     </ul>
@@ -430,7 +430,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">h</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          hour
         </li>
     </ul>
@@ -451,7 +451,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">min</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          minutes
         </li>
     </ul>
@@ -472,7 +472,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">sec</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          seconds
         </li>
     </ul>
@@ -493,7 +493,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">yday</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          day of year
         </li>
     </ul>
@@ -514,7 +514,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">y</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          Four-digit year
         </li>
     </ul>
@@ -619,7 +619,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">full</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          abbreviated if true, full otherwise.
         </li>
     </ul>
@@ -627,7 +627,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
         name
     </ol>
 
@@ -646,7 +646,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">full</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          abbreviated if true, full otherwise.
         </li>
     </ul>
@@ -654,7 +654,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
         name
     </ol>
 
@@ -852,7 +852,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          an interval in seconds
         </li>
     </ul>
@@ -887,7 +887,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fmt.</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A string where the following fields are significant:</p>
 
 <ul>
@@ -920,7 +920,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">df = Date.Format(<span class="string">"yyyy-mm-dd HH:MM:SS"</span>)</pre>
+        <pre class="example">df = Date.<span class="function-name">Format</span>(<span class="string">"yyyy-mm-dd HH:MM:SS"</span>)</pre>
     </ul>
 
 </dd>
@@ -935,7 +935,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">str</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a date string
         </li>
     </ul>
@@ -961,7 +961,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">d</span>
-         a date object, or a time value as returned by <a href="https://www.lua.org/manual/5.1/manual.html#pdf-os.time">os.time</a>
+         a date object, or a time value as returned by <a href="https://www.lua.org/manual/5.4/manual.html#pdf-os.time">os.time</a>
         </li>
     </ul>
 
@@ -1002,8 +1002,8 @@ <h2 class="section-header "><a name="Methods"></a>Methods</h2>
 
     <dl class="function">
     <dt>
-    <a name = "pl.Date:Date"></a>
-    <strong>pl.Date:Date (t, ...)</strong>
+    <a name = "pl.date:Date"></a>
+    <strong>pl.date:Date (t, ...)</strong>
     </dt>
     <dd>
     Date constructor.
@@ -1017,9 +1017,9 @@ <h3>Parameters:</h3>
 
 <ul>
     <li><code>nil</code> or empty - use current date and time</li>
-    <li>number - seconds since epoch (as returned by <a href="https://www.lua.org/manual/5.1/manual.html#pdf-os.time">os.time</a>). Resulting time is UTC</li>
+    <li>number - seconds since epoch (as returned by <a href="https://www.lua.org/manual/5.4/manual.html#pdf-os.time">os.time</a>). Resulting time is UTC</li>
     <li><a href="../classes/pl.Date.html">Date</a> - make a copy of this date</li>
-    <li>table - table containing year, month, etc as for <a href="https://www.lua.org/manual/5.1/manual.html#pdf-os.time">os.time</a>. You may leave out year, month or day,
+    <li>table - table containing year, month, etc as for <a href="https://www.lua.org/manual/5.4/manual.html#pdf-os.time">os.time</a>. You may leave out year, month or day,
     in which case current values will be used.</li>
     <li>year (will be followed by month, day etc)</li>
 </ul>
@@ -1042,7 +1042,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/classes/pl.List.html b/docs/classes/pl.List.html
index b84209f7..33e3d84f 100644
--- a/docs/classes/pl.List.html
+++ b/docs/classes/pl.List.html
@@ -161,7 +161,7 @@ <h2><a href="#Functions">Functions</a></h2>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#List:put">List:put (x)</a></td>
-	<td class="summary">Insert an item at the begining of the list.</td>
+	<td class="summary">Insert an item at the beginning of the list.</td>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#List:remove">List:remove (i)</a></td>
@@ -286,7 +286,7 @@ <h2><a href="#Functions">Functions</a></h2>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#List.iterate">List.iterate (seq)</a></td>
-	<td class="summary">Create an iterator over a seqence.</td>
+	<td class="summary">Create an iterator over a sequence.</td>
 	</tr>
 </table>
 <h2><a href="#metamethods">metamethods</a></h2>
@@ -346,7 +346,7 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">ls = List();  ls = List {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}</pre>
+        <pre class="example">ls = <span class="function-name">List</span>();  ls = <span class="function-name">List</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}</pre>
     </ul>
 
 </dd>
@@ -430,7 +430,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">i</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          index of element before whichh to insert
         </li>
         <li><span class="parameter">x</span>
@@ -453,7 +453,7 @@ <h3>Returns:</h3>
     <strong>List:put (x)</strong>
     </dt>
     <dd>
-    Insert an item at the begining of the list.
+    Insert an item at the beginning of the list.
 
 
     <h3>Parameters:</h3>
@@ -485,7 +485,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">i</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          the index
         </li>
     </ul>
@@ -541,7 +541,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">i</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          An index
          (<em>optional</em>)
         </li>
@@ -572,7 +572,7 @@ <h3>Parameters:</h3>
          A data value
         </li>
         <li><span class="parameter">idx</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          where to start search
          (<em>default</em> 1)
         </li>
@@ -649,7 +649,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">cmp</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          an optional comparison function
          (<em>default</em> '<')
         </li>
@@ -676,7 +676,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">cmp</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          an optional comparison function
          (<em>default</em> '<')
         </li>
@@ -794,17 +794,17 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">start</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          A number
         </li>
         <li><span class="parameter">finish</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          A number greater than start; if absent,
  then start is 1 and finish is start
          (<em>optional</em>)
         </li>
         <li><span class="parameter">incr</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          an increment (may be less than 1)
          (<em>default</em> 1)
         </li>
@@ -820,9 +820,9 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">List.range(<span class="number">0</span>,<span class="number">3</span>) == List{<span class="number">0</span>,<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}</pre></li>
-        <li><pre class="example">List.range(<span class="number">4</span>) = List{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}</pre></li>
-        <li><pre class="example">List.range(<span class="number">5</span>,<span class="number">1</span>,-<span class="number">1</span>) == List{<span class="number">5</span>,<span class="number">4</span>,<span class="number">3</span>,<span class="number">2</span>,<span class="number">1</span>}</pre></li>
+        <li><pre class="example">List.<span class="function-name">range</span>(<span class="number">0</span>,<span class="number">3</span>) == <span class="function-name">List</span>{<span class="number">0</span>,<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}</pre></li>
+        <li><pre class="example">List.<span class="function-name">range</span>(<span class="number">4</span>) = <span class="function-name">List</span>{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}</pre></li>
+        <li><pre class="example">List.<span class="function-name">range</span>(<span class="number">5</span>,<span class="number">1</span>,-<span class="number">1</span>) == <span class="function-name">List</span>{<span class="number">5</span>,<span class="number">4</span>,<span class="number">3</span>,<span class="number">2</span>,<span class="number">1</span>}</pre></li>
     </ul>
 
 </dd>
@@ -852,11 +852,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          start of range
         </li>
         <li><span class="parameter">i2</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          end of range
         </li>
     </ul>
@@ -883,7 +883,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">idx</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          index
         </li>
         <li><span class="parameter">list</span>
@@ -902,7 +902,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">l = List{<span class="number">10</span>,<span class="number">20</span>}; l:splice(<span class="number">2</span>,{<span class="number">21</span>,<span class="number">22</span>});  <span class="global">assert</span>(l == List{<span class="number">10</span>,<span class="number">21</span>,<span class="number">22</span>,<span class="number">20</span>})</pre>
+        <pre class="example">l = <span class="function-name">List</span>{<span class="number">10</span>,<span class="number">20</span>}; l:<span class="function-name">splice</span>(<span class="number">2</span>,{<span class="number">21</span>,<span class="number">22</span>});  <span class="global">assert</span>(l == <span class="function-name">List</span>{<span class="number">10</span>,<span class="number">21</span>,<span class="number">22</span>,<span class="number">20</span>})</pre>
     </ul>
 
 </dd>
@@ -917,11 +917,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
           start index
         </li>
         <li><span class="parameter">i2</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
           end index
         </li>
         <li><span class="parameter">seq</span>
@@ -952,7 +952,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">delim</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a delimiter string, can be empty.
          (<em>default</em> '')
         </li>
@@ -974,13 +974,13 @@ <h3>Returns:</h3>
     </dt>
     <dd>
     Join a list of strings.  <br>
- Uses <a href="https://www.lua.org/manual/5.1/manual.html#pdf-table.concat">table.concat</a> directly.
+ Uses <a href="https://www.lua.org/manual/5.4/manual.html#pdf-table.concat">table.concat</a> directly.
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">delim</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a delimiter
          (<em>default</em> '')
         </li>
@@ -1007,7 +1007,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function or callable object
         </li>
         <li><span class="parameter">...</span>
@@ -1031,7 +1031,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">name</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the method name
         </li>
         <li><span class="parameter">...</span>
@@ -1055,7 +1055,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a boolean function
         </li>
         <li><span class="parameter">arg</span>
@@ -1085,11 +1085,11 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">delim</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the delimiter (default spaces)
          (<em>optional</em>)
         </li>
@@ -1121,7 +1121,7 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of at least one argument
         </li>
         <li><span class="parameter">...</span>
@@ -1143,7 +1143,7 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">List{<span class="string">'one'</span>,<span class="string">'two'</span>}:map(<span class="global">string</span>.upper) == {<span class="string">'ONE'</span>,<span class="string">'TWO'</span>}</pre>
+        <pre class="example"><span class="function-name">List</span>{<span class="string">'one'</span>,<span class="string">'two'</span>}:<span class="function-name">map</span>(<span class="global">string</span>.upper) == {<span class="string">'ONE'</span>,<span class="string">'TWO'</span>}</pre>
     </ul>
 
 </dd>
@@ -1159,7 +1159,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          A function that takes at least one argument
         </li>
         <li><span class="parameter">...</span>
@@ -1189,7 +1189,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of at least two arguments
         </li>
         <li><span class="parameter">ls</span>
@@ -1227,7 +1227,7 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">name</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          name of method
         </li>
         <li><span class="parameter">...</span>
@@ -1260,7 +1260,7 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of two arguments
         </li>
     </ul>
@@ -1291,7 +1291,7 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of at least one argument
         </li>
         <li><span class="parameter">...</span>
@@ -1334,7 +1334,7 @@ <h3>See also:</h3>
     <strong>List.iterate (seq)</strong>
     </dt>
     <dd>
-    Create an iterator over a seqence.
+    Create an iterator over a sequence.
  This captures the Python concept of 'sequence'.
  For tables, iterates over all values with integer indices.
 
@@ -1351,8 +1351,8 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example"><span class="keyword">for</span> x <span class="keyword">in</span> iterate {<span class="number">1</span>,<span class="number">10</span>,<span class="number">22</span>,<span class="number">55</span>} <span class="keyword">do</span> <span class="global">io</span>.write(x,<span class="string">','</span>) <span class="keyword">end</span> ==&gt; <span class="number">1</span>,<span class="number">10</span>,<span class="number">22</span>,<span class="number">55</span></pre></li>
-        <li><pre class="example"><span class="keyword">for</span> ch <span class="keyword">in</span> iterate <span class="string">'help'</span> <span class="keyword">do</span> <span class="keyword">do</span> <span class="global">io</span>.write(ch,<span class="string">' '</span>) <span class="keyword">end</span> ==&gt; h e l p</pre></li>
+        <li><pre class="example"><span class="keyword">for</span> x <span class="keyword">in</span> <span class="function-name">iterate</span> {<span class="number">1</span>,<span class="number">10</span>,<span class="number">22</span>,<span class="number">55</span>} <span class="keyword">do</span> <span class="global">io</span>.<span class="function-name">write</span>(x,<span class="string">','</span>) <span class="keyword">end</span> ==&gt; <span class="number">1</span>,<span class="number">10</span>,<span class="number">22</span>,<span class="number">55</span></pre></li>
+        <li><pre class="example"><span class="keyword">for</span> ch <span class="keyword">in</span> <span class="function-name">iterate</span> <span class="string">'help'</span> <span class="keyword">do</span> <span class="keyword">do</span> <span class="global">io</span>.<span class="function-name">write</span>(ch,<span class="string">' '</span>) <span class="keyword">end</span> ==&gt; h e l p</pre></li>
     </ul>
 
 </dd>
@@ -1436,7 +1436,7 @@ <h3>See also:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/classes/pl.Map.html b/docs/classes/pl.Map.html
index 72b4b403..9ef1741f 100644
--- a/docs/classes/pl.Map.html
+++ b/docs/classes/pl.Map.html
@@ -127,9 +127,9 @@ <h1>Class <code>pl.Map</code></h1>
 
 <pre>
 &gt; Map = <span class="global">require</span> <span class="string">'pl.Map'</span>
-&gt; m = Map{one=<span class="number">1</span>,two=<span class="number">2</span>}
-&gt; m:update {three=<span class="number">3</span>,four=<span class="number">4</span>,two=<span class="number">20</span>}
-&gt; = m == M{one=<span class="number">1</span>,two=<span class="number">20</span>,three=<span class="number">3</span>,four=<span class="number">4</span>}
+&gt; m = <span class="function-name">Map</span>{one=<span class="number">1</span>,two=<span class="number">2</span>}
+&gt; m:<span class="function-name">update</span> {three=<span class="number">3</span>,four=<span class="number">4</span>,two=<span class="number">20</span>}
+&gt; = m == <span class="function-name">M</span>{one=<span class="number">1</span>,two=<span class="number">20</span>,three=<span class="number">3</span>,four=<span class="number">4</span>}
 <span class="keyword">true</span>
 </pre>
 
@@ -140,57 +140,57 @@ <h1>Class <code>pl.Map</code></h1>
 <h2><a href="#Fields">Fields</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map.keys">pl.Map.keys</a></td>
+	<td class="name" nowrap><a href="#pl.map.keys">pl.map.keys</a></td>
 	<td class="summary">list of keys.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map.values">pl.Map.values</a></td>
+	<td class="name" nowrap><a href="#pl.map.values">pl.map.values</a></td>
 	<td class="summary">list of values.</td>
 	</tr>
 </table>
 <h2><a href="#Methods">Methods</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:iter">pl.Map:iter ()</a></td>
+	<td class="name" nowrap><a href="#pl.map:iter">pl.map:iter ()</a></td>
 	<td class="summary">return an iterator over all key-value pairs.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:items">pl.Map:items ()</a></td>
+	<td class="name" nowrap><a href="#pl.map:items">pl.map:items ()</a></td>
 	<td class="summary">return a List of all key-value pairs, sorted by the keys.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:setdefault">pl.Map:setdefault (key, default)</a></td>
+	<td class="name" nowrap><a href="#pl.map:setdefault">pl.map:setdefault (key, default)</a></td>
 	<td class="summary">set a value in the map if it doesn't exist yet.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:len">pl.Map:len ()</a></td>
+	<td class="name" nowrap><a href="#pl.map:len">pl.map:len ()</a></td>
 	<td class="summary">size of map.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:set">pl.Map:set (key, val)</a></td>
+	<td class="name" nowrap><a href="#pl.map:set">pl.map:set (key, val)</a></td>
 	<td class="summary">put a value into the map.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:get">pl.Map:get (key)</a></td>
+	<td class="name" nowrap><a href="#pl.map:get">pl.map:get (key)</a></td>
 	<td class="summary">get a value from the map.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:getvalues">pl.Map:getvalues (keys)</a></td>
+	<td class="name" nowrap><a href="#pl.map:getvalues">pl.map:getvalues (keys)</a></td>
 	<td class="summary">get a list of values indexed by a list of keys.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:update">pl.Map:update (table)</a></td>
+	<td class="name" nowrap><a href="#pl.map:update">pl.map:update (table)</a></td>
 	<td class="summary">update the map using key/value pairs from another table.</td>
 	</tr>
 </table>
 <h2><a href="#Metamethods">Metamethods</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:__eq">pl.Map:__eq (m)</a></td>
+	<td class="name" nowrap><a href="#pl.map:__eq">pl.map:__eq (m)</a></td>
 	<td class="summary">equality between maps.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Map:__tostring">pl.Map:__tostring ()</a></td>
+	<td class="name" nowrap><a href="#pl.map:__tostring">pl.map:__tostring ()</a></td>
 	<td class="summary">string representation of a map.</td>
 	</tr>
 </table>
@@ -203,8 +203,8 @@ <h2 class="section-header "><a name="Fields"></a>Fields</h2>
 
     <dl class="function">
     <dt>
-    <a name = "pl.Map.keys"></a>
-    <strong>pl.Map.keys</strong>
+    <a name = "pl.map.keys"></a>
+    <strong>pl.map.keys</strong>
     </dt>
     <dd>
     list of keys.
@@ -217,8 +217,8 @@ <h2 class="section-header "><a name="Fields"></a>Fields</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Map.values"></a>
-    <strong>pl.Map.values</strong>
+    <a name = "pl.map.values"></a>
+    <strong>pl.map.values</strong>
     </dt>
     <dd>
     list of values.
@@ -235,8 +235,8 @@ <h2 class="section-header "><a name="Methods"></a>Methods</h2>
 
     <dl class="function">
     <dt>
-    <a name = "pl.Map:iter"></a>
-    <strong>pl.Map:iter ()</strong>
+    <a name = "pl.map:iter"></a>
+    <strong>pl.map:iter ()</strong>
     </dt>
     <dd>
     return an iterator over all key-value pairs.
@@ -249,8 +249,8 @@ <h2 class="section-header "><a name="Methods"></a>Methods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Map:items"></a>
-    <strong>pl.Map:items ()</strong>
+    <a name = "pl.map:items"></a>
+    <strong>pl.map:items ()</strong>
     </dt>
     <dd>
     return a List of all key-value pairs, sorted by the keys.
@@ -263,8 +263,8 @@ <h2 class="section-header "><a name="Methods"></a>Methods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Map:setdefault"></a>
-    <strong>pl.Map:setdefault (key, default)</strong>
+    <a name = "pl.map:setdefault"></a>
+    <strong>pl.map:setdefault (key, default)</strong>
     </dt>
     <dd>
     set a value in the map if it doesn't exist yet.
@@ -291,8 +291,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Map:len"></a>
-    <strong>pl.Map:len ()</strong>
+    <a name = "pl.map:len"></a>
+    <strong>pl.map:len ()</strong>
     </dt>
     <dd>
     size of map.
@@ -306,8 +306,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Map:set"></a>
-    <strong>pl.Map:set (key, val)</strong>
+    <a name = "pl.map:set"></a>
+    <strong>pl.map:set (key, val)</strong>
     </dt>
     <dd>
     put a value into the map.
@@ -330,8 +330,8 @@ <h3>Parameters:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Map:get"></a>
-    <strong>pl.Map:get (key)</strong>
+    <a name = "pl.map:get"></a>
+    <strong>pl.map:get (key)</strong>
     </dt>
     <dd>
     get a value from the map.
@@ -355,8 +355,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Map:getvalues"></a>
-    <strong>pl.Map:getvalues (keys)</strong>
+    <a name = "pl.map:getvalues"></a>
+    <strong>pl.map:getvalues (keys)</strong>
     </dt>
     <dd>
     get a list of values indexed by a list of keys.
@@ -380,8 +380,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Map:update"></a>
-    <strong>pl.Map:update (table)</strong>
+    <a name = "pl.map:update"></a>
+    <strong>pl.map:update (table)</strong>
     </dt>
     <dd>
     update the map using key/value pairs from another table.
@@ -390,7 +390,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">table</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
 
 
 
@@ -407,8 +407,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
     <dl class="function">
     <dt>
-    <a name = "pl.Map:__eq"></a>
-    <strong>pl.Map:__eq (m)</strong>
+    <a name = "pl.map:__eq"></a>
+    <strong>pl.map:__eq (m)</strong>
     </dt>
     <dd>
     equality between maps.
@@ -428,8 +428,8 @@ <h3>Parameters:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Map:__tostring"></a>
-    <strong>pl.Map:__tostring ()</strong>
+    <a name = "pl.map:__tostring"></a>
+    <strong>pl.map:__tostring ()</strong>
     </dt>
     <dd>
     string representation of a map.
@@ -447,7 +447,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/classes/pl.MultiMap.html b/docs/classes/pl.MultiMap.html
index b711b542..be7fe397 100644
--- a/docs/classes/pl.MultiMap.html
+++ b/docs/classes/pl.MultiMap.html
@@ -125,11 +125,11 @@ <h1>Class <code>pl.MultiMap</code></h1>
 <h2><a href="#Methods">Methods</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#pl.MultiMap:update">pl.MultiMap:update (t)</a></td>
+	<td class="name" nowrap><a href="#pl.multimap:update">pl.multimap:update (t)</a></td>
 	<td class="summary">update a MultiMap using a table.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.MultiMap:set">pl.MultiMap:set (key, val)</a></td>
+	<td class="name" nowrap><a href="#pl.multimap:set">pl.multimap:set (key, val)</a></td>
 	<td class="summary">add a new value to a key.</td>
 	</tr>
 </table>
@@ -142,8 +142,8 @@ <h2 class="section-header "><a name="Methods"></a>Methods</h2>
 
     <dl class="function">
     <dt>
-    <a name = "pl.MultiMap:update"></a>
-    <strong>pl.MultiMap:update (t)</strong>
+    <a name = "pl.multimap:update"></a>
+    <strong>pl.multimap:update (t)</strong>
     </dt>
     <dd>
     update a MultiMap using a table.
@@ -167,8 +167,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.MultiMap:set"></a>
-    <strong>pl.MultiMap:set (key, val)</strong>
+    <a name = "pl.multimap:set"></a>
+    <strong>pl.multimap:set (key, val)</strong>
     </dt>
     <dd>
     add a new value to a key.   Setting a nil value removes the key.
@@ -200,7 +200,7 @@ <h3>Returns:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/classes/pl.OrderedMap.html b/docs/classes/pl.OrderedMap.html
index 537af377..efc19473 100644
--- a/docs/classes/pl.OrderedMap.html
+++ b/docs/classes/pl.OrderedMap.html
@@ -128,46 +128,46 @@ <h1>Class <code>pl.OrderedMap</code></h1>
 <h2><a href="#Methods">Methods</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:_init">pl.OrderedMap:_init (t)</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:_init">pl.orderedmap:_init (t)</a></td>
 	<td class="summary">construct an OrderedMap.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:update">pl.OrderedMap:update (t)</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:update">pl.orderedmap:update (t)</a></td>
 	<td class="summary">update an OrderedMap using a table.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:set">pl.OrderedMap:set (key, val)</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:set">pl.orderedmap:set (key, val)</a></td>
 	<td class="summary">set the key's value.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:insert">pl.OrderedMap:insert (pos, key, val)</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:insert">pl.orderedmap:insert (pos, key, val)</a></td>
 	<td class="summary">insert a key/value pair before a given position.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:keys">pl.OrderedMap:keys ()</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:keys">pl.orderedmap:keys ()</a></td>
 	<td class="summary">return the keys in order.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:values">pl.OrderedMap:values ()</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:values">pl.orderedmap:values ()</a></td>
 	<td class="summary">return the values in order.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:sort">pl.OrderedMap:sort (cmp)</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:sort">pl.orderedmap:sort (cmp)</a></td>
 	<td class="summary">sort the keys.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:iter">pl.OrderedMap:iter ()</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:iter">pl.orderedmap:iter ()</a></td>
 	<td class="summary">iterate over key-value pairs in order.</td>
 	</tr>
 </table>
 <h2><a href="#Metamethods">Metamethods</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:__pairs">pl.OrderedMap:__pairs ()</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:__pairs">pl.orderedmap:__pairs ()</a></td>
 	<td class="summary">iterate over an ordered map (5.2).</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.OrderedMap:__tostring">pl.OrderedMap:__tostring ()</a></td>
+	<td class="name" nowrap><a href="#pl.orderedmap:__tostring">pl.orderedmap:__tostring ()</a></td>
 	<td class="summary">string representation of an ordered map.</td>
 	</tr>
 </table>
@@ -180,8 +180,8 @@ <h2 class="section-header "><a name="Methods"></a>Methods</h2>
 
     <dl class="function">
     <dt>
-    <a name = "pl.OrderedMap:_init"></a>
-    <strong>pl.OrderedMap:_init (t)</strong>
+    <a name = "pl.orderedmap:_init"></a>
+    <strong>pl.orderedmap:_init (t)</strong>
     </dt>
     <dd>
     construct an OrderedMap.
@@ -191,7 +191,7 @@ <h2 class="section-header "><a name="Methods"></a>Methods</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-         optional initialization table, same as for <a href="../classes/pl.OrderedMap.html#pl.OrderedMap:update">OrderedMap:update</a>
+         optional initialization table, same as for <a href="../classes/pl.OrderedMap.html#pl.orderedmap:update">OrderedMap:update</a>
         </li>
     </ul>
 
@@ -201,8 +201,8 @@ <h3>Parameters:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.OrderedMap:update"></a>
-    <strong>pl.OrderedMap:update (t)</strong>
+    <a name = "pl.orderedmap:update"></a>
+    <strong>pl.orderedmap:update (t)</strong>
     </dt>
     <dd>
     update an OrderedMap using a table.
@@ -215,7 +215,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table.
         </li>
     </ul>
@@ -233,8 +233,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.OrderedMap:set"></a>
-    <strong>pl.OrderedMap:set (key, val)</strong>
+    <a name = "pl.orderedmap:set"></a>
+    <strong>pl.orderedmap:set (key, val)</strong>
     </dt>
     <dd>
     set the key's value.    This key will be appended at the end of the map.</p>
@@ -263,8 +263,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.OrderedMap:insert"></a>
-    <strong>pl.OrderedMap:insert (pos, key, val)</strong>
+    <a name = "pl.orderedmap:insert"></a>
+    <strong>pl.orderedmap:insert (pos, key, val)</strong>
     </dt>
     <dd>
     insert a key/value pair before a given position.
@@ -276,7 +276,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">pos</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          a position starting at 1
         </li>
         <li><span class="parameter">key</span>
@@ -293,8 +293,8 @@ <h3>Parameters:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.OrderedMap:keys"></a>
-    <strong>pl.OrderedMap:keys ()</strong>
+    <a name = "pl.orderedmap:keys"></a>
+    <strong>pl.orderedmap:keys ()</strong>
     </dt>
     <dd>
     return the keys in order.
@@ -313,8 +313,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.OrderedMap:values"></a>
-    <strong>pl.OrderedMap:values ()</strong>
+    <a name = "pl.orderedmap:values"></a>
+    <strong>pl.orderedmap:values ()</strong>
     </dt>
     <dd>
     return the values in order.
@@ -333,8 +333,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.OrderedMap:sort"></a>
-    <strong>pl.OrderedMap:sort (cmp)</strong>
+    <a name = "pl.orderedmap:sort"></a>
+    <strong>pl.orderedmap:sort (cmp)</strong>
     </dt>
     <dd>
     sort the keys.
@@ -343,8 +343,8 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">cmp</span>
-            <span class="types"><span class="type">func</span></span>
-         a comparison function as for <a href="https://www.lua.org/manual/5.1/manual.html#pdf-table.sort">table.sort</a>
+            <span class="types"><span class="type">function</span></span>
+         a comparison function as for <a href="https://www.lua.org/manual/5.4/manual.html#pdf-table.sort">table.sort</a>
         </li>
     </ul>
 
@@ -359,8 +359,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.OrderedMap:iter"></a>
-    <strong>pl.OrderedMap:iter ()</strong>
+    <a name = "pl.orderedmap:iter"></a>
+    <strong>pl.orderedmap:iter ()</strong>
     </dt>
     <dd>
     iterate over key-value pairs in order.
@@ -377,8 +377,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
     <dl class="function">
     <dt>
-    <a name = "pl.OrderedMap:__pairs"></a>
-    <strong>pl.OrderedMap:__pairs ()</strong>
+    <a name = "pl.orderedmap:__pairs"></a>
+    <strong>pl.orderedmap:__pairs ()</strong>
     </dt>
     <dd>
     iterate over an ordered map (5.2).
@@ -391,8 +391,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.OrderedMap:__tostring"></a>
-    <strong>pl.OrderedMap:__tostring ()</strong>
+    <a name = "pl.orderedmap:__tostring"></a>
+    <strong>pl.orderedmap:__tostring ()</strong>
     </dt>
     <dd>
     string representation of an ordered map.
@@ -410,7 +410,7 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/classes/pl.Set.html b/docs/classes/pl.Set.html
index 31cfceee..f351e4dc 100644
--- a/docs/classes/pl.Set.html
+++ b/docs/classes/pl.Set.html
@@ -126,14 +126,14 @@ <h1>Class <code>pl.Set</code></h1>
 
 <pre>
 &gt; Set = <span class="global">require</span> <span class="string">'pl.Set'</span>
-&gt; = Set{<span class="string">'one'</span>,<span class="string">'two'</span>} == Set{<span class="string">'two'</span>,<span class="string">'one'</span>}
+&gt; = <span class="function-name">Set</span>{<span class="string">'one'</span>,<span class="string">'two'</span>} == <span class="function-name">Set</span>{<span class="string">'two'</span>,<span class="string">'one'</span>}
 <span class="keyword">true</span>
-&gt; fruit = Set{<span class="string">'apple'</span>,<span class="string">'banana'</span>,<span class="string">'orange'</span>}
+&gt; fruit = <span class="function-name">Set</span>{<span class="string">'apple'</span>,<span class="string">'banana'</span>,<span class="string">'orange'</span>}
 &gt; = fruit[<span class="string">'banana'</span>]
 <span class="keyword">true</span>
 &gt; = fruit[<span class="string">'hazelnut'</span>]
 <span class="keyword">nil</span>
-&gt; colours = Set{<span class="string">'red'</span>,<span class="string">'orange'</span>,<span class="string">'green'</span>,<span class="string">'blue'</span>}
+&gt; colours = <span class="function-name">Set</span>{<span class="string">'red'</span>,<span class="string">'orange'</span>,<span class="string">'green'</span>,<span class="string">'blue'</span>}
 &gt; = fruit,colours
 [apple,orange,banana]   [blue,green,orange,red]
 &gt; = fruit+colours
@@ -152,78 +152,78 @@ <h1>Class <code>pl.Set</code></h1>
 <h2><a href="#Methods">Methods</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:Set">pl.Set:Set (t)</a></td>
+	<td class="name" nowrap><a href="#pl.set:Set">pl.set:Set (t)</a></td>
 	<td class="summary">create a set.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:values">pl.Set:values (self)</a></td>
+	<td class="name" nowrap><a href="#pl.set:values">pl.set:values (self)</a></td>
 	<td class="summary">get a list of the values in a set.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:map">pl.Set:map (self, fn, ...)</a></td>
+	<td class="name" nowrap><a href="#pl.set:map">pl.set:map (self, fn, ...)</a></td>
 	<td class="summary">map a function over the values of a set.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:union">pl.Set:union (self, set)</a></td>
+	<td class="name" nowrap><a href="#pl.set:union">pl.set:union (self, set)</a></td>
 	<td class="summary">union of two sets (also +).</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:intersection">pl.Set:intersection (self, set)</a></td>
+	<td class="name" nowrap><a href="#pl.set:intersection">pl.set:intersection (self, set)</a></td>
 	<td class="summary">intersection of two sets (also *).</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:difference">pl.Set:difference (self, set)</a></td>
+	<td class="name" nowrap><a href="#pl.set:difference">pl.set:difference (self, set)</a></td>
 	<td class="summary">new set with elements in the set that are not in the other (also -).</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:issubset">pl.Set:issubset (self, set)</a></td>
+	<td class="name" nowrap><a href="#pl.set:issubset">pl.set:issubset (self, set)</a></td>
 	<td class="summary">is the first set a subset of the second (also &lt;)?.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:isempty">pl.Set:isempty (self)</a></td>
+	<td class="name" nowrap><a href="#pl.set:isempty">pl.set:isempty (self)</a></td>
 	<td class="summary">is the set empty?.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:isdisjoint">pl.Set:isdisjoint (s1, s2)</a></td>
+	<td class="name" nowrap><a href="#pl.set:isdisjoint">pl.set:isdisjoint (s1, s2)</a></td>
 	<td class="summary">are the sets disjoint?</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:len">pl.Set:len (s)</a></td>
+	<td class="name" nowrap><a href="#pl.set:len">pl.set:len (s)</a></td>
 	<td class="summary">size of this set (also # for 5.2).</td>
 	</tr>
 </table>
 <h2><a href="#Metamethods">Metamethods</a></h2>
 <table class="function_list">
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:__tostring">pl.Set:__tostring ()</a></td>
+	<td class="name" nowrap><a href="#pl.set:__tostring">pl.set:__tostring ()</a></td>
 	<td class="summary">string representation of a set.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:__add">pl.Set:__add ()</a></td>
+	<td class="name" nowrap><a href="#pl.set:__add">pl.set:__add ()</a></td>
 	<td class="summary">union of sets.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:__mul">pl.Set:__mul ()</a></td>
+	<td class="name" nowrap><a href="#pl.set:__mul">pl.set:__mul ()</a></td>
 	<td class="summary">intersection of sets.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:__sub">pl.Set:__sub ()</a></td>
+	<td class="name" nowrap><a href="#pl.set:__sub">pl.set:__sub ()</a></td>
 	<td class="summary">difference of sets.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:__pow">pl.Set:__pow ()</a></td>
+	<td class="name" nowrap><a href="#pl.set:__pow">pl.set:__pow ()</a></td>
 	<td class="summary">symmetric difference of sets.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:__lt">pl.Set:__lt ()</a></td>
+	<td class="name" nowrap><a href="#pl.set:__lt">pl.set:__lt ()</a></td>
 	<td class="summary">first set subset of second?</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:__len">pl.Set:__len ()</a></td>
+	<td class="name" nowrap><a href="#pl.set:__len">pl.set:__len ()</a></td>
 	<td class="summary">cardinality of set (5.2).</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#pl.Set:__eq">pl.Set:__eq (s1, s2)</a></td>
+	<td class="name" nowrap><a href="#pl.set:__eq">pl.set:__eq (s1, s2)</a></td>
 	<td class="summary">equality between sets.</td>
 	</tr>
 </table>
@@ -236,8 +236,8 @@ <h2 class="section-header "><a name="Methods"></a>Methods</h2>
 
     <dl class="function">
     <dt>
-    <a name = "pl.Set:Set"></a>
-    <strong>pl.Set:Set (t)</strong>
+    <a name = "pl.set:Set"></a>
+    <strong>pl.set:Set (t)</strong>
     </dt>
     <dd>
     create a set.  <br>
@@ -256,8 +256,8 @@ <h3>Parameters:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Set:values"></a>
-    <strong>pl.Set:values (self)</strong>
+    <a name = "pl.set:values"></a>
+    <strong>pl.set:values (self)</strong>
     </dt>
     <dd>
     get a list of the values in a set.
@@ -281,8 +281,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Set:map"></a>
-    <strong>pl.Set:map (self, fn, ...)</strong>
+    <a name = "pl.set:map"></a>
+    <strong>pl.set:map (self, fn, ...)</strong>
     </dt>
     <dd>
     map a function over the values of a set.
@@ -312,8 +312,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Set:union"></a>
-    <strong>pl.Set:union (self, set)</strong>
+    <a name = "pl.set:union"></a>
+    <strong>pl.set:union (self, set)</strong>
     </dt>
     <dd>
     union of two sets (also +).
@@ -340,8 +340,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Set:intersection"></a>
-    <strong>pl.Set:intersection (self, set)</strong>
+    <a name = "pl.set:intersection"></a>
+    <strong>pl.set:intersection (self, set)</strong>
     </dt>
     <dd>
     intersection of two sets (also *).
@@ -367,11 +367,11 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">&gt; s = Set{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
-&gt; t = Set{<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>}
+        <pre class="example">&gt; s = <span class="function-name">Set</span>{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
+&gt; t = <span class="function-name">Set</span>{<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>}
 &gt; = t
 [<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>]
-&gt; = Set.intersection(s,t)
+&gt; = Set.<span class="function-name">intersection</span>(s,t)
 [<span class="number">30</span>,<span class="number">20</span>]
 &gt; = s*t
 [<span class="number">30</span>,<span class="number">20</span>]</pre>
@@ -379,8 +379,8 @@ <h3>Usage:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Set:difference"></a>
-    <strong>pl.Set:difference (self, set)</strong>
+    <a name = "pl.set:difference"></a>
+    <strong>pl.set:difference (self, set)</strong>
     </dt>
     <dd>
     new set with elements in the set that are not in the other (also -).
@@ -407,8 +407,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Set:issubset"></a>
-    <strong>pl.Set:issubset (self, set)</strong>
+    <a name = "pl.set:issubset"></a>
+    <strong>pl.set:issubset (self, set)</strong>
     </dt>
     <dd>
     is the first set a subset of the second (also &lt;)?.
@@ -435,8 +435,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Set:isempty"></a>
-    <strong>pl.Set:isempty (self)</strong>
+    <a name = "pl.set:isempty"></a>
+    <strong>pl.set:isempty (self)</strong>
     </dt>
     <dd>
     is the set empty?.
@@ -460,8 +460,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Set:isdisjoint"></a>
-    <strong>pl.Set:isdisjoint (s1, s2)</strong>
+    <a name = "pl.set:isdisjoint"></a>
+    <strong>pl.set:isdisjoint (s1, s2)</strong>
     </dt>
     <dd>
     are the sets disjoint?  (no elements in common).
@@ -489,8 +489,8 @@ <h3>Returns:</h3>
 
 </dd>
     <dt>
-    <a name = "pl.Set:len"></a>
-    <strong>pl.Set:len (s)</strong>
+    <a name = "pl.set:len"></a>
+    <strong>pl.set:len (s)</strong>
     </dt>
     <dd>
     size of this set (also # for 5.2).
@@ -518,8 +518,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
     <dl class="function">
     <dt>
-    <a name = "pl.Set:__tostring"></a>
-    <strong>pl.Set:__tostring ()</strong>
+    <a name = "pl.set:__tostring"></a>
+    <strong>pl.set:__tostring ()</strong>
     </dt>
     <dd>
     string representation of a set.
@@ -532,8 +532,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Set:__add"></a>
-    <strong>pl.Set:__add ()</strong>
+    <a name = "pl.set:__add"></a>
+    <strong>pl.set:__add ()</strong>
     </dt>
     <dd>
     union of sets.
@@ -546,8 +546,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Set:__mul"></a>
-    <strong>pl.Set:__mul ()</strong>
+    <a name = "pl.set:__mul"></a>
+    <strong>pl.set:__mul ()</strong>
     </dt>
     <dd>
     intersection of sets.
@@ -560,8 +560,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Set:__sub"></a>
-    <strong>pl.Set:__sub ()</strong>
+    <a name = "pl.set:__sub"></a>
+    <strong>pl.set:__sub ()</strong>
     </dt>
     <dd>
     difference of sets.
@@ -574,8 +574,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Set:__pow"></a>
-    <strong>pl.Set:__pow ()</strong>
+    <a name = "pl.set:__pow"></a>
+    <strong>pl.set:__pow ()</strong>
     </dt>
     <dd>
     symmetric difference of sets.
@@ -588,8 +588,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Set:__lt"></a>
-    <strong>pl.Set:__lt ()</strong>
+    <a name = "pl.set:__lt"></a>
+    <strong>pl.set:__lt ()</strong>
     </dt>
     <dd>
     first set subset of second?
@@ -602,8 +602,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Set:__len"></a>
-    <strong>pl.Set:__len ()</strong>
+    <a name = "pl.set:__len"></a>
+    <strong>pl.set:__len ()</strong>
     </dt>
     <dd>
     cardinality of set (5.2).
@@ -616,8 +616,8 @@ <h2 class="section-header "><a name="Metamethods"></a>Metamethods</h2>
 
 </dd>
     <dt>
-    <a name = "pl.Set:__eq"></a>
-    <strong>pl.Set:__eq (s1, s2)</strong>
+    <a name = "pl.set:__eq"></a>
+    <strong>pl.set:__eq (s1, s2)</strong>
     </dt>
     <dd>
     equality between sets.
@@ -648,7 +648,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/seesubst.lua.html b/docs/examples/seesubst.lua.html
index e850122a..1679fd71 100644
--- a/docs/examples/seesubst.lua.html
+++ b/docs/examples/seesubst.lua.html
@@ -133,26 +133,26 @@ <h2>seesubst.lua</h2>
 
 <span class="keyword">local</span> _gsub_patterns = {}
 
-<span class="keyword">local</span> <span class="keyword">function</span> gsub (s,pat,subst,start)
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">gsub</span> (s,pat,subst,start)
     <span class="keyword">local</span> fpat = _gsub_patterns[pat]
     <span class="keyword">if</span> <span class="keyword">not</span> fpat <span class="keyword">then</span>
         <span class="comment">-- use SIP to generate a proper string pattern.
 </span>        <span class="comment">-- the _whole thing_ is a capture, to get the whole match
 </span>        <span class="comment">-- and the unnamed capture.
-</span>        fpat = <span class="string">'('</span>..sip.create_pattern(pat)..<span class="string">')'</span>
+</span>        fpat = <span class="string">'('</span>..sip.<span class="function-name">create_pattern</span>(pat)..<span class="string">')'</span>
         _gsub_patterns[pat] = fpat
     <span class="keyword">end</span>
-    <span class="keyword">return</span> s:gsub(fpat,subst,start)
+    <span class="keyword">return</span> s:<span class="function-name">gsub</span>(fpat,subst,start)
 <span class="keyword">end</span>
 
 
-<span class="keyword">local</span> mod = sip.compile <span class="string">'$v.$v'</span>
-<span class="keyword">local</span> fun = sip.compile <span class="string">'$v.$v.$v'</span>
+<span class="keyword">local</span> mod = sip.<span class="function-name">compile</span> <span class="string">'$v.$v'</span>
+<span class="keyword">local</span> fun = sip.<span class="function-name">compile</span> <span class="string">'$v.$v.$v'</span>
 
-<span class="keyword">for</span> line <span class="keyword">in</span> stringx.lines(s) <span class="keyword">do</span>
-    line = gsub(line,<span class="string">'@see $p'</span>,<span class="keyword">function</span>(see,path)
-        <span class="keyword">if</span> fun(path,res) <span class="keyword">or</span> mod(path,res) <span class="keyword">then</span>
-            <span class="keyword">local</span> ret = (<span class="string">'[see %s](%s.%s.html'</span>):format(path,res[<span class="number">1</span>],res[<span class="number">2</span>])
+<span class="keyword">for</span> line <span class="keyword">in</span> stringx.<span class="function-name">lines</span>(s) <span class="keyword">do</span>
+    line = <span class="function-name">gsub</span>(line,<span class="string">'@see $p'</span>,<span class="keyword">function</span>(see,path)
+        <span class="keyword">if</span> <span class="function-name">fun</span>(path,res) <span class="keyword">or</span> <span class="function-name">mod</span>(path,res) <span class="keyword">then</span>
+            <span class="keyword">local</span> ret = (<span class="string">'[see %s](%s.%s.html'</span>):<span class="function-name">format</span>(path,res[<span class="number">1</span>],res[<span class="number">2</span>])
             <span class="keyword">if</span> res[<span class="number">3</span>] <span class="keyword">then</span>
                 <span class="keyword">return</span> ret..<span class="string">'#'</span>..res[<span class="number">3</span>]..<span class="string">')'</span>
             <span class="keyword">else</span>
@@ -167,7 +167,7 @@ <h2>seesubst.lua</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/sipscan.lua.html b/docs/examples/sipscan.lua.html
index 8848423b..b8813585 100644
--- a/docs/examples/sipscan.lua.html
+++ b/docs/examples/sipscan.lua.html
@@ -137,10 +137,10 @@ <h2>sipscan.lua</h2>
 <span class="keyword">local</span> expected
 <span class="keyword">local</span> res = {}
 <span class="keyword">local</span> pat = <span class="string">'SYNC [$i{seq}] $i{diff} $i{val}'</span>
-<span class="global">print</span>(sip.create_pattern(pat))
-<span class="keyword">local</span> match = sip.compile(pat)
-<span class="keyword">for</span> line <span class="keyword">in</span> stringx.lines(s) <span class="keyword">do</span>
-  <span class="keyword">if</span> match(line,res) <span class="keyword">then</span>
+<span class="global">print</span>(sip.<span class="function-name">create_pattern</span>(pat))
+<span class="keyword">local</span> match = sip.<span class="function-name">compile</span>(pat)
+<span class="keyword">for</span> line <span class="keyword">in</span> stringx.<span class="function-name">lines</span>(s) <span class="keyword">do</span>
+  <span class="keyword">if</span> <span class="function-name">match</span>(line,res) <span class="keyword">then</span>
     <span class="keyword">if</span> first <span class="keyword">then</span>
       expected = res.val
       first = <span class="keyword">false</span>
@@ -154,7 +154,7 @@ <h2>sipscan.lua</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/symbols.lua.html b/docs/examples/symbols.lua.html
index 0dafb21d..3a3b4a31 100644
--- a/docs/examples/symbols.lua.html
+++ b/docs/examples/symbols.lua.html
@@ -116,24 +116,24 @@ <h2>Manual</h2>
     <h2>symbols.lua</h2>
 <pre>
 <span class="global">require</span> <span class="string">'pl'</span>
-utils.import <span class="string">'pl.func'</span>
+utils.<span class="function-name">import</span> <span class="string">'pl.func'</span>
 <span class="keyword">local</span> ops = <span class="global">require</span> <span class="string">'pl.operator'</span>
 <span class="keyword">local</span> List = <span class="global">require</span> <span class="string">'pl.List'</span>
 <span class="keyword">local</span> append,concat = <span class="global">table</span>.insert,<span class="global">table</span>.concat
 <span class="keyword">local</span> compare,find_if,compare_no_order,imap,reduce,count_map = tablex.compare,tablex.find_if,tablex.compare_no_order,tablex.imap,tablex.reduce,tablex.count_map
-<span class="keyword">local</span> <span class="global">unpack</span> = <span class="global">table</span>.<span class="global">unpack</span>
+<span class="keyword">local</span> unpack = <span class="global">table</span>.unpack
 
-<span class="keyword">function</span> bindval (self,val)
+<span class="keyword">function</span> <span class="function-name">bindval</span> (self,val)
     <span class="global">rawset</span>(self,<span class="string">'value'</span>,val)
 <span class="keyword">end</span>
 
 <span class="keyword">local</span> optable = ops.optable
 
-<span class="keyword">function</span> sexpr (e)
-	<span class="keyword">if</span> isPE(e) <span class="keyword">then</span>
+<span class="keyword">function</span> <span class="function-name">sexpr</span> (e)
+	<span class="keyword">if</span> <span class="function-name">isPE</span>(e) <span class="keyword">then</span>
 		<span class="keyword">if</span> e.op ~= <span class="string">'X'</span> <span class="keyword">then</span>
-			<span class="keyword">local</span> args = tablex.imap(sexpr,e)
-			<span class="keyword">return</span> <span class="string">'('</span>..e.op..<span class="string">' '</span>..<span class="global">table</span>.concat(args,<span class="string">' '</span>)..<span class="string">')'</span>
+			<span class="keyword">local</span> args = tablex.<span class="function-name">imap</span>(sexpr,e)
+			<span class="keyword">return</span> <span class="string">'('</span>..e.op..<span class="string">' '</span>..<span class="global">table</span>.<span class="function-name">concat</span>(args,<span class="string">' '</span>)..<span class="string">')'</span>
 		<span class="keyword">else</span>
 			<span class="keyword">return</span> e.repr
 		<span class="keyword">end</span>
@@ -143,12 +143,12 @@ <h2>symbols.lua</h2>
 <span class="keyword">end</span>
 
 
-psexpr = compose(<span class="global">print</span>,sexpr)
+psexpr = <span class="function-name">compose</span>(<span class="global">print</span>,sexpr)
 
 
 
-<span class="keyword">function</span> equals (e1,e2)
-    <span class="keyword">local</span> p1,p2 = isPE(e1),isPE(e2)
+<span class="keyword">function</span> <span class="function-name">equals</span> (e1,e2)
+    <span class="keyword">local</span> p1,p2 = <span class="function-name">isPE</span>(e1),<span class="function-name">isPE</span>(e2)
     <span class="keyword">if</span> p1 ~= p2 <span class="keyword">then</span> <span class="keyword">return</span> <span class="keyword">false</span> <span class="keyword">end</span>  <span class="comment">-- different kinds of animals!
 </span>    <span class="keyword">if</span> p1 <span class="keyword">and</span> p2 <span class="keyword">then</span> <span class="comment">-- both PEs
 </span>        <span class="comment">-- operators must be the same
@@ -157,10 +157,10 @@ <h2>symbols.lua</h2>
 </span>        <span class="keyword">if</span> e1.op == <span class="string">'X'</span> <span class="keyword">then</span> <span class="keyword">return</span> e1.repr == e2.repr
         <span class="comment">-- commutative operators
 </span>        <span class="keyword">elseif</span> e1.op == <span class="string">'+'</span> <span class="keyword">or</span> e1.op == <span class="string">'*'</span> <span class="keyword">then</span>
-            <span class="keyword">return</span> compare_no_order(e1,e2,equals)
+            <span class="keyword">return</span> <span class="function-name">compare_no_order</span>(e1,e2,equals)
         <span class="keyword">else</span>
             <span class="comment">-- arguments must be the same
-</span>            <span class="keyword">return</span> compare(e1,e2,equals)
+</span>            <span class="keyword">return</span> <span class="function-name">compare</span>(e1,e2,equals)
         <span class="keyword">end</span>
     <span class="keyword">else</span> <span class="comment">-- fall back on simple equality for non PEs
 </span>        <span class="keyword">return</span> e1 == e2
@@ -168,33 +168,33 @@ <h2>symbols.lua</h2>
 <span class="keyword">end</span>
 
 <span class="comment">-- run down an unbalanced operator chain (like a+b+c) and return the arguments {a,b,c}
-</span><span class="keyword">function</span> tcollect (op,e,ls)
-    <span class="keyword">if</span> isPE(e) <span class="keyword">and</span> e.op == op <span class="keyword">then</span>
+</span><span class="keyword">function</span> <span class="function-name">tcollect</span> (op,e,ls)
+    <span class="keyword">if</span> <span class="function-name">isPE</span>(e) <span class="keyword">and</span> e.op == op <span class="keyword">then</span>
         <span class="keyword">for</span> i = <span class="number">1</span>,#e <span class="keyword">do</span>
-            tcollect(op,e[i],ls)
+            <span class="function-name">tcollect</span>(op,e[i],ls)
         <span class="keyword">end</span>
     <span class="keyword">else</span>
-        ls:append(e)
+        ls:<span class="function-name">append</span>(e)
         <span class="keyword">return</span>
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 
-<span class="keyword">function</span> rcollect (e)
-    <span class="keyword">local</span> res = List()
-    tcollect(e.op,e,res)
+<span class="keyword">function</span> <span class="function-name">rcollect</span> (e)
+    <span class="keyword">local</span> res = <span class="function-name">List</span>()
+    <span class="function-name">tcollect</span>(e.op,e,res)
     <span class="keyword">return</span> res
 <span class="keyword">end</span>
 
 
 <span class="comment">-- balance ensures that +/* chains are collected together, operates in-place.
 </span><span class="comment">-- thus (+(+ a b) c) or (+ a (+ b c)) becomes (+ a b c), order immaterial
-</span><span class="keyword">function</span> balance (e)
-    <span class="keyword">if</span> isPE(e) <span class="keyword">and</span> e.op ~= <span class="string">'X'</span> <span class="keyword">then</span>
+</span><span class="keyword">function</span> <span class="function-name">balance</span> (e)
+    <span class="keyword">if</span> <span class="function-name">isPE</span>(e) <span class="keyword">and</span> e.op ~= <span class="string">'X'</span> <span class="keyword">then</span>
         <span class="keyword">local</span> op,args = e.op
         <span class="keyword">if</span> op == <span class="string">'+'</span> <span class="keyword">or</span> op == <span class="string">'*'</span> <span class="keyword">then</span>
-            args = rcollect(e)
+            args = <span class="function-name">rcollect</span>(e)
         <span class="keyword">else</span>
-            args = imap(balance,e)
+            args = <span class="function-name">imap</span>(balance,e)
         <span class="keyword">end</span>
         <span class="keyword">for</span> i = <span class="number">1</span>,#args <span class="keyword">do</span>
             e[i] = args[i]
@@ -204,8 +204,8 @@ <h2>symbols.lua</h2>
 <span class="keyword">end</span>
 
 <span class="comment">-- fold constants in an expression
-</span><span class="keyword">function</span> fold (e)
-    <span class="keyword">if</span> isPE(e) <span class="keyword">then</span>
+</span><span class="keyword">function</span> <span class="function-name">fold</span> (e)
+    <span class="keyword">if</span> <span class="function-name">isPE</span>(e) <span class="keyword">then</span>
         <span class="keyword">if</span> e.op == <span class="string">'X'</span> <span class="keyword">then</span>
             <span class="comment">-- there could be _bound values_!
 </span>            <span class="keyword">local</span> val = <span class="global">rawget</span>(e,<span class="string">'value'</span>)
@@ -214,24 +214,24 @@ <h2>symbols.lua</h2>
             <span class="keyword">local</span> op = e.op
             <span class="keyword">local</span> addmul = op == <span class="string">'*'</span> <span class="keyword">or</span> op == <span class="string">'+'</span>
             <span class="comment">-- first fold all arguments
-</span>            <span class="keyword">local</span> args = imap(fold,e)
-            <span class="keyword">if</span> <span class="keyword">not</span> addmul <span class="keyword">and</span> <span class="keyword">not</span> find_if(args,isPE) <span class="keyword">then</span>
+</span>            <span class="keyword">local</span> args = <span class="function-name">imap</span>(fold,e)
+            <span class="keyword">if</span> <span class="keyword">not</span> addmul <span class="keyword">and</span> <span class="keyword">not</span> <span class="function-name">find_if</span>(args,isPE) <span class="keyword">then</span>
                 <span class="comment">-- no placeholders in these args, we can fold the expression.
 </span>                <span class="keyword">local</span> opfn = optable[op]
                 <span class="keyword">if</span> opfn <span class="keyword">then</span>
-                    <span class="keyword">return</span> opfn(<span class="global">unpack</span>(args))
+                    <span class="keyword">return</span> <span class="function-name">opfn</span>(<span class="function-name">unpack</span>(args))
                 <span class="keyword">else</span>
                     <span class="keyword">return</span> <span class="string">'?'</span>
                 <span class="keyword">end</span>
             <span class="keyword">elseif</span> addmul <span class="keyword">then</span>
                 <span class="comment">-- enforce a few rules for + and *
 </span>                <span class="comment">-- split the args into two classes, PE args and non-PE args.
-</span>                <span class="keyword">local</span> classes = List.partition(args,isPE)
+</span>                <span class="keyword">local</span> classes = List.<span class="function-name">partition</span>(args,isPE)
                 <span class="keyword">local</span> pe,npe = classes[<span class="keyword">true</span>],classes[<span class="keyword">false</span>]
                 <span class="keyword">if</span> npe <span class="keyword">then</span> <span class="comment">-- there's at least one non PE argument
 </span>                    <span class="comment">-- so fold them
 </span>                    <span class="keyword">if</span> #npe == <span class="number">1</span> <span class="keyword">then</span> npe = npe[<span class="number">1</span>]
-                    <span class="keyword">else</span> npe = npe:reduce(optable[op])
+                    <span class="keyword">else</span> npe = npe:<span class="function-name">reduce</span>(optable[op])
                     <span class="keyword">end</span>
                     <span class="comment">-- if the result is a constant, return it
 </span>                    <span class="keyword">if</span> <span class="keyword">not</span> pe <span class="keyword">then</span> <span class="keyword">return</span> npe <span class="keyword">end</span>
@@ -250,84 +250,84 @@ <h2>symbols.lua</h2>
                 <span class="keyword">end</span>
                 <span class="comment">-- build up the final arguments
 </span>                <span class="keyword">local</span> res = {}
-                <span class="keyword">if</span> npe <span class="keyword">then</span> append(res,npe) <span class="keyword">end</span>
-                <span class="keyword">for</span> val,count <span class="keyword">in</span> <span class="global">pairs</span>(count_map(pe,equals)) <span class="keyword">do</span>
+                <span class="keyword">if</span> npe <span class="keyword">then</span> <span class="function-name">append</span>(res,npe) <span class="keyword">end</span>
+                <span class="keyword">for</span> val,count <span class="keyword">in</span> <span class="global">pairs</span>(<span class="function-name">count_map</span>(pe,equals)) <span class="keyword">do</span>
                     <span class="keyword">if</span> count &gt; <span class="number">1</span> <span class="keyword">then</span>
                         <span class="keyword">if</span> op == <span class="string">'*'</span> <span class="keyword">then</span> val = val ^ count
                         <span class="keyword">else</span> val = val * count
                         <span class="keyword">end</span>
                     <span class="keyword">end</span>
-                    append(res,val)
+                    <span class="function-name">append</span>(res,val)
                 <span class="keyword">end</span>
                 <span class="keyword">if</span> #res == <span class="number">1</span> <span class="keyword">then</span> <span class="keyword">return</span> res[<span class="number">1</span>] <span class="keyword">end</span>
-                <span class="keyword">return</span> PE{op=op,<span class="global">unpack</span>(res)}
+                <span class="keyword">return</span> <span class="function-name">PE</span>{op=op,<span class="function-name">unpack</span>(res)}
             <span class="keyword">elseif</span> op == <span class="string">'^'</span> <span class="keyword">then</span>
                 <span class="keyword">if</span> args[<span class="number">2</span>] == <span class="number">1</span> <span class="keyword">then</span> <span class="keyword">return</span> args[<span class="number">1</span>] <span class="keyword">end</span> <span class="comment">-- identity
 </span>                <span class="keyword">if</span> args[<span class="number">2</span>] == <span class="number">0</span> <span class="keyword">then</span> <span class="keyword">return</span> <span class="number">1</span> <span class="keyword">end</span>
             <span class="keyword">end</span>
-            <span class="keyword">return</span> PE{op=op,<span class="global">unpack</span>(args)}
+            <span class="keyword">return</span> <span class="function-name">PE</span>{op=op,<span class="function-name">unpack</span>(args)}
         <span class="keyword">end</span>
     <span class="keyword">else</span>
         <span class="keyword">return</span> e
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 
-<span class="keyword">function</span> expand (e)
-    <span class="keyword">if</span> isPE(e) <span class="keyword">and</span> e.op == <span class="string">'*'</span> <span class="keyword">and</span> isPE(e[<span class="number">2</span>]) <span class="keyword">and</span> e[<span class="number">2</span>].op == <span class="string">'+'</span> <span class="keyword">then</span>
+<span class="keyword">function</span> <span class="function-name">expand</span> (e)
+    <span class="keyword">if</span> <span class="function-name">isPE</span>(e) <span class="keyword">and</span> e.op == <span class="string">'*'</span> <span class="keyword">and</span> <span class="function-name">isPE</span>(e[<span class="number">2</span>]) <span class="keyword">and</span> e[<span class="number">2</span>].op == <span class="string">'+'</span> <span class="keyword">then</span>
         <span class="keyword">local</span> a,b = e[<span class="number">1</span>],e[<span class="number">2</span>]
-        <span class="keyword">return</span> expand(b[<span class="number">1</span>]*a) + expand(b[<span class="number">2</span>]*a)
+        <span class="keyword">return</span> <span class="function-name">expand</span>(b[<span class="number">1</span>]*a) + <span class="function-name">expand</span>(b[<span class="number">2</span>]*a)
     <span class="keyword">else</span>
         <span class="keyword">return</span> e
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 
-<span class="keyword">function</span> isnumber (x)
+<span class="keyword">function</span> <span class="function-name">isnumber</span> (x)
     <span class="keyword">return</span> <span class="global">type</span>(x) == <span class="string">'number'</span>
 <span class="keyword">end</span>
 
 <span class="comment">-- does this PE contain a reference to x?
-</span><span class="keyword">function</span> references (e,x)
-    <span class="keyword">if</span> isPE(e) <span class="keyword">then</span>
+</span><span class="keyword">function</span> <span class="function-name">references</span> (e,x)
+    <span class="keyword">if</span> <span class="function-name">isPE</span>(e) <span class="keyword">then</span>
         <span class="keyword">if</span> e.op == <span class="string">'X'</span> <span class="keyword">then</span> <span class="keyword">return</span> x.repr == e.repr
         <span class="keyword">else</span>
-            <span class="keyword">return</span> find_if(e,references,x)
+            <span class="keyword">return</span> <span class="function-name">find_if</span>(e,references,x)
         <span class="keyword">end</span>
     <span class="keyword">else</span>
         <span class="keyword">return</span> <span class="keyword">false</span>
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> <span class="keyword">function</span> muli (args)
-    <span class="keyword">return</span> PE{op=<span class="string">'*'</span>,<span class="global">unpack</span>(args)}
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">muli</span> (args)
+    <span class="keyword">return</span> <span class="function-name">PE</span>{op=<span class="string">'*'</span>,<span class="function-name">unpack</span>(args)}
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> <span class="keyword">function</span> addi (args)
-    <span class="keyword">return</span> PE{op=<span class="string">'+'</span>,<span class="global">unpack</span>(args)}
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">addi</span> (args)
+    <span class="keyword">return</span> <span class="function-name">PE</span>{op=<span class="string">'+'</span>,<span class="function-name">unpack</span>(args)}
 <span class="keyword">end</span>
 
-<span class="keyword">function</span> diff (e,x)
-    <span class="keyword">if</span> isPE(e) <span class="keyword">and</span> references(e,x) <span class="keyword">then</span>
+<span class="keyword">function</span> <span class="function-name">diff</span> (e,x)
+    <span class="keyword">if</span> <span class="function-name">isPE</span>(e) <span class="keyword">and</span> <span class="function-name">references</span>(e,x) <span class="keyword">then</span>
         <span class="keyword">local</span> op = e.op
         <span class="keyword">if</span> op == <span class="string">'X'</span> <span class="keyword">then</span>
             <span class="keyword">return</span> <span class="number">1</span>
         <span class="keyword">else</span>
             <span class="keyword">local</span> a,b = e[<span class="number">1</span>],e[<span class="number">2</span>]
             <span class="keyword">if</span> op == <span class="string">'+'</span> <span class="keyword">then</span> <span class="comment">-- differentiation is linear
-</span>                <span class="keyword">local</span> args = imap(diff,e,x)
-                <span class="keyword">return</span> balance(addi(args))
+</span>                <span class="keyword">local</span> args = <span class="function-name">imap</span>(diff,e,x)
+                <span class="keyword">return</span> <span class="function-name">balance</span>(<span class="function-name">addi</span>(args))
             <span class="keyword">elseif</span> op == <span class="string">'*'</span> <span class="keyword">then</span> <span class="comment">-- product rule
 </span>                <span class="keyword">local</span> res,d,ee = {}
                 <span class="keyword">for</span> i = <span class="number">1</span>,#e <span class="keyword">do</span>
-                    d = fold(diff(e[i],x))
+                    d = <span class="function-name">fold</span>(<span class="function-name">diff</span>(e[i],x))
                     <span class="keyword">if</span> d ~= <span class="number">0</span> <span class="keyword">then</span>
-                        ee = {<span class="global">unpack</span>(e)}
+                        ee = {<span class="function-name">unpack</span>(e)}
                         ee[i] = d
-                        append(res,balance(muli(ee)))
+                        <span class="function-name">append</span>(res,<span class="function-name">balance</span>(<span class="function-name">muli</span>(ee)))
                     <span class="keyword">end</span>
                 <span class="keyword">end</span>
-                <span class="keyword">if</span> #res &gt; <span class="number">1</span> <span class="keyword">then</span> <span class="keyword">return</span> addi(res)
+                <span class="keyword">if</span> #res &gt; <span class="number">1</span> <span class="keyword">then</span> <span class="keyword">return</span> <span class="function-name">addi</span>(res)
                 <span class="keyword">else</span> <span class="keyword">return</span> res[<span class="number">1</span>] <span class="keyword">end</span>
-            <span class="keyword">elseif</span> op == <span class="string">'^'</span> <span class="keyword">and</span> isnumber(b) <span class="keyword">then</span> <span class="comment">-- power rule
+            <span class="keyword">elseif</span> op == <span class="string">'^'</span> <span class="keyword">and</span> <span class="function-name">isnumber</span>(b) <span class="keyword">then</span> <span class="comment">-- power rule
 </span>                <span class="keyword">return</span> b*x^(b-<span class="number">1</span>)
             <span class="keyword">end</span>
         <span class="keyword">end</span>
@@ -340,7 +340,7 @@ <h2>symbols.lua</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/test-cmp.lua.html b/docs/examples/test-cmp.lua.html
index ac6e44ad..f755fd16 100644
--- a/docs/examples/test-cmp.lua.html
+++ b/docs/examples/test-cmp.lua.html
@@ -116,14 +116,14 @@ <h2>Manual</h2>
     <h2>test-cmp.lua</h2>
 <pre>
 <span class="keyword">local</span> A = <span class="global">require</span> <span class="string">'pl.tablex'</span>
-<span class="global">print</span>(A.compare_no_order({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>}))
-<span class="global">print</span>(A.compare_no_order({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>},<span class="string">'=='</span>))</pre>
+<span class="global">print</span>(A.<span class="function-name">compare_no_order</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>}))
+<span class="global">print</span>(A.<span class="function-name">compare_no_order</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>},<span class="string">'=='</span>))</pre>
 
 
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/test-data.lua.html b/docs/examples/test-data.lua.html
index 81284112..bef712c0 100644
--- a/docs/examples/test-data.lua.html
+++ b/docs/examples/test-data.lua.html
@@ -138,7 +138,7 @@ <h2>test-data.lua</h2>
 --]=]</span>
 
 <span class="comment">-- tab-separated data, explicit column names
-</span><span class="keyword">local</span> t1f = open <span class="string">[[
+</span><span class="keyword">local</span> t1f = <span class="function-name">open</span> <span class="string">[[
 EventID	Magnitude	LocationX	LocationY	LocationZ	LocationError	EventDate	DataFile
 981124001	2.0	18988.4	10047.1	4149.7	33.8	24/11/1998 11:18:05	981124DF.AAB
 981125001	0.8	19104.0	9970.4	5088.7	3.0	25/11/1998 05:44:54	981125DF.AAB
@@ -147,20 +147,20 @@ <h2>test-data.lua</h2>
 981127006	0.2	19109.9	9716.5	3612.0	11.8	27/11/1998 19:29:51	981127DF.AAG
 ]]</span>
 
-<span class="keyword">local</span> t1 = data.read (t1f)
+<span class="keyword">local</span> t1 = data.<span class="function-name">read</span> (t1f)
 <span class="comment">-- column_by_name returns a List
-</span>asserteq(t1:column_by_name <span class="string">'Magnitude'</span>,List{<span class="number">2</span>,<span class="number">0.8</span>,<span class="number">0.5</span>,<span class="number">0.6</span>,<span class="number">0.2</span>})
+</span><span class="function-name">asserteq</span>(t1:<span class="function-name">column_by_name</span> <span class="string">'Magnitude'</span>,<span class="function-name">List</span>{<span class="number">2</span>,<span class="number">0.8</span>,<span class="number">0.5</span>,<span class="number">0.6</span>,<span class="number">0.2</span>})
 <span class="comment">-- can use array.column as well
-</span>asserteq(array.column(t1,<span class="number">2</span>),{<span class="number">2</span>,<span class="number">0.8</span>,<span class="number">0.5</span>,<span class="number">0.6</span>,<span class="number">0.2</span>})
+</span><span class="function-name">asserteq</span>(array.<span class="function-name">column</span>(t1,<span class="number">2</span>),{<span class="number">2</span>,<span class="number">0.8</span>,<span class="number">0.5</span>,<span class="number">0.6</span>,<span class="number">0.2</span>})
 
 <span class="comment">-- only numerical columns (deduced from first data row) are converted by default
 </span><span class="comment">-- can look up indices in the list fieldnames.
-</span><span class="keyword">local</span> EDI = t1.fieldnames:index <span class="string">'EventDate'</span>
+</span><span class="keyword">local</span> EDI = t1.fieldnames:<span class="function-name">index</span> <span class="string">'EventDate'</span>
 <span class="global">assert</span>(<span class="global">type</span>(t1[<span class="number">1</span>][EDI]) == <span class="string">'string'</span>)
 
 <span class="comment">-- select method returns a sequence, in this case single-valued.
 </span><span class="comment">-- (Note that seq.copy returns a List)
-</span>asserteq(seq(t1:<span class="global">select</span> <span class="string">'LocationX where Magnitude &gt; 0.5'</span>):copy(),List{<span class="number">18988.4</span>,<span class="number">19104</span>,<span class="number">18676.4</span>})
+</span><span class="function-name">asserteq</span>(<span class="function-name">seq</span>(t1:<span class="global">select</span> <span class="string">'LocationX where Magnitude &gt; 0.5'</span>):<span class="function-name">copy</span>(),<span class="function-name">List</span>{<span class="number">18988.4</span>,<span class="number">19104</span>,<span class="number">18676.4</span>})
 
 <span class="comment">--[[
 --a common select usage pattern:
@@ -170,36 +170,36 @@ <h2>test-data.lua</h2>
 --]]</span>
 
 <span class="comment">-- space-separated, but with last field containing spaces.
-</span><span class="keyword">local</span> t2f = open <span class="string">[[
+</span><span class="keyword">local</span> t2f = <span class="function-name">open</span> <span class="string">[[
 USER PID %MEM %CPU COMMAND
 sdonovan 2333  0.3 0.1 background --n=2
 root 2332  0.4  0.2 fred --start=yes
 root 2338  0.2  0.1 backyard-process
 ]]</span>
 
-<span class="keyword">local</span> t2,err = data.read(t2f,{last_field_collect=<span class="keyword">true</span>})
+<span class="keyword">local</span> t2,err = data.<span class="function-name">read</span>(t2f,{last_field_collect=<span class="keyword">true</span>})
 <span class="keyword">if</span> <span class="keyword">not</span> t2 <span class="keyword">then</span> <span class="keyword">return</span> <span class="global">print</span> (err) <span class="keyword">end</span>
 
 <span class="comment">-- the last_field_collect option is useful with space-delimited data where the last
 </span><span class="comment">-- field may contain spaces. Otherwise, a record count mismatch should be an error!
-</span><span class="keyword">local</span> lt2 = List(t2[<span class="number">2</span>])
-asserteq(lt2:join <span class="string">','</span>,<span class="string">'root,2332,0.4,0.2,fred --start=yes'</span>)
+</span><span class="keyword">local</span> lt2 = <span class="function-name">List</span>(t2[<span class="number">2</span>])
+<span class="function-name">asserteq</span>(lt2:<span class="function-name">join</span> <span class="string">','</span>,<span class="string">'root,2332,0.4,0.2,fred --start=yes'</span>)
 
 <span class="comment">-- fieldnames are converted into valid identifiers by substituting _
 </span><span class="comment">-- (we do this to make select queries parseable by Lua)
-</span>asserteq(t2.fieldnames,List{<span class="string">'USER'</span>,<span class="string">'PID'</span>,<span class="string">'_MEM'</span>,<span class="string">'_CPU'</span>,<span class="string">'COMMAND'</span>})
+</span><span class="function-name">asserteq</span>(t2.fieldnames,<span class="function-name">List</span>{<span class="string">'USER'</span>,<span class="string">'PID'</span>,<span class="string">'_MEM'</span>,<span class="string">'_CPU'</span>,<span class="string">'COMMAND'</span>})
 
 <span class="comment">-- select queries are NOT SQL so remember to use == ! (and no 'between' operator, sorry)
 </span><span class="comment">--s,err = t2:select('_MEM where USER="root"')
 </span><span class="comment">--assert(err == [[[string "tmp"]:9: unexpected symbol near '=']])
 </span>
 <span class="keyword">local</span> s = t2:<span class="global">select</span>(<span class="string">'_MEM where USER=="root"'</span>)
-<span class="global">assert</span>(s() == <span class="number">0.4</span>)
-<span class="global">assert</span>(s() == <span class="number">0.2</span>)
-<span class="global">assert</span>(s() == <span class="keyword">nil</span>)
+<span class="global">assert</span>(<span class="function-name">s</span>() == <span class="number">0.4</span>)
+<span class="global">assert</span>(<span class="function-name">s</span>() == <span class="number">0.2</span>)
+<span class="global">assert</span>(<span class="function-name">s</span>() == <span class="keyword">nil</span>)
 
 <span class="comment">-- CSV, Excel style. Double-quoted fields are allowed, and they may contain commas!
-</span><span class="keyword">local</span> t3f = open <span class="string">[[
+</span><span class="keyword">local</span> t3f = <span class="function-name">open</span> <span class="string">[[
 "Department Name","Employee ID",Project,"Hours Booked"
 sales,1231,overhead,4
 sales,1255,overhead,3
@@ -208,11 +208,11 @@ <h2>test-data.lua</h2>
 engineering,1433,maintenance,10
 ]]</span>
 
-<span class="keyword">local</span> t3 = data.read(t3f,{csv=<span class="keyword">true</span>})
+<span class="keyword">local</span> t3 = data.<span class="function-name">read</span>(t3f,{csv=<span class="keyword">true</span>})
 
 <span class="comment">-- although fieldnames are turned in valid Lua identifiers, there is always <code>original_fieldnames</code>
-</span>asserteq(t3.fieldnames,List{<span class="string">'Department_Name'</span>,<span class="string">'Employee_ID'</span>,<span class="string">'Project'</span>,<span class="string">'Hours_Booked'</span>})
-asserteq(t3.original_fieldnames,List{<span class="string">'Department Name'</span>,<span class="string">'Employee ID'</span>,<span class="string">'Project'</span>,<span class="string">'Hours Booked'</span>})
+</span><span class="function-name">asserteq</span>(t3.fieldnames,<span class="function-name">List</span>{<span class="string">'Department_Name'</span>,<span class="string">'Employee_ID'</span>,<span class="string">'Project'</span>,<span class="string">'Hours_Booked'</span>})
+<span class="function-name">asserteq</span>(t3.original_fieldnames,<span class="function-name">List</span>{<span class="string">'Department Name'</span>,<span class="string">'Employee ID'</span>,<span class="string">'Project'</span>,<span class="string">'Hours Booked'</span>})
 
 <span class="comment">-- a common operation is to select using a given list of columns, and each row
 </span><span class="comment">-- on some explicit condition. The select() method can take a table with these
@@ -223,23 +223,23 @@ <h2>test-data.lua</h2>
     where = <span class="keyword">function</span>(row) <span class="keyword">return</span> row[<span class="number">1</span>]==<span class="string">'engineering'</span> <span class="keyword">end</span>
     }
 
-asserteq(seq.copy2(q),{{<span class="number">1501</span>,<span class="number">5</span>},{<span class="number">1501</span>,<span class="number">3</span>},{<span class="number">1433</span>,<span class="number">10</span>}})
+<span class="function-name">asserteq</span>(seq.<span class="function-name">copy2</span>(q),{{<span class="number">1501</span>,<span class="number">5</span>},{<span class="number">1501</span>,<span class="number">3</span>},{<span class="number">1433</span>,<span class="number">10</span>}})
 
 <span class="comment">-- another pattern is doing a select to restrict rows &amp; columns, process some
 </span><span class="comment">-- fields and write out the modified rows.
 </span>
-<span class="keyword">local</span> outf = stringio.create()
+<span class="keyword">local</span> outf = stringio.<span class="function-name">create</span>()
 
 <span class="keyword">local</span> names = {[<span class="number">1501</span>]=<span class="string">'don'</span>,[<span class="number">1433</span>]=<span class="string">'dilbert'</span>}
 
-t3:write_row (outf,{<span class="string">'Employee'</span>,<span class="string">'Hours_Booked'</span>})
-q = t3:select_row {fields=keepcols,where=func.Eq(func._1[<span class="number">1</span>],<span class="string">'engineering'</span>)}
+t3:<span class="function-name">write_row</span> (outf,{<span class="string">'Employee'</span>,<span class="string">'Hours_Booked'</span>})
+q = t3:<span class="function-name">select_row</span> {fields=keepcols,where=func.<span class="function-name">Eq</span>(func._1[<span class="number">1</span>],<span class="string">'engineering'</span>)}
 <span class="keyword">for</span> row <span class="keyword">in</span> q <span class="keyword">do</span>
     row[<span class="number">1</span>] = names[row[<span class="number">1</span>]]
-    t3:write_row(outf,row)
+    t3:<span class="function-name">write_row</span>(outf,row)
 <span class="keyword">end</span>
 
-asserteq(outf:value(),
+<span class="function-name">asserteq</span>(outf:<span class="function-name">value</span>(),
 <span class="string">[[
 Employee,Hours_Booked
 don,5
@@ -251,15 +251,15 @@ <h2>test-data.lua</h2>
 </span><span class="comment">-- from a two-dimensional array, may specify the fieldnames, as a list or a string.
 </span><span class="comment">-- The delimiter is deduced from the fieldname string, so a string just containing
 </span><span class="comment">-- the delimiter will set it,  and the fieldnames will be empty.
-</span><span class="keyword">local</span> dat = List()
-<span class="keyword">local</span> row = List.range(<span class="number">1</span>,<span class="number">10</span>)
+</span><span class="keyword">local</span> dat = <span class="function-name">List</span>()
+<span class="keyword">local</span> row = List.<span class="function-name">range</span>(<span class="number">1</span>,<span class="number">10</span>)
 <span class="keyword">for</span> i = <span class="number">1</span>,<span class="number">10</span> <span class="keyword">do</span>
-    dat:append(row:map(<span class="string">'*'</span>,i))
+    dat:<span class="function-name">append</span>(row:<span class="function-name">map</span>(<span class="string">'*'</span>,i))
 <span class="keyword">end</span>
-dat = data.new(dat,<span class="string">','</span>)
-<span class="keyword">local</span> out = stringio.create()
-dat:write(out,<span class="string">','</span>)
-asserteq(out:value(), <span class="string">[[
+dat = data.<span class="function-name">new</span>(dat,<span class="string">','</span>)
+<span class="keyword">local</span> out = stringio.<span class="function-name">create</span>()
+dat:<span class="function-name">write</span>(out,<span class="string">','</span>)
+<span class="function-name">asserteq</span>(out:<span class="function-name">value</span>(), <span class="string">[[
 1,2,3,4,5,6,7,8,9,10
 2,4,6,8,10,12,14,16,18,20
 3,6,9,12,15,18,21,24,27,30
@@ -275,24 +275,24 @@ <h2>test-data.lua</h2>
 <span class="comment">-- you can always use numerical field indices, AWK-style;
 </span><span class="comment">-- note how the copy_select method gives you a data object instead of an
 </span><span class="comment">-- iterator over the fields
-</span><span class="keyword">local</span> res = dat:copy_select <span class="string">'$1,$3 where $1 &gt; 5'</span>
+</span><span class="keyword">local</span> res = dat:<span class="function-name">copy_select</span> <span class="string">'$1,$3 where $1 &gt; 5'</span>
 <span class="keyword">local</span> L = List
-asserteq(L(res),L{
-    L{<span class="number">6</span>, <span class="number">18</span>},
-    L{<span class="number">7</span>,<span class="number">21</span>},
-    L{<span class="number">8</span>,<span class="number">24</span>},
-    L{<span class="number">9</span>,<span class="number">27</span>},
-    L{<span class="number">10</span>,<span class="number">30</span>},
+<span class="function-name">asserteq</span>(<span class="function-name">L</span>(res),<span class="function-name">L</span>{
+    <span class="function-name">L</span>{<span class="number">6</span>, <span class="number">18</span>},
+    <span class="function-name">L</span>{<span class="number">7</span>,<span class="number">21</span>},
+    <span class="function-name">L</span>{<span class="number">8</span>,<span class="number">24</span>},
+    <span class="function-name">L</span>{<span class="number">9</span>,<span class="number">27</span>},
+    <span class="function-name">L</span>{<span class="number">10</span>,<span class="number">30</span>},
 })
 
 <span class="comment">-- the column_by_name method may take a fieldname or an index
-</span>asserteq(dat:column_by_name(<span class="number">2</span>), L{<span class="number">2</span>,<span class="number">4</span>,<span class="number">6</span>,<span class="number">8</span>,<span class="number">10</span>,<span class="number">12</span>,<span class="number">14</span>,<span class="number">16</span>,<span class="number">18</span>,<span class="number">20</span>})
+</span><span class="function-name">asserteq</span>(dat:<span class="function-name">column_by_name</span>(<span class="number">2</span>), <span class="function-name">L</span>{<span class="number">2</span>,<span class="number">4</span>,<span class="number">6</span>,<span class="number">8</span>,<span class="number">10</span>,<span class="number">12</span>,<span class="number">14</span>,<span class="number">16</span>,<span class="number">18</span>,<span class="number">20</span>})
 
 <span class="comment">-- the field list may contain expressions or even constants
 </span><span class="keyword">local</span> q = dat:<span class="global">select</span> <span class="string">'$3,2*$4 where $1 == 8'</span>
-asserteq(T(q()),T(<span class="number">24</span>,<span class="number">64</span>))
+<span class="function-name">asserteq</span>(<span class="function-name">T</span>(<span class="function-name">q</span>()),<span class="function-name">T</span>(<span class="number">24</span>,<span class="number">64</span>))
 
-dat,err = data.read(open <span class="string">[[
+dat,err = data.<span class="function-name">read</span>(<span class="function-name">open</span> <span class="string">[[
 1.0 0.1
 0.2 1.3
 ]]</span>)
@@ -303,9 +303,9 @@ <h2>test-data.lua</h2>
 </span><span class="comment">-- array2d.flatten(t) makes a 1D list out of a 2D array,
 </span><span class="comment">-- and then List.minmax() gets the extrema.
 </span>
-asserteq(T(dat:flatten():minmax()),T(<span class="number">0.1</span>,<span class="number">1.3</span>))
+<span class="function-name">asserteq</span>(<span class="function-name">T</span>(dat:<span class="function-name">flatten</span>():<span class="function-name">minmax</span>()),<span class="function-name">T</span>(<span class="number">0.1</span>,<span class="number">1.3</span>))
 
-<span class="keyword">local</span> f = open <span class="string">[[
+<span class="keyword">local</span> f = <span class="function-name">open</span> <span class="string">[[
 Time Message
 1266840760 +# EE7C0600006F0D00C00F06010302054000000308010A00002B00407B00
 1266840760 closure data 0.000000 1972 1972 0
@@ -324,30 +324,30 @@ <h2>test-data.lua</h2>
 </span><span class="comment">-- else into one field
 </span><span class="keyword">local</span> Date = <span class="global">require</span> <span class="string">'pl.Date'</span>
 
-<span class="keyword">local</span> <span class="keyword">function</span> date_convert (ds)
-    <span class="keyword">return</span> Date(<span class="global">tonumber</span>(ds))
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">date_convert</span> (ds)
+    <span class="keyword">return</span> <span class="function-name">Date</span>(<span class="global">tonumber</span>(ds))
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> d = data.read(f,{convert={[<span class="number">1</span>]=date_convert},last_field_collect=<span class="keyword">true</span>})
+<span class="keyword">local</span> d = data.<span class="function-name">read</span>(f,{convert={[<span class="number">1</span>]=date_convert},last_field_collect=<span class="keyword">true</span>})
 
-asserteq(#d[<span class="number">1</span>],<span class="number">2</span>)
-asserteq(d[<span class="number">2</span>][<span class="number">1</span>]:year(),<span class="number">2010</span>)
+<span class="function-name">asserteq</span>(#d[<span class="number">1</span>],<span class="number">2</span>)
+<span class="function-name">asserteq</span>(d[<span class="number">2</span>][<span class="number">1</span>]:<span class="function-name">year</span>(),<span class="number">2010</span>)
 
 d = {{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}}
-out = stringio.create()
-data.write(d,out,{<span class="string">'A'</span>,<span class="string">'B'</span>,<span class="string">'C'</span>},<span class="string">','</span>)
-asserteq(out:value(),
+out = stringio.<span class="function-name">create</span>()
+data.<span class="function-name">write</span>(d,out,{<span class="string">'A'</span>,<span class="string">'B'</span>,<span class="string">'C'</span>},<span class="string">','</span>)
+<span class="function-name">asserteq</span>(out:<span class="function-name">value</span>(),
 <span class="string">[[
 A,B,C
 1,2,3
 10,20,30
 ]]</span>)
 
-out = stringio.create()
+out = stringio.<span class="function-name">create</span>()
 d.fieldnames = {<span class="string">'A'</span>,<span class="string">'B'</span>,<span class="string">'C'</span>}
-data.write(d,out)
+data.<span class="function-name">write</span>(d,out)
 
-asserteq(out:value(),
+<span class="function-name">asserteq</span>(out:<span class="function-name">value</span>(),
 <span class="string">[[
 A	B	C
 1	2	3
@@ -355,8 +355,8 @@ <h2>test-data.lua</h2>
 ]]</span>)
 
 
-d = data.read(stringio.open <span class="string">'One,Two\n1,\n,20\n'</span>,{csv=<span class="keyword">true</span>})
-asserteq(d,{
+d = data.<span class="function-name">read</span>(stringio.<span class="function-name">open</span> <span class="string">'One,Two\n1,\n,20\n'</span>,{csv=<span class="keyword">true</span>})
+<span class="function-name">asserteq</span>(d,{
     {<span class="number">1</span>,<span class="number">0</span>},{<span class="number">0</span>,<span class="number">20</span>},
     original_fieldnames={<span class="string">"One"</span>,<span class="string">"Two"</span>},fieldnames={<span class="string">"One"</span>,<span class="string">"Two"</span>},delim=<span class="string">","</span>
 })</pre>
@@ -365,7 +365,7 @@ <h2>test-data.lua</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/test-listcallbacks.lua.html b/docs/examples/test-listcallbacks.lua.html
index 4416532b..b565bf2f 100644
--- a/docs/examples/test-listcallbacks.lua.html
+++ b/docs/examples/test-listcallbacks.lua.html
@@ -118,20 +118,20 @@ <h2>test-listcallbacks.lua</h2>
 <span class="comment">-- demonstrates how to use a list of callbacks
 </span><span class="keyword">local</span> List = <span class="global">require</span> <span class="string">'pl.List'</span>
 <span class="keyword">local</span> utils = <span class="global">require</span> <span class="string">'pl.utils'</span>
-<span class="keyword">local</span> actions = List()
+<span class="keyword">local</span> actions = <span class="function-name">List</span>()
 <span class="keyword">local</span> L = utils.string_lambda
 
-actions:append(<span class="keyword">function</span>() <span class="global">print</span> <span class="string">'hello'</span> <span class="keyword">end</span>)
-actions:append(L <span class="string">'|| print "yay"'</span>)
+actions:<span class="function-name">append</span>(<span class="keyword">function</span>() <span class="global">print</span> <span class="string">'hello'</span> <span class="keyword">end</span>)
+actions:<span class="function-name">append</span>(<span class="function-name">L</span> <span class="string">'|| print "yay"'</span>)
 
 <span class="comment">-- '()' is a shortcut for operator.call or function(x) return x() end
-</span>actions:foreach <span class="string">'()'</span></pre>
+</span>actions:<span class="function-name">foreach</span> <span class="string">'()'</span></pre>
 
 
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/test-pretty.lua.html b/docs/examples/test-pretty.lua.html
index a7493f30..ff0a7761 100644
--- a/docs/examples/test-pretty.lua.html
+++ b/docs/examples/test-pretty.lua.html
@@ -127,13 +127,13 @@ <h2>test-pretty.lua</h2>
 ]]</span>
 }
 
-<span class="global">print</span>(pretty.write(tb))</pre>
+<span class="global">print</span>(pretty.<span class="function-name">write</span>(tb))</pre>
 
 
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/test-symbols.lua.html b/docs/examples/test-symbols.lua.html
index a847ab92..fb4b7c1e 100644
--- a/docs/examples/test-symbols.lua.html
+++ b/docs/examples/test-symbols.lua.html
@@ -117,7 +117,7 @@ <h2>test-symbols.lua</h2>
 <pre>
 <span class="global">require</span> <span class="string">'pl'</span>
 <span class="comment">-- force us to look in the script's directory when requiring...
-</span>app.require_here()
+</span>app.<span class="function-name">require_here</span>()
 <span class="global">require</span> <span class="string">'symbols'</span>
 
 <span class="keyword">local</span> MT = <span class="global">getmetatable</span>(_1)
@@ -127,15 +127,15 @@ <h2>test-symbols.lua</h2>
 pow = MT.__pow
 
 
-<span class="keyword">function</span> testeq (e1,e2)
-    <span class="keyword">if</span> <span class="keyword">not</span> equals(e1,e2) <span class="keyword">then</span>
-        <span class="global">print</span> (<span class="string">'Not equal'</span>,repr(e1),repr(e2))
+<span class="keyword">function</span> <span class="function-name">testeq</span> (e1,e2)
+    <span class="keyword">if</span> <span class="keyword">not</span> <span class="function-name">equals</span>(e1,e2) <span class="keyword">then</span>
+        <span class="global">print</span> (<span class="string">'Not equal'</span>,<span class="function-name">repr</span>(e1),<span class="function-name">repr</span>(e2))
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 
-sin = register(<span class="global">math</span>.sin,<span class="string">'sin'</span>)
+sin = <span class="function-name">register</span>(<span class="global">math</span>.sin,<span class="string">'sin'</span>)
 
-f = register(<span class="keyword">function</span>(x,y,z) <span class="keyword">end</span>)
+f = <span class="function-name">register</span>(<span class="keyword">function</span>(x,y,z) <span class="keyword">end</span>)
 
 <span class="comment">--[[
 testeq (_1,_1)
@@ -147,8 +147,8 @@ <h2>test-symbols.lua</h2>
 --]]</span>
 
 
-<span class="keyword">function</span> testexpand (e)
-    <span class="global">print</span>(repr(fold(expand(e)))) <span class="comment">--fold
+<span class="keyword">function</span> <span class="function-name">testexpand</span> (e)
+    <span class="global">print</span>(<span class="function-name">repr</span>(<span class="function-name">fold</span>(<span class="function-name">expand</span>(e)))) <span class="comment">--fold
 </span><span class="keyword">end</span>
 
 <span class="comment">--[[
@@ -157,11 +157,11 @@ <h2>test-symbols.lua</h2>
 testexpand ((x+2)*(b+1))
 ]]</span><span class="comment">--
 </span>
-<span class="keyword">function</span> testfold (e)
-    <span class="global">print</span>(repr(fold(e)))
+<span class="keyword">function</span> <span class="function-name">testfold</span> (e)
+    <span class="global">print</span>(<span class="function-name">repr</span>(<span class="function-name">fold</span>(e)))
 <span class="keyword">end</span>
 
-a,b,c,x,y = Var <span class="string">'a,b,c,x,y'</span>
+a,b,c,x,y = <span class="function-name">Var</span> <span class="string">'a,b,c,x,y'</span>
 
 <span class="comment">--~ testfold(_1 + _2)
 </span><span class="comment">--~ testfold(add(10,20))
@@ -181,28 +181,28 @@ <h2>test-symbols.lua</h2>
 
 
 
-<span class="keyword">function</span> testdiff (e)
-    balance(e)
-    e = diff(e,x)
-    balance(e)
+<span class="keyword">function</span> <span class="function-name">testdiff</span> (e)
+    <span class="function-name">balance</span>(e)
+    e = <span class="function-name">diff</span>(e,x)
+    <span class="function-name">balance</span>(e)
     <span class="global">print</span>(<span class="string">'+ '</span>,e)
-    e = fold(e)
+    e = <span class="function-name">fold</span>(e)
     <span class="global">print</span>(<span class="string">'- '</span>,e)
 <span class="keyword">end</span>
 
 
-testdiff(x^<span class="number">2</span>+<span class="number">1</span>)
-testdiff(<span class="number">3</span>*x^<span class="number">2</span>)
-testdiff(x^<span class="number">2</span> + <span class="number">2</span>*x^<span class="number">3</span>)
-testdiff(x^<span class="number">2</span> + <span class="number">2</span>*a*x^<span class="number">3</span> + x^<span class="number">4</span>)
-testdiff(<span class="number">2</span>*a*x^<span class="number">3</span>)
-testdiff(x*x*x)</pre>
+<span class="function-name">testdiff</span>(x^<span class="number">2</span>+<span class="number">1</span>)
+<span class="function-name">testdiff</span>(<span class="number">3</span>*x^<span class="number">2</span>)
+<span class="function-name">testdiff</span>(x^<span class="number">2</span> + <span class="number">2</span>*x^<span class="number">3</span>)
+<span class="function-name">testdiff</span>(x^<span class="number">2</span> + <span class="number">2</span>*a*x^<span class="number">3</span> + x^<span class="number">4</span>)
+<span class="function-name">testdiff</span>(<span class="number">2</span>*a*x^<span class="number">3</span>)
+<span class="function-name">testdiff</span>(x*x*x)</pre>
 
 
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/testclone.lua.html b/docs/examples/testclone.lua.html
index 1e48839b..6f170694 100644
--- a/docs/examples/testclone.lua.html
+++ b/docs/examples/testclone.lua.html
@@ -123,42 +123,42 @@ <h2>testclone.lua</h2>
 <span class="keyword">local</span> p1 = <span class="string">[[examples]]</span>
 <span class="keyword">local</span> p2 = <span class="string">[[copy/of/examples]]</span>
 
-<span class="keyword">if</span> <span class="keyword">not</span> path.isfile <span class="string">'examples/testclone.lua'</span> <span class="keyword">then</span>
+<span class="keyword">if</span> <span class="keyword">not</span> path.<span class="function-name">isfile</span> <span class="string">'examples/testclone.lua'</span> <span class="keyword">then</span>
 	<span class="keyword">return</span> <span class="global">print</span> <span class="string">'please run this in the penlight folder (below examples)'</span>
 <span class="keyword">end</span>
 
 <span class="comment">-- make a copy of the examples folder
-</span>dir.clonetree(p1,p2,dir.copyfile)
+</span>dir.<span class="function-name">clonetree</span>(p1,p2,dir.copyfile)
 
-<span class="global">assert</span>(path.isdir <span class="string">'copy'</span>)
+<span class="global">assert</span>(path.<span class="function-name">isdir</span> <span class="string">'copy'</span>)
 
 <span class="global">print</span> <span class="string">'---'</span>
-<span class="keyword">local</span> t = <span class="global">os</span>.time()
-<span class="global">print</span>(lfs.touch(<span class="string">'examples/testclone.lua'</span>,t,t+<span class="number">10</span>))
+<span class="keyword">local</span> t = <span class="global">os</span>.<span class="function-name">time</span>()
+<span class="global">print</span>(lfs.<span class="function-name">touch</span>(<span class="string">'examples/testclone.lua'</span>,t,t+<span class="number">10</span>))
 
 <span class="comment">-- this should only update this file
-</span>dir.clonetree(p1,p2,
+</span>dir.<span class="function-name">clonetree</span>(p1,p2,
 <span class="keyword">function</span>(f1,f2)
-  <span class="keyword">local</span> t1 = path.getmtime(f1)
-  <span class="keyword">local</span> t2 = path.getmtime(f2)
+  <span class="keyword">local</span> t1 = path.<span class="function-name">getmtime</span>(f1)
+  <span class="keyword">local</span> t2 = path.<span class="function-name">getmtime</span>(f2)
   <span class="comment">--print(f1,t1,f2,t2)
 </span>  <span class="keyword">if</span> t1 &gt; t2 <span class="keyword">then</span>
-	dir.copyfile(f1,f2)
+	dir.<span class="function-name">copyfile</span>(f1,f2)
 	<span class="global">print</span>(f1,f2,t1,t2)
   <span class="keyword">end</span>
   <span class="keyword">return</span> <span class="keyword">true</span>
 <span class="keyword">end</span>)
 
 <span class="comment">-- and get rid of the whole copy directory, with subdirs
-</span>dir.rmtree <span class="string">'copy'</span>
+</span>dir.<span class="function-name">rmtree</span> <span class="string">'copy'</span>
 
-<span class="global">assert</span>(<span class="keyword">not</span> path.exists <span class="string">'copy'</span>)</pre>
+<span class="global">assert</span>(<span class="keyword">not</span> path.<span class="function-name">exists</span> <span class="string">'copy'</span>)</pre>
 
 
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/testconfig.lua.html b/docs/examples/testconfig.lua.html
index 4ba947fe..ca9a3367 100644
--- a/docs/examples/testconfig.lua.html
+++ b/docs/examples/testconfig.lua.html
@@ -118,31 +118,31 @@ <h2>testconfig.lua</h2>
 <span class="keyword">local</span> stringio = <span class="global">require</span> <span class="string">'pl.stringio'</span>
 <span class="keyword">local</span> config = <span class="global">require</span> <span class="string">'pl.config'</span>
 
-<span class="keyword">local</span> <span class="keyword">function</span> dump(t,indent)
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">dump</span>(t,indent)
     <span class="keyword">if</span> <span class="global">type</span>(t) == <span class="string">'table'</span> <span class="keyword">then</span>
-        <span class="global">io</span>.write(indent,<span class="string">'{\n'</span>)
+        <span class="global">io</span>.<span class="function-name">write</span>(indent,<span class="string">'{\n'</span>)
         <span class="keyword">local</span> newindent = indent..<span class="string">'  '</span>
         <span class="keyword">for</span> k,v <span class="keyword">in</span> <span class="global">pairs</span>(t) <span class="keyword">do</span>
-            <span class="global">io</span>.write(newindent,k,<span class="string">'='</span>)
-            dump(v,indent)
-            <span class="global">io</span>.write(<span class="string">'\n'</span>)
+            <span class="global">io</span>.<span class="function-name">write</span>(newindent,k,<span class="string">'='</span>)
+            <span class="function-name">dump</span>(v,indent)
+            <span class="global">io</span>.<span class="function-name">write</span>(<span class="string">'\n'</span>)
         <span class="keyword">end</span>
-        <span class="global">io</span>.write(newindent,<span class="string">'},\n'</span>)
+        <span class="global">io</span>.<span class="function-name">write</span>(newindent,<span class="string">'},\n'</span>)
     <span class="keyword">else</span>
-        <span class="global">io</span>.write(indent,t,<span class="string">'('</span>,<span class="global">type</span>(t),<span class="string">')'</span>)
+        <span class="global">io</span>.<span class="function-name">write</span>(indent,t,<span class="string">'('</span>,<span class="global">type</span>(t),<span class="string">')'</span>)
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 
 
-<span class="keyword">local</span> <span class="keyword">function</span> testconfig(test)
-    <span class="keyword">local</span> f = stringio.open(test)
-    <span class="keyword">local</span> c = config.read(f)
-    f:close()
-    dump(c,<span class="string">'  '</span>)
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">testconfig</span>(test)
+    <span class="keyword">local</span> f = stringio.<span class="function-name">open</span>(test)
+    <span class="keyword">local</span> c = config.<span class="function-name">read</span>(f)
+    f:<span class="function-name">close</span>()
+    <span class="function-name">dump</span>(c,<span class="string">'  '</span>)
     <span class="global">print</span> <span class="string">'-----'</span>
 <span class="keyword">end</span>
 
-testconfig <span class="string">[[
+<span class="function-name">testconfig</span> <span class="string">[[
  ; comment 2 (an ini file)
 [section!]
 bonzo.dog=20,30
@@ -152,14 +152,14 @@ <h2>testconfig.lua</h2>
 felix="cat"
 ]]</span>
 
-testconfig <span class="string">[[
+<span class="function-name">testconfig</span> <span class="string">[[
 # this is a more Unix-y config file
 fred = 1
 alice = 2
 home = /bonzo/dog/etc
 ]]</span>
 
-testconfig <span class="string">[[
+<span class="function-name">testconfig</span> <span class="string">[[
 # this is just a set of comma-separated values
 1000,444,222
 44,555,224
@@ -169,7 +169,7 @@ <h2>testconfig.lua</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/testglobal.lua.html b/docs/examples/testglobal.lua.html
index e05a1f83..0f8c1917 100644
--- a/docs/examples/testglobal.lua.html
+++ b/docs/examples/testglobal.lua.html
@@ -130,23 +130,23 @@ <h2>testglobal.lua</h2>
 <span class="keyword">local</span> seq = <span class="global">require</span> <span class="string">'pl.seq'</span>
 <span class="keyword">local</span> path = <span class="global">require</span> <span class="string">'pl.path'</span>
 
-utils.on_error <span class="string">'quit'</span>
+utils.<span class="function-name">on_error</span> <span class="string">'quit'</span>
 
-<span class="keyword">local</span> txt = file.read(arg[<span class="number">1</span>] <span class="keyword">or</span> path.normpath(<span class="string">'examples/testglobal.lua'</span>))
-<span class="keyword">local</span> globals = List()
-<span class="keyword">for</span> t,v <span class="keyword">in</span> lexer.lua(txt) <span class="keyword">do</span>
+<span class="keyword">local</span> txt = file.<span class="function-name">read</span>(arg[<span class="number">1</span>] <span class="keyword">or</span> path.<span class="function-name">normpath</span>(<span class="string">'examples/testglobal.lua'</span>))
+<span class="keyword">local</span> globals = <span class="function-name">List</span>()
+<span class="keyword">for</span> t,v <span class="keyword">in</span> lexer.<span class="function-name">lua</span>(txt) <span class="keyword">do</span>
 	<span class="keyword">if</span> t == <span class="string">'iden'</span> <span class="keyword">and</span> <span class="global">rawget</span>(_G,v) <span class="keyword">then</span>
-		globals:append(v)
+		globals:<span class="function-name">append</span>(v)
 	<span class="keyword">end</span>
 <span class="keyword">end</span>
 
-pretty.dump(seq.count_map(globals))</pre>
+pretty.<span class="function-name">dump</span>(seq.<span class="function-name">count_map</span>(globals))</pre>
 
 
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/testinputfields.lua.html b/docs/examples/testinputfields.lua.html
index 0fa63e42..99158d29 100644
--- a/docs/examples/testinputfields.lua.html
+++ b/docs/examples/testinputfields.lua.html
@@ -123,7 +123,7 @@ <h2>testinputfields.lua</h2>
     981125001	0.8	19104.0	9970.4	5088.7
     981127003	0.5	19012.5	9946.9	3831.2
 ]]</span>
-<span class="keyword">for</span> id,magn,x <span class="keyword">in</span> input.fields(<span class="number">3</span>,<span class="string">' '</span>,text) <span class="keyword">do</span>
+<span class="keyword">for</span> id,magn,x <span class="keyword">in</span> input.<span class="function-name">fields</span>(<span class="number">3</span>,<span class="string">' '</span>,text) <span class="keyword">do</span>
   sum = sum + x
   count = count + <span class="number">1</span>
 <span class="keyword">end</span>
@@ -133,7 +133,7 @@ <h2>testinputfields.lua</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/testinputfields2.lua.html b/docs/examples/testinputfields2.lua.html
index 51a5acfd..192dae49 100644
--- a/docs/examples/testinputfields2.lua.html
+++ b/docs/examples/testinputfields2.lua.html
@@ -122,14 +122,14 @@ <h2>testinputfields2.lua</h2>
     981125001	0.8	19104.0	9970.4	5088.7
     981127003	0.5	19012.5	9946.9	3831.2
 ]]</span>
-<span class="keyword">local</span> sum,count = seq.sum(input.fields ({<span class="number">3</span>},<span class="string">' '</span>,text))
+<span class="keyword">local</span> sum,count = seq.<span class="function-name">sum</span>(input.<span class="function-name">fields</span> ({<span class="number">3</span>},<span class="string">' '</span>,text))
 <span class="global">print</span>(sum/count)</pre>
 
 
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/testxml.lua.html b/docs/examples/testxml.lua.html
index c01fe3bb..58e7bcfa 100644
--- a/docs/examples/testxml.lua.html
+++ b/docs/examples/testxml.lua.html
@@ -126,60 +126,60 @@ <h2>testxml.lua</h2>
 <span class="keyword">local</span> append = <span class="global">table</span>.insert
 <span class="keyword">local</span> skipws,expecting = lexer.skipws,lexer.expecting
 
-<span class="keyword">local</span> <span class="keyword">function</span> parse_element (tok,tag)
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">parse_element</span> (tok,tag)
 	<span class="keyword">local</span> tbl,t,v,attrib
 	tbl = {}
 	tbl.tag = tag  <span class="comment">-- LOM 'tag' is the element tag
-</span>	t,v = skipws(tok)
+</span>	t,v = <span class="function-name">skipws</span>(tok)
 	<span class="keyword">while</span> v ~= <span class="string">'/'</span> <span class="keyword">and</span> v ~= <span class="string">'&gt;'</span> <span class="keyword">do</span>
 		<span class="keyword">if</span> t ~= <span class="string">'iden'</span> <span class="keyword">then</span> <span class="global">error</span>(<span class="string">'expecting attribute identifier'</span>) <span class="keyword">end</span>
 		attrib = v
-		expecting(tok,<span class="string">'='</span>)
-		v = expecting(tok,<span class="string">'string'</span>)
+		<span class="function-name">expecting</span>(tok,<span class="string">'='</span>)
+		v = <span class="function-name">expecting</span>(tok,<span class="string">'string'</span>)
 		<span class="comment">-- LOM: 'attr' subtable contains attrib/value pairs and an ordered list of attribs
 </span>		<span class="keyword">if</span> <span class="keyword">not</span> tbl.attr <span class="keyword">then</span> tbl.attr = {} <span class="keyword">end</span>
 		tbl.attr[attrib] = v
-		append(tbl.attr,attrib)
-		t,v = skipws(tok)
+		<span class="function-name">append</span>(tbl.attr,attrib)
+		t,v = <span class="function-name">skipws</span>(tok)
 	<span class="keyword">end</span>
 	<span class="keyword">if</span> v == <span class="string">'/'</span> <span class="keyword">then</span>
-		expecting(tok,<span class="string">'&gt;'</span>)
+		<span class="function-name">expecting</span>(tok,<span class="string">'&gt;'</span>)
 		<span class="keyword">return</span> tbl
 	<span class="keyword">end</span>
 	<span class="comment">-- pick up element data
-</span>	t,v = tok()
+</span>	t,v = <span class="function-name">tok</span>()
 	<span class="keyword">while</span> <span class="keyword">true</span> <span class="keyword">do</span>
 		<span class="keyword">if</span> t == <span class="string">'&lt;'</span> <span class="keyword">then</span>
-			t,v = skipws(tok)
+			t,v = <span class="function-name">skipws</span>(tok)
 			<span class="keyword">if</span> t == <span class="string">'/'</span> <span class="keyword">then</span> <span class="comment">-- element end tag
-</span>				t,v = tok()
+</span>				t,v = <span class="function-name">tok</span>()
 				<span class="keyword">if</span> t == <span class="string">'&gt;'</span> <span class="keyword">then</span> <span class="keyword">return</span> tbl <span class="keyword">end</span>
 				<span class="keyword">if</span> t == <span class="string">'iden'</span> <span class="keyword">and</span> v == tag <span class="keyword">then</span>
-					<span class="keyword">if</span> tok() == <span class="string">'&gt;'</span> <span class="keyword">then</span> <span class="keyword">return</span> tbl <span class="keyword">end</span>
+					<span class="keyword">if</span> <span class="function-name">tok</span>() == <span class="string">'&gt;'</span> <span class="keyword">then</span> <span class="keyword">return</span> tbl <span class="keyword">end</span>
 				<span class="keyword">end</span>
 				<span class="global">error</span>(<span class="string">'expecting end tag '</span>..tag)
 			<span class="keyword">else</span>
-				append(tbl,parse_element(tok,v)) <span class="comment">-- LOM: child elements added to table
-</span>				t,v = skipws(tok)
+				<span class="function-name">append</span>(tbl,<span class="function-name">parse_element</span>(tok,v)) <span class="comment">-- LOM: child elements added to table
+</span>				t,v = <span class="function-name">skipws</span>(tok)
 			<span class="keyword">end</span>
 		<span class="keyword">else</span>
-			append(tbl,v) <span class="comment">-- LOM: text added to table
-</span>			t,v = skipws(tok)
+			<span class="function-name">append</span>(tbl,v) <span class="comment">-- LOM: text added to table
+</span>			t,v = <span class="function-name">skipws</span>(tok)
 		<span class="keyword">end</span>
 	<span class="keyword">end</span>
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> <span class="keyword">function</span> parse_xml (tok)
-	<span class="keyword">local</span> t = skipws(tok)
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">parse_xml</span> (tok)
+	<span class="keyword">local</span> t = <span class="function-name">skipws</span>(tok)
 	<span class="keyword">local</span> v
 	<span class="keyword">while</span> t == <span class="string">'&lt;'</span> <span class="keyword">do</span>
-		t,v = tok()
+		t,v = <span class="function-name">tok</span>()
 		<span class="keyword">if</span> t == <span class="string">'?'</span> <span class="keyword">or</span> t == <span class="string">'!'</span> <span class="keyword">then</span>
 			<span class="comment">-- skip meta stuff and commentary
-</span>			<span class="keyword">repeat</span> t = tok() <span class="keyword">until</span> t == <span class="string">'&gt;'</span>
-			t = expecting(tok,<span class="string">'&lt;'</span>)
+</span>			<span class="keyword">repeat</span> t = <span class="function-name">tok</span>() <span class="keyword">until</span> t == <span class="string">'&gt;'</span>
+			t = <span class="function-name">expecting</span>(tok,<span class="string">'&lt;'</span>)
 		<span class="keyword">else</span>
-			<span class="keyword">return</span> parse_element(tok,v)
+			<span class="keyword">return</span> <span class="function-name">parse_element</span>(tok,v)
 		<span class="keyword">end</span>
 	<span class="keyword">end</span>
 <span class="keyword">end</span>
@@ -194,15 +194,15 @@ <h2>testxml.lua</h2>
 &lt;/sensor&gt;
 ]]</span>
 
-<span class="keyword">local</span> tok = lexer.scan(s,<span class="keyword">nil</span>,{space=<span class="keyword">false</span>},{<span class="global">string</span>=<span class="keyword">true</span>})
-<span class="keyword">local</span> res = parse_xml(tok)
-<span class="global">print</span>(pretty.write(res))</pre>
+<span class="keyword">local</span> tok = lexer.<span class="function-name">scan</span>(s,<span class="keyword">nil</span>,{space=<span class="keyword">false</span>},{<span class="global">string</span>=<span class="keyword">true</span>})
+<span class="keyword">local</span> res = <span class="function-name">parse_xml</span>(tok)
+<span class="global">print</span>(pretty.<span class="function-name">write</span>(res))</pre>
 
 
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/examples/which.lua.html b/docs/examples/which.lua.html
index d5e89614..6d07770b 100644
--- a/docs/examples/which.lua.html
+++ b/docs/examples/which.lua.html
@@ -122,24 +122,24 @@ <h2>which.lua</h2>
 <span class="keyword">local</span> path = <span class="global">require</span> <span class="string">'pl.path'</span>
 <span class="keyword">local</span> app = <span class="global">require</span> <span class="string">'pl.app'</span>
 
-<span class="keyword">local</span> pathl = List.split(<span class="global">os</span>.getenv <span class="string">'PATH'</span>,path.dirsep)
+<span class="keyword">local</span> pathl = List.<span class="function-name">split</span>(<span class="global">os</span>.<span class="function-name">getenv</span> <span class="string">'PATH'</span>,path.dirsep)
 
-<span class="keyword">local</span> <span class="keyword">function</span> which (file)
-    <span class="keyword">local</span> res = pathl:map(path.join,file)
-    res = res:filter(path.exists)
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">which</span> (file)
+    <span class="keyword">local</span> res = pathl:<span class="function-name">map</span>(path.join,file)
+    res = res:<span class="function-name">filter</span>(path.exists)
     <span class="keyword">if</span> res <span class="keyword">then</span> <span class="keyword">return</span> res[<span class="number">1</span>] <span class="keyword">end</span>
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> _,lua = app.lua()
+<span class="keyword">local</span> _,lua = app.<span class="function-name">lua</span>()
 <span class="keyword">local</span> file = arg[<span class="number">1</span>] <span class="keyword">or</span> lua <span class="comment">-- i.e. location of lua executable
 </span><span class="keyword">local</span> try
 
 <span class="keyword">if</span> <span class="keyword">not</span> file <span class="keyword">then</span> <span class="keyword">return</span> <span class="global">print</span> <span class="string">'must provide a filename'</span> <span class="keyword">end</span>
 
-<span class="keyword">if</span> path.extension(file) == <span class="string">''</span> <span class="keyword">and</span> path.is_windows <span class="keyword">then</span>
-    try = which(file..<span class="string">'.exe'</span>)
+<span class="keyword">if</span> path.<span class="function-name">extension</span>(file) == <span class="string">''</span> <span class="keyword">and</span> path.is_windows <span class="keyword">then</span>
+    try = <span class="function-name">which</span>(file..<span class="string">'.exe'</span>)
 <span class="keyword">else</span>
-    try = which(file)
+    try = <span class="function-name">which</span>(file)
 <span class="keyword">end</span>
 
 <span class="keyword">if</span> try <span class="keyword">then</span> <span class="global">print</span>(try) <span class="keyword">else</span> <span class="global">print</span> <span class="string">'cannot find on path'</span> <span class="keyword">end</span></pre>
@@ -148,7 +148,7 @@ <h2>which.lua</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/index.html b/docs/index.html
index 0748a52a..2a111950 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -114,7 +114,7 @@ <h2>Examples</h2>
 <div id="content">
 
 
-  <h2>Penlight Lua Libraries 1.13.1</h2>
+  <h2>Penlight Lua Libraries 1.14.0</h2>
   <p>Penlight is a set of pure Lua libraries for making it easier to work with common tasks like iterating over directories, reading configuration files and the like. Provides functional operations on tables and sequences. Visit the <a href="https://github.com/lunarmodules/Penlight">GitHub project</a> to review the code or file issues. Skip to the <a href="manual/01-introduction.md.html#">introduction</a>.</p>
 
 <h2>Libraries</h2>
@@ -133,7 +133,7 @@ <h2>Libraries</h2>
 	</tr>
 	<tr>
 		<td class="name"  nowrap><a href="libraries/pl.class.html">pl.class</a></td>
-		<td class="summary">Provides a reuseable and convenient framework for creating classes in Lua.</td>
+		<td class="summary">Provides a reusable and convenient framework for creating classes in Lua.</td>
 	</tr>
 	<tr>
 		<td class="name"  nowrap><a href="libraries/pl.compat.html">pl.compat</a></td>
@@ -385,7 +385,7 @@ <h2>Examples</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/ldoc_fixed.css b/docs/ldoc_fixed.css
index 9b0fc003..d7c7a6e7 100644
--- a/docs/ldoc_fixed.css
+++ b/docs/ldoc_fixed.css
@@ -302,6 +302,7 @@ pre .library { color: #0e7c6b; }
 pre .marker { color: #512b1e; background: #fedc56; font-weight: bold; }
 pre .string { color: #8080ff; }
 pre .number { color: #f8660d; }
+pre .function-name { color: #60447f; }
 pre .operator { color: #2239a8; font-weight: bold; }
 pre .preprocessor, pre .prepro { color: #a33243; }
 pre .global { color: #800080; }
diff --git a/docs/libraries/pl.app.html b/docs/libraries/pl.app.html
index 737840bc..4201d446 100644
--- a/docs/libraries/pl.app.html
+++ b/docs/libraries/pl.app.html
@@ -197,11 +197,11 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">base</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          optional base directory (absolute, or relative path).
         </li>
         <li><span class="parameter">nofollow</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          always use the invocation's directory, even if the invoked file is a symlink
         </li>
     </ul>
@@ -209,7 +209,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
         the current script's path with a trailing slash
     </ol>
 
@@ -231,7 +231,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">file</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a filename (w/out path)
         </li>
     </ul>
@@ -250,7 +250,7 @@ <h3>Usage:</h3>
     <ul>
         <pre class="example"><span class="comment">-- when run from a script called 'testapp' (on Windows):
 </span><span class="keyword">local</span> app = <span class="global">require</span> <span class="string">'pl.app'</span>
-<span class="global">print</span>(app.appfile <span class="string">'test.txt'</span>)
+<span class="global">print</span>(app.<span class="function-name">appfile</span> <span class="string">'test.txt'</span>)
 <span class="comment">-- C:\Documents and Settings\steve\.testapp\test.txt</span></pre>
     </ul>
 
@@ -299,7 +299,7 @@ <h3>Usage:</h3>
         <pre class="example"><span class="comment">-- execute:  lua -lluacov -e 'print(_VERSION)' myscript.lua
 </span>
 <span class="comment">-- myscript.lua
-</span><span class="global">print</span>(<span class="global">require</span>(<span class="string">"pl.app"</span>).lua())  <span class="comment">--&gt; "lua -lluacov -e 'print(_VERSION)'", "lua"</span></pre>
+</span><span class="global">print</span>(<span class="global">require</span>(<span class="string">"pl.app"</span>).<span class="function-name">lua</span>())  <span class="comment">--&gt; "lua -lluacov -e 'print(_VERSION)'", "lua"</span></pre>
     </ul>
 
 </dd>
@@ -319,7 +319,7 @@ <h3>Usage:</h3>
 <p> Multiple short args can be combined like so: ( <code>-abcd</code>).</p>
 
 <p> When specifying the <code>flags_valid</code> parameter, its contents can also contain
- aliasses, to convert short/long flags to the same output name. See the
+ aliases, to convert short/long flags to the same output name. See the
  example below.</p>
 
 <p> Note: if a flag is repeated, the last value wins.
@@ -328,16 +328,16 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">args</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">{string}</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">{string}</a></span>
          an array of strings (default is the global <code>arg</code>)
         </li>
         <li><span class="parameter">flags_with_values</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          any flags that take values, either list or hash
  table e.g. <code>{ out=true }</code> or <code>{ &quot;out&quot; }</code>.
         </li>
         <li><span class="parameter">flags_valid</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          (optional) flags that are valid, either list or hashtable.
  If not given, everything
  will be accepted(everything in <code>flags_with_values</code> will automatically be allowed)
@@ -359,11 +359,11 @@ <h3>Raises:</h3>
     <h3>Usage:</h3>
     <ul>
         <pre class="example"><span class="comment">-- Simple form:
-</span><span class="keyword">local</span> flags, params = app.parse_args(<span class="keyword">nil</span>,
+</span><span class="keyword">local</span> flags, params = app.<span class="function-name">parse_args</span>(<span class="keyword">nil</span>,
      { <span class="string">"hello"</span>, <span class="string">"world"</span> },  <span class="comment">-- list of flags taking values
 </span>     { <span class="string">"l"</span>, <span class="string">"a"</span>, <span class="string">"b"</span>})      <span class="comment">-- list of allowed flags (value ones will be added)
 </span>
-<span class="comment">-- More complex example using aliasses:
+<span class="comment">-- More complex example using aliases:
 </span><span class="keyword">local</span> valid = {
     long = <span class="string">"l"</span>,           <span class="comment">-- if 'l' is specified, it is reported as 'long'
 </span>    new = { <span class="string">"n"</span>, <span class="string">"old"</span> }, <span class="comment">-- here both 'n' and 'old' will go into 'new'
@@ -372,7 +372,7 @@ <h3>Usage:</h3>
     <span class="string">"value"</span>,   <span class="comment">-- will automatically be added to the allowed set of flags
 </span>    <span class="string">"new"</span>,     <span class="comment">-- will mark 'n' and 'old' as requiring a value as well
 </span>}
-<span class="keyword">local</span> flags, params = app.parse_args(<span class="keyword">nil</span>, values, valid)
+<span class="keyword">local</span> flags, params = app.<span class="function-name">parse_args</span>(<span class="keyword">nil</span>, values, valid)
 
 <span class="comment">-- command:  myapp.lua -l --old:hello --value world param1 param2
 </span><span class="comment">-- will yield:
@@ -394,7 +394,7 @@ <h3>Usage:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.array2d.html b/docs/libraries/pl.array2d.html
index c07c7bff..c798f4df 100644
--- a/docs/libraries/pl.array2d.html
+++ b/docs/libraries/pl.array2d.html
@@ -364,7 +364,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">f</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of at least one argument
         </li>
         <li><span class="parameter">a</span>
@@ -397,7 +397,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">f</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a binary function
         </li>
         <li><span class="parameter">a</span>
@@ -431,7 +431,7 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">f</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a binary function
         </li>
         <li><span class="parameter">a</span>
@@ -465,11 +465,11 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">opc</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          operation to reduce the final result
         </li>
         <li><span class="parameter">opr</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          operation to reduce the rows
         </li>
         <li><span class="parameter">a</span>
@@ -494,23 +494,23 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">f</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          function of at least two arguments
         </li>
         <li><span class="parameter">ad</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          order of first array (<code>1</code> if <code>a</code> is a list/array, <code>2</code> if it is a 2d array)
         </li>
         <li><span class="parameter">bd</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          order of second array (<code>1</code> if <code>b</code> is a list/array, <code>2</code> if it is a 2d array)
         </li>
         <li><span class="parameter">a</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          1d or 2d array
         </li>
         <li><span class="parameter">b</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          1d or 2d array
         </li>
         <li><span class="parameter">arg</span>
@@ -539,7 +539,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">f</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of 2 arguments
         </li>
         <li><span class="parameter">t1</span>
@@ -562,7 +562,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">product(<span class="string">'..'</span>,{<span class="number">1</span>,<span class="number">2</span>},{<span class="string">'a'</span>,<span class="string">'b'</span>}) == {{<span class="string">'1a'</span>,<span class="string">'2a'</span>},{<span class="string">'1b'</span>,<span class="string">'2b'</span>}}</pre>
+        <pre class="example"><span class="function-name">product</span>(<span class="string">'..'</span>,{<span class="number">1</span>,<span class="number">2</span>},{<span class="string">'a'</span>,<span class="string">'b'</span>}) == {{<span class="string">'1a'</span>,<span class="string">'2a'</span>},{<span class="string">'1b'</span>,<span class="string">'2b'</span>}}</pre>
     </ul>
 
 </dd>
@@ -593,7 +593,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">flatten {{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">3</span>,<span class="number">4</span>},{<span class="number">5</span>,<span class="number">6</span>}} == {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>}</pre>
+        <pre class="example"><span class="function-name">flatten</span> {{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">3</span>,<span class="number">4</span>},{<span class="number">5</span>,<span class="number">6</span>}} == {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>}</pre>
     </ul>
 
 </dd>
@@ -602,7 +602,7 @@ <h3>Usage:</h3>
     <strong>reshape (t, nrows, co)</strong>
     </dt>
     <dd>
-    reshape a 2D array.  Reshape the aray by specifying a new nr of rows.
+    reshape a 2D array.  Reshape the array by specifying a new nr of rows.
 
 
     <h3>Parameters:</h3>
@@ -612,11 +612,11 @@ <h3>Parameters:</h3>
          2d array
         </li>
         <li><span class="parameter">nrows</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          new number of rows
         </li>
         <li><span class="parameter">co</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          use column-order (Fortran-style) (default false)
         </li>
     </ul>
@@ -672,11 +672,11 @@ <h3>Parameters:</h3>
          a 2d array
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          a row index
         </li>
         <li><span class="parameter">i2</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          a row index
         </li>
     </ul>
@@ -706,11 +706,11 @@ <h3>Parameters:</h3>
          a 2d array
         </li>
         <li><span class="parameter">j1</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          a column index
         </li>
         <li><span class="parameter">j2</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          a column index
         </li>
     </ul>
@@ -778,7 +778,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-        a new 2d array with the extracted colums
+        a new 2d array with the extracted columns
     </ol>
 
 
@@ -800,7 +800,7 @@ <h3>Parameters:</h3>
          a 2d array
         </li>
         <li><span class="parameter">i</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          a row index
         </li>
     </ul>
@@ -825,7 +825,7 @@ <h3>Parameters:</h3>
          a 2d array
         </li>
         <li><span class="parameter">j</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          a column index
         </li>
     </ul>
@@ -848,7 +848,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a range (case insensitive).
         </li>
     </ul>
@@ -917,7 +917,7 @@ <h3>Parameters:</h3>
          a 2D array
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          start row or spreadsheet range passed to <a href="../libraries/pl.array2d.html#parse_range">parse_range</a>
          (<em>default</em> 1)
         </li>
@@ -968,7 +968,7 @@ <h3>Parameters:</h3>
          a 2D array
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          start row or spreadsheet range passed to <a href="../libraries/pl.array2d.html#parse_range">parse_range</a>
          (<em>default</em> 1)
         </li>
@@ -1021,7 +1021,7 @@ <h3>Parameters:</h3>
          the value (may be a function, called as <code>val(i,j)</code>)
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          start row or spreadsheet range passed to <a href="../libraries/pl.array2d.html#parse_range">parse_range</a>
          (<em>default</em> 1)
         </li>
@@ -1070,11 +1070,11 @@ <h3>Parameters:</h3>
          a file object (default stdout)
         </li>
         <li><span class="parameter">fmt</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a format string (default is just to use tostring)
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          start row or spreadsheet range passed to <a href="../libraries/pl.array2d.html#parse_range">parse_range</a>
          (<em>default</em> 1)
         </li>
@@ -1119,15 +1119,15 @@ <h3>Parameters:</h3>
          2D array
         </li>
         <li><span class="parameter">row_op</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          function to call on each value; <code>row_op(row,j)</code>
         </li>
         <li><span class="parameter">end_row_op</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          function to call at end of each row; <code>end_row_op(i)</code>
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          start row or spreadsheet range passed to <a href="../libraries/pl.array2d.html#parse_range">parse_range</a>
          (<em>default</em> 1)
         </li>
@@ -1172,11 +1172,11 @@ <h3>Parameters:</h3>
          a 2D array
         </li>
         <li><span class="parameter">di</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          start row in dest
         </li>
         <li><span class="parameter">dj</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          start col in dest
         </li>
         <li><span class="parameter">src</span>
@@ -1184,7 +1184,7 @@ <h3>Parameters:</h3>
          a 2D array
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          start row or spreadsheet range passed to <a href="../libraries/pl.array2d.html#parse_range">parse_range</a>
          (<em>default</em> 1)
         </li>
@@ -1229,11 +1229,11 @@ <h3>Parameters:</h3>
          2D array
         </li>
         <li><span class="parameter">indices</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          with indices (default false)
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">int</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          start row or spreadsheet range passed to <a href="../libraries/pl.array2d.html#parse_range">parse_range</a>
          (<em>default</em> 1)
         </li>
@@ -1333,11 +1333,11 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">rows</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          number of rows
         </li>
         <li><span class="parameter">cols</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          number of cols
         </li>
         <li><span class="parameter">val</span>
@@ -1361,7 +1361,7 @@ <h3>Returns:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.class.html b/docs/libraries/pl.class.html
index b623e941..cd0f0146 100644
--- a/docs/libraries/pl.class.html
+++ b/docs/libraries/pl.class.html
@@ -118,13 +118,13 @@ <h2>Examples</h2>
 <div id="content">
 
 <h1>Module <code>pl.class</code></h1>
-<p>Provides a reuseable and convenient framework for creating classes in Lua.</p>
+<p>Provides a reusable and convenient framework for creating classes in Lua.</p>
 <p> Two possible notations:</p>
 
 
 <pre>
-B = class(A)
-class.B(A)
+B = <span class="function-name">class</span>(A)
+class.<span class="function-name">B</span>(A)
 </pre>
 
 <p> The latter form creates a named class within the current environment. Note
@@ -184,13 +184,13 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> Cat = class()
-<span class="keyword">function</span> Cat:_init(name)
+        <pre class="example"><span class="keyword">local</span> Cat = <span class="function-name">class</span>()
+<span class="keyword">function</span> Cat:<span class="function-name">_init</span>(name)
   <span class="comment">--self:super(name)   -- call the ancestor initializer if needed
 </span>  self.name = name
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> pussycat = Cat(<span class="string">"pussycat"</span>)
+<span class="keyword">local</span> pussycat = <span class="function-name">Cat</span>(<span class="string">"pussycat"</span>)
 <span class="global">print</span>(pussycat.name)  <span class="comment">--&gt; pussycat</span></pre>
     </ul>
 
@@ -223,12 +223,12 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> pussycat = Lion()  <span class="comment">-- assuming Lion derives from Cat
-</span><span class="keyword">if</span> pussycat:is_a(Cat) <span class="keyword">then</span>
+        <pre class="example"><span class="keyword">local</span> pussycat = <span class="function-name">Lion</span>()  <span class="comment">-- assuming Lion derives from Cat
+</span><span class="keyword">if</span> pussycat:<span class="function-name">is_a</span>(Cat) <span class="keyword">then</span>
   <span class="comment">-- it's true, it is a Lion, but also a Cat
 </span><span class="keyword">end</span>
 
-<span class="keyword">if</span> pussycat:is_a() == Lion <span class="keyword">then</span>
+<span class="keyword">if</span> pussycat:<span class="function-name">is_a</span>() == Lion <span class="keyword">then</span>
   <span class="comment">-- It's true
 </span><span class="keyword">end</span></pre>
     </ul>
@@ -260,8 +260,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> pussycat = Lion()  <span class="comment">-- assuming Lion derives from Cat
-</span><span class="keyword">if</span> Cat:class_of(pussycat) <span class="keyword">then</span>
+        <pre class="example"><span class="keyword">local</span> pussycat = <span class="function-name">Lion</span>()  <span class="comment">-- assuming Lion derives from Cat
+</span><span class="keyword">if</span> Cat:<span class="function-name">class_of</span>(pussycat) <span class="keyword">then</span>
   <span class="comment">-- it's true
 </span><span class="keyword">end</span></pre>
     </ul>
@@ -325,7 +325,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.compat.html b/docs/libraries/pl.compat.html
index b0863711..fc838410 100644
--- a/docs/libraries/pl.compat.html
+++ b/docs/libraries/pl.compat.html
@@ -506,20 +506,20 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">name</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          file name, possibly dotted
         </li>
         <li><span class="parameter">path</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a path-template in the same form as package.path or package.cpath
         </li>
         <li><span class="parameter">sep</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          template separate character to be replaced by path separator. Default: "."
          (<em>optional</em>)
         </li>
         <li><span class="parameter">rep</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the path separator to use, defaults to system separator. Default; "/" on Unixes, "\" on Windows.
          (<em>optional</em>)
         </li>
@@ -572,7 +572,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.comprehension.html b/docs/libraries/pl.comprehension.html
index 4c31b649..4733ba83 100644
--- a/docs/libraries/pl.comprehension.html
+++ b/docs/libraries/pl.comprehension.html
@@ -119,26 +119,26 @@ <h1>Module <code>pl.comprehension</code></h1>
 
 
 <pre>
-<span class="keyword">local</span> C= <span class="global">require</span> <span class="string">'pl.comprehension'</span> . new()
+<span class="keyword">local</span> C= <span class="global">require</span> <span class="string">'pl.comprehension'</span> . <span class="function-name">new</span>()
 
-C (<span class="string">'x for x=1,10'</span>) ()
+<span class="function-name">C</span> (<span class="string">'x for x=1,10'</span>) ()
 ==&gt; {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>,<span class="number">7</span>,<span class="number">8</span>,<span class="number">9</span>,<span class="number">10</span>}
-C <span class="string">'x^2 for x=1,4'</span> ()
+<span class="function-name">C</span> <span class="string">'x^2 for x=1,4'</span> ()
 ==&gt; {<span class="number">1</span>,<span class="number">4</span>,<span class="number">9</span>,<span class="number">16</span>}
-C <span class="string">'{x,x^2} for x=1,4'</span> ()
+<span class="function-name">C</span> <span class="string">'{x,x^2} for x=1,4'</span> ()
 ==&gt; {{<span class="number">1</span>,<span class="number">1</span>},{<span class="number">2</span>,<span class="number">4</span>},{<span class="number">3</span>,<span class="number">9</span>},{<span class="number">4</span>,<span class="number">16</span>}}
-C <span class="string">'2*x for x'</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
+<span class="function-name">C</span> <span class="string">'2*x for x'</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
 ==&gt; {<span class="number">2</span>,<span class="number">4</span>,<span class="number">6</span>}
-dbl = C <span class="string">'2*x for x'</span>
-dbl {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
+dbl = <span class="function-name">C</span> <span class="string">'2*x for x'</span>
+<span class="function-name">dbl</span> {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
 ==&gt; {<span class="number">20</span>,<span class="number">40</span>,<span class="number">60</span>}
-C <span class="string">'x for x if x % 2 == 0'</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>}
+<span class="function-name">C</span> <span class="string">'x for x if x % 2 == 0'</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>}
 ==&gt; {<span class="number">2</span>,<span class="number">4</span>}
-C <span class="string">'{x,y} for x = 1,2 for y = 1,2'</span> ()
+<span class="function-name">C</span> <span class="string">'{x,y} for x = 1,2 for y = 1,2'</span> ()
 ==&gt; {{<span class="number">1</span>,<span class="number">1</span>},{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">2</span>,<span class="number">1</span>},{<span class="number">2</span>,<span class="number">2</span>}}
-C <span class="string">'{x,y} for x for y'</span> ({<span class="number">1</span>,<span class="number">2</span>},{<span class="number">10</span>,<span class="number">20</span>})
+<span class="function-name">C</span> <span class="string">'{x,y} for x for y'</span> ({<span class="number">1</span>,<span class="number">2</span>},{<span class="number">10</span>,<span class="number">20</span>})
 ==&gt; {{<span class="number">1</span>,<span class="number">10</span>},{<span class="number">1</span>,<span class="number">20</span>},{<span class="number">2</span>,<span class="number">10</span>},{<span class="number">2</span>,<span class="number">20</span>}}
-<span class="global">assert</span>(C <span class="string">'sum(x^2 for x)'</span> {<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>} == <span class="number">2</span>^<span class="number">2</span>+<span class="number">3</span>^<span class="number">2</span>+<span class="number">4</span>^<span class="number">2</span>)
+<span class="global">assert</span>(<span class="function-name">C</span> <span class="string">'sum(x^2 for x)'</span> {<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>} == <span class="number">2</span>^<span class="number">2</span>+<span class="number">3</span>^<span class="number">2</span>+<span class="number">4</span>^<span class="number">2</span>)
 </pre>
 
 <p> (c) 2008 David Manura. Licensed under the same terms as Lua (MIT license).</p>
@@ -158,7 +158,7 @@ <h1>Module <code>pl.comprehension</code></h1>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.config.html b/docs/libraries/pl.config.html
index 1ad8833b..70f46227 100644
--- a/docs/libraries/pl.config.html
+++ b/docs/libraries/pl.config.html
@@ -136,8 +136,8 @@ <h1>Module <code>pl.config</code></h1>
 
 <span class="comment">-- readconfig.lua
 </span><span class="keyword">local</span> config = <span class="global">require</span> <span class="string">'config'</span>
-<span class="keyword">local</span> t = config.read <span class="string">'test.config'</span>
-<span class="global">print</span>(pretty.write(t))
+<span class="keyword">local</span> t = config.<span class="function-name">read</span> <span class="string">'test.config'</span>
+<span class="global">print</span>(pretty.<span class="function-name">write</span>(t))
 
 ### output #####
 {
@@ -158,7 +158,7 @@ <h2><a href="#Functions">Functions</a></h2>
 <table class="function_list">
 	<tr>
 	<td class="name" nowrap><a href="#lines">lines (file)</a></td>
-	<td class="summary">like io.lines(), but allows for lines to be continued with ''.</td>
+	<td class="summary">like <a href="https://www.lua.org/manual/5.4/manual.html#pdf-io.lines">io.lines</a>, but allows for lines to be continued with '<code>\</code>'.</td>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#read">read (file[, cnfg])</a></td>
@@ -178,14 +178,14 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <strong>lines (file)</strong>
     </dt>
     <dd>
-    like io.lines(), but allows for lines to be continued with ''.
+    like <a href="https://www.lua.org/manual/5.4/manual.html#pdf-io.lines">io.lines</a>, but allows for lines to be continued with '<code>\</code>'.
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">file</span>
          a file-like object (anything where read() returns the next line) or a filename.
- Defaults to stardard input.
+ Defaults to standard input.
         </li>
     </ul>
 
@@ -215,7 +215,7 @@ <h3>Parameters:</h3>
          either a file-like object or a string, which must be a filename
         </li>
         <li><span class="parameter">cnfg</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
 
 <p> a configuration table that may contain these fields:</p>
 
@@ -252,7 +252,7 @@ <h3>Returns:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.data.html b/docs/libraries/pl.data.html
index 736e82e1..3c770ac7 100644
--- a/docs/libraries/pl.data.html
+++ b/docs/libraries/pl.data.html
@@ -124,7 +124,7 @@ <h1>Module <code>pl.data</code></h1>
 
 
 <pre>
-data.read <span class="string">'test.txt'</span>
+data.<span class="function-name">read</span> <span class="string">'test.txt'</span>
 ==&gt; {{<span class="number">10</span>,<span class="number">20</span>},{<span class="number">2</span>,<span class="number">5</span>},{<span class="number">40</span>,<span class="number">50</span>},fieldnames={<span class="string">'x'</span>,<span class="string">'y'</span>},delim=<span class="string">','</span>}
 </pre>
 
@@ -133,7 +133,7 @@ <h1>Module <code>pl.data</code></h1>
 
 <pre>
 <span class="global">require</span> <span class="string">'pl'</span>
-<span class="keyword">local</span> d = data.read(<span class="string">'xyz.txt'</span>)
+<span class="keyword">local</span> d = data.<span class="function-name">read</span>(<span class="string">'xyz.txt'</span>)
 <span class="keyword">local</span> q = d:<span class="global">select</span>(<span class="string">'x,y,z where x &gt; 3 and z &lt; 2 sort by y'</span>)
 <span class="keyword">for</span> x,y,z <span class="keyword">in</span> q <span class="keyword">do</span>
     <span class="global">print</span>(x,y,z)
@@ -236,7 +236,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">condn</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the query expression
         </li>
     </ul>
@@ -261,7 +261,7 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">condn</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the query expression
         </li>
     </ul>
@@ -282,7 +282,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">condn</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the query expression
         </li>
     </ul>
@@ -363,7 +363,7 @@ <h3>Parameters:</h3>
         <li><span class="parameter">cnfg</span> parsing options
         <ul>
         <li><span class="parameter">delim</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string pattern to split fields
         </li>
         <li><span class="parameter">fieldnames</span>
@@ -371,27 +371,27 @@ <h3>Parameters:</h3>
          (i.e. don't read from first line)
         </li>
         <li><span class="parameter">no_convert</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          (default is to try conversion on first data line)
         </li>
         <li><span class="parameter">convert</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          table of custom conversion functions with column keys
         </li>
         <li><span class="parameter">numfields</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          indices of columns known to be numbers
         </li>
         <li><span class="parameter">last_field_collect</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          only split as many fields as fieldnames.
         </li>
         <li><span class="parameter">thousands_dot</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          thousands separator in Excel CSV is '.'
         </li>
         <li><span class="parameter">csv</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          fields may be double-quoted and contain commas;
  Also, empty fields are considered to be equivalent to zero.
         </li>
@@ -430,12 +430,12 @@ <h3>Parameters:</h3>
          filename or file-like object
         </li>
         <li><span class="parameter">fieldnames</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">{string}</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">{string}</a></span>
          list of fields (optional)
          (<em>optional</em>)
         </li>
         <li><span class="parameter">delim</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          delimiter (default tab)
          (<em>default</em> '\t')
         </li>
@@ -470,7 +470,7 @@ <h3>Parameters:</h3>
          the table.
         </li>
         <li><span class="parameter">fieldnames</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">{string}</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">{string}</a></span>
          optional fieldnames
          (<em>optional</em>)
         </li>
@@ -538,7 +538,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">Q</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a query string
         </li>
         <li><span class="parameter">infile</span>
@@ -548,7 +548,7 @@ <h3>Parameters:</h3>
          filename or file-like object
         </li>
         <li><span class="parameter">dont_fail</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          true if you want to return an error, not just fail
         </li>
     </ul>
@@ -564,7 +564,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.dir.html b/docs/libraries/pl.dir.html
index 22e158b0..66371e3e 100644
--- a/docs/libraries/pl.dir.html
+++ b/docs/libraries/pl.dir.html
@@ -196,11 +196,11 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">filename</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file name.
         </li>
         <li><span class="parameter">pattern</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A shell pattern. The only special characters are
  <code>&apos;*&apos;</code> and <code>&apos;?&apos;</code>: <code>&apos;*&apos;</code> matches any sequence of characters and
  <code>&apos;?&apos;</code> matches any single character.
@@ -233,11 +233,11 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">filenames</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          An array containing file names.
         </li>
         <li><span class="parameter">pattern</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A shell pattern (see <a href="../libraries/pl.dir.html#fnmatch">fnmatch</a>).
         </li>
     </ul>
@@ -266,12 +266,12 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">dirname</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A directory.
          (<em>default</em> '.')
         </li>
         <li><span class="parameter">mask</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A shell pattern (see <a href="../libraries/pl.dir.html#fnmatch">fnmatch</a>). If not given, all files are returned.
          (<em>optional</em>)
         </li>
@@ -280,7 +280,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">{string}</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">{string}</a></span>
         list of files
     </ol>
 
@@ -301,7 +301,7 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">dirname</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A directory.
          (<em>default</em> '.')
         </li>
@@ -310,7 +310,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">{string}</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">{string}</a></span>
         a list of directories
     </ol>
 
@@ -331,15 +331,15 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">src</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          source file
         </li>
         <li><span class="parameter">dest</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          destination file or directory
         </li>
         <li><span class="parameter">flag</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          true if you want to force the copy (default)
         </li>
     </ul>
@@ -368,11 +368,11 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">src</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          source file
         </li>
         <li><span class="parameter">dest</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          destination file or directory
         </li>
     </ul>
@@ -408,15 +408,15 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">root</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A starting directory
         </li>
         <li><span class="parameter">bottom_up</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          False if we start listing entries immediately.
         </li>
         <li><span class="parameter">follow_links</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          follow symbolic links
         </li>
     </ul>
@@ -445,7 +445,7 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fullpath</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A directory path (must be an actual directory, not a symlink)
         </li>
     </ul>
@@ -476,7 +476,7 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">p</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A directory path
         </li>
     </ul>
@@ -505,19 +505,19 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">path1</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the base path of the source tree
         </li>
         <li><span class="parameter">path2</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the new base path for the destination
         </li>
         <li><span class="parameter">file_fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          an optional function to apply on all files
         </li>
         <li><span class="parameter">verbose</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          an optional boolean to control the verbosity of the output.
   It can also be a logging function that behaves like print()
         </li>
@@ -539,7 +539,7 @@ <h3>Raises:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">clonetree(<span class="string">'.'</span>,<span class="string">'../backup'</span>,copyfile)</pre>
+        <pre class="example"><span class="function-name">clonetree</span>(<span class="string">'.'</span>,<span class="string">'../backup'</span>,copyfile)</pre>
     </ul>
 
 </dd>
@@ -554,7 +554,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">d</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a directory
         </li>
     </ul>
@@ -583,12 +583,12 @@ <h3>Raises:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">start_path</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
           A directory.
          (<em>default</em> '.')
         </li>
         <li><span class="parameter">shell_pattern</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A shell pattern (see <a href="../libraries/pl.dir.html#fnmatch">fnmatch</a>).
          (<em>default</em> '*')
         </li>
@@ -613,7 +613,7 @@ <h3>Raises:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.file.html b/docs/libraries/pl.file.html
index bd36acaf..391ece41 100644
--- a/docs/libraries/pl.file.html
+++ b/docs/libraries/pl.file.html
@@ -279,7 +279,7 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     </dt>
     <dd>
     Delete a file.
- This function is a copy of <a href="https://www.lua.org/manual/5.1/manual.html#pdf-os.remove">os.remove</a>.
+ This function is a copy of <a href="https://www.lua.org/manual/5.4/manual.html#pdf-os.remove">os.remove</a>.
 
 
 
@@ -294,7 +294,7 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.func.html b/docs/libraries/pl.func.html
index 22e84a10..5ee0ade5 100644
--- a/docs/libraries/pl.func.html
+++ b/docs/libraries/pl.func.html
@@ -124,9 +124,9 @@ <h1>Module <code>pl.func</code></h1>
 
 
 <pre>
-&gt; utils.import <span class="string">'pl.func'</span>
-&gt; ls = List{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
-&gt; = ls:map(_1+<span class="number">1</span>)
+&gt; utils.<span class="function-name">import</span> <span class="string">'pl.func'</span>
+&gt; ls = <span class="function-name">List</span>{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
+&gt; = ls:<span class="function-name">map</span>(_1+<span class="number">1</span>)
 {<span class="number">11</span>,<span class="number">21</span>,<span class="number">31</span>}
 </pre>
 
@@ -134,8 +134,8 @@ <h1>Module <code>pl.func</code></h1>
 
 
 <pre>
-&gt; p = bind(<span class="global">print</span>,<span class="string">'start&gt;'</span>,_0)
-&gt; p(<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>)
+&gt; p = <span class="function-name">bind</span>(<span class="global">print</span>,<span class="string">'start&gt;'</span>,_0)
+&gt; <span class="function-name">p</span>(<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>)
 &gt; start&gt;   <span class="number">10</span>   <span class="number">20</span>  <span class="number">30</span>
 </pre>
 
@@ -175,8 +175,8 @@ <h2><a href="#Functions">Functions</a></h2>
 	<td class="summary">bind the first parameter of the function to a value.</td>
 	</tr>
 	<tr>
-	<td class="name" nowrap><a href="#compose">compose (f, g)</a></td>
-	<td class="summary">create a function which chains two functions.</td>
+	<td class="name" nowrap><a href="#compose">compose (f, g, ...)</a></td>
+	<td class="summary">create a function which chains multiple functions.</td>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#bind">bind (fn, ...)</a></td>
@@ -203,11 +203,11 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tname</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a table name
         </li>
         <li><span class="parameter">context</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          context to put results, defaults to environment of caller
         </li>
     </ul>
@@ -228,11 +228,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function
         </li>
         <li><span class="parameter">name</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          an optional name
          (<em>optional</em>)
         </li>
@@ -259,7 +259,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">ls</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a list-like table.
         </li>
     </ul>
@@ -356,7 +356,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fn</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of one or more arguments
         </li>
         <li><span class="parameter">p</span>
@@ -374,28 +374,31 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">(bind1(<span class="global">math</span>.max,<span class="number">10</span>))(<span class="number">20</span>) == <span class="global">math</span>.max(<span class="number">10</span>,<span class="number">20</span>)</pre>
+        <pre class="example">(<span class="function-name">bind1</span>(<span class="global">math</span>.max,<span class="number">10</span>))(<span class="number">20</span>) == <span class="global">math</span>.<span class="function-name">max</span>(<span class="number">10</span>,<span class="number">20</span>)</pre>
     </ul>
 
 </dd>
     <dt>
     <a name = "compose"></a>
-    <strong>compose (f, g)</strong>
+    <strong>compose (f, g, ...)</strong>
     </dt>
     <dd>
-    create a function which chains two functions.
+    create a function which chains multiple functions.
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">f</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of at least one argument
         </li>
         <li><span class="parameter">g</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of at least one argument
         </li>
+        <li><span class="parameter">...</span>
+         additional functions to compose
+        </li>
     </ul>
 
     <h3>Returns:</h3>
@@ -408,7 +411,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">printf = compose(<span class="global">io</span>.write,<span class="global">string</span>.format)</pre>
+        <li><pre class="example">printf = <span class="function-name">compose</span>(<span class="global">io</span>.write, <span class="global">string</span>.format)</pre></li>
+        <li><pre class="example">printf = <span class="function-name">compose</span>(<span class="global">io</span>.write, <span class="global">string</span>.lower, <span class="global">string</span>.format)</pre></li>
     </ul>
 
 </dd>
@@ -424,7 +428,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fn</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of at least one argument
         </li>
         <li><span class="parameter">...</span>
@@ -442,8 +446,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">(bind(f,_1,a))(b) == f(a,b)</pre></li>
-        <li><pre class="example">(bind(f,_2,_1))(a,b) == f(b,a)</pre></li>
+        <li><pre class="example">(<span class="function-name">bind</span>(f,_1,a))(b) == <span class="function-name">f</span>(a,b)</pre></li>
+        <li><pre class="example">(<span class="function-name">bind</span>(f,_2,_1))(a,b) == <span class="function-name">f</span>(b,a)</pre></li>
     </ul>
 
 </dd>
@@ -453,7 +457,7 @@ <h3>Usage:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.html b/docs/libraries/pl.html
index f3d134fb..24644eca 100644
--- a/docs/libraries/pl.html
+++ b/docs/libraries/pl.html
@@ -115,7 +115,7 @@ <h2>Examples</h2>
 
 <h1>Module <code>pl</code></h1>
 <p>Entry point for loading all PL libraries only on demand, into the global space.</p>
-<p> Requiring 'pl' means that whenever a module is implicitly accesssed
+<p> Requiring 'pl' means that whenever a module is implicitly accessed
  (e.g. <a href="../libraries/pl.utils.html#split">utils.split</a>)
  then that module is dynamically loaded. The submodules are all brought into
  the global space.
@@ -132,7 +132,7 @@ <h1>Module <code>pl</code></h1>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.import_into.html b/docs/libraries/pl.import_into.html
index 5f924591..d3b329ed 100644
--- a/docs/libraries/pl.import_into.html
+++ b/docs/libraries/pl.import_into.html
@@ -115,7 +115,7 @@ <h2>Examples</h2>
 
 <h1>Module <code>pl.import_into</code></h1>
 <p>PL loader, for loading all PL libraries, only on demand.</p>
-<p> Whenever a module is implicitly accesssed, the table will have the module automatically injected.
+<p> Whenever a module is implicitly accessed, the table will have the module automatically injected.
  (e.g. <code>_ENV.tablex</code>)
  then that module is dynamically loaded. The submodules are all brought into
  the table that is provided as the argument, or returned in a new table.
@@ -135,7 +135,7 @@ <h1>Module <code>pl.import_into</code></h1>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.input.html b/docs/libraries/pl.input.html
index d0086fd6..2f551573 100644
--- a/docs/libraries/pl.input.html
+++ b/docs/libraries/pl.input.html
@@ -125,7 +125,7 @@ <h1>Module <code>pl.input</code></h1>
 
 <pre>
 <span class="global">require</span> <span class="string">'pl'</span>
-<span class="keyword">local</span> total,n = seq.sum(input.numbers())
+<span class="keyword">local</span> total,n = seq.<span class="function-name">sum</span>(input.<span class="function-name">numbers</span>())
 <span class="global">print</span>(<span class="string">'average'</span>,total/n)
 </pre>
 
@@ -180,17 +180,17 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">getter</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          any function that returns a line of text
         </li>
         <li><span class="parameter">pattern</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
 
 
 
         </li>
         <li><span class="parameter">fn</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
           Optionally can pass a function to process each token as it's found.
          (<em>optional</em>)
         </li>
@@ -297,14 +297,14 @@ <h3>Parameters:</h3>
          a list of field indices, or a maximum field index
         </li>
         <li><span class="parameter">delim</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          delimiter to parse fields (default space)
         </li>
         <li><span class="parameter">f</span>
          a source @see create_getter
         </li>
         <li><span class="parameter">opts</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          option table, <code>{no_fail=true}</code>
         </li>
     </ul>
@@ -319,7 +319,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">for</span> x,y <span class="keyword">in</span> fields {<span class="number">2</span>,<span class="number">3</span>} <span class="keyword">do</span> <span class="global">print</span>(x,y) <span class="keyword">end</span> <span class="comment">-- 2nd and 3rd fields from stdin</span></pre>
+        <pre class="example"><span class="keyword">for</span> x,y <span class="keyword">in</span> <span class="function-name">fields</span> {<span class="number">2</span>,<span class="number">3</span>} <span class="keyword">do</span> <span class="global">print</span>(x,y) <span class="keyword">end</span> <span class="comment">-- 2nd and 3rd fields from stdin</span></pre>
     </ul>
 
 </dd>
@@ -329,7 +329,7 @@ <h3>Usage:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.lapp.html b/docs/libraries/pl.lapp.html
index 24a10792..af5cee55 100644
--- a/docs/libraries/pl.lapp.html
+++ b/docs/libraries/pl.lapp.html
@@ -125,7 +125,7 @@ <h1>Module <code>pl.lapp</code></h1>
 
 <pre>
 lapp = <span class="global">require</span> <span class="string">'pl.lapp'</span>
-<span class="keyword">local</span> args = lapp <span class="string">[[
+<span class="keyword">local</span> args = <span class="function-name">lapp</span> <span class="string">[[
 Does some calculations
   -o,--offset (default 0.0)  Offset to add to scaled number
   -s,--scale  (number)  Scaling factor
@@ -197,11 +197,11 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">msg</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          optional message
         </li>
         <li><span class="parameter">no_usage</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          suppress 'usage' display
         </li>
     </ul>
@@ -222,11 +222,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">msg</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a message
         </li>
         <li><span class="parameter">no_usage</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          suppress 'usage' display
         </li>
     </ul>
@@ -248,12 +248,12 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">file</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          filename
         </li>
         <li><span class="parameter">opt</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
-         same as second parameter of <a href="https://www.lua.org/manual/5.1/manual.html#pdf-io.open">io.open</a>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+         same as second parameter of <a href="https://www.lua.org/manual/5.4/manual.html#pdf-io.open">io.open</a>
          (<em>optional</em>)
         </li>
     </ul>
@@ -274,11 +274,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">condn</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          a condition
         </li>
         <li><span class="parameter">msg</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          message text
         </li>
     </ul>
@@ -300,14 +300,14 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">name</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          name of type
         </li>
         <li><span class="parameter">converter</span>
          either a function to convert values, or a Lua type name.
         </li>
         <li><span class="parameter">constraint</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          optional function to verify values, should use lapp.error
  if failed.
          (<em>optional</em>)
@@ -331,11 +331,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">str</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the options text
         </li>
         <li><span class="parameter">args</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">{string}</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">{string}</a></span>
          a table of arguments (default is <code>_G.arg</code>)
         </li>
     </ul>
@@ -375,7 +375,7 @@ <h2 class="section-header "><a name="Fields"></a>Fields</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.lexer.html b/docs/libraries/pl.lexer.html
index 7b3d6fdd..dc3102a7 100644
--- a/docs/libraries/pl.lexer.html
+++ b/docs/libraries/pl.lexer.html
@@ -130,7 +130,7 @@ <h1>Module <code>pl.lexer</code></h1>
 
 <pre>
 &gt; s = <span class="string">'for i=1,n do'</span>
-&gt; <span class="keyword">for</span> t,v <span class="keyword">in</span> lexer.lua(s)  <span class="keyword">do</span> <span class="global">print</span>(t,v) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> t,v <span class="keyword">in</span> lexer.<span class="function-name">lua</span>(s)  <span class="keyword">do</span> <span class="global">print</span>(t,v) <span class="keyword">end</span>
 keyword <span class="keyword">for</span>
 iden    i
 =       =
@@ -209,22 +209,22 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> or <span class="type">file</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> or <span class="type">file</span></span>
          a string or a file-like object with <code>:read()</code> method returning lines.
         </li>
         <li><span class="parameter">matches</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          an optional match table - array of token descriptions.
  A token is described by a <code>{pattern, action}</code> pair, where <code>pattern</code> should match
  token body and <code>action</code> is a function called when a token of described type is found.
         </li>
         <li><span class="parameter">filter</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table of token types to exclude, by default <code>{space=true}</code>
          (<em>optional</em>)
         </li>
         <li><span class="parameter">options</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table of options; by default, <code>{number=true,string=true}</code>,
  which means convert numbers and strip string quotes.
          (<em>optional</em>)
@@ -254,7 +254,7 @@ <h3>Parameters:</h3>
  a function is assumed to be a token-like iterator (returns type &amp; value)
         </li>
         <li><span class="parameter">a2</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string is the value
         </li>
     </ul>
@@ -373,16 +373,16 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">filter</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table of token types to exclude, by default <code>{space=true,comments=true}</code>
          (<em>optional</em>)
         </li>
         <li><span class="parameter">options</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table of options; by default, <code>{number=true,string=true}</code>,
  which means convert numbers and strip string quotes.
          (<em>optional</em>)
@@ -406,16 +406,16 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">filter</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table of token types to exclude, by default <code>{space=true,comments=true}</code>
          (<em>optional</em>)
         </li>
         <li><span class="parameter">options</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table of options; by default, <code>{number=true,string=true}</code>,
  which means convert numbers and strip string quotes.
          (<em>optional</em>)
@@ -441,12 +441,12 @@ <h3>Parameters:</h3>
          the token stream
         </li>
         <li><span class="parameter">endtoken</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          end of list. Can be '\n'
          (<em>default</em> ')')
         </li>
         <li><span class="parameter">delim</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          separator
          (<em>default</em> ')
         </li>
@@ -497,11 +497,11 @@ <h3>Parameters:</h3>
          the token stream
         </li>
         <li><span class="parameter">expected_type</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the token type
         </li>
         <li><span class="parameter">no_skip_ws</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          whether we should skip whitespace
         </li>
     </ul>
@@ -517,7 +517,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.luabalanced.html b/docs/libraries/pl.luabalanced.html
index 48f6c63c..ab475c9e 100644
--- a/docs/libraries/pl.luabalanced.html
+++ b/docs/libraries/pl.luabalanced.html
@@ -142,7 +142,7 @@ <h1>Module <code>pl.luabalanced</code></h1>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.operator.html b/docs/libraries/pl.operator.html
index fdd4cfbb..958678e7 100644
--- a/docs/libraries/pl.operator.html
+++ b/docs/libraries/pl.operator.html
@@ -721,7 +721,7 @@ <h3>Returns:</h3>
     </dt>
     <dd>
     match two strings <strong>~</strong>.
- uses <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.find">string.find</a>
+ uses <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.find">string.find</a>
 
 
     <h3>Parameters:</h3>
@@ -812,7 +812,7 @@ <h3>Fields:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.path.html b/docs/libraries/pl.path.html
index 6345f6b8..9c366cc7 100644
--- a/docs/libraries/pl.path.html
+++ b/docs/libraries/pl.path.html
@@ -128,7 +128,7 @@ <h1>Module <code>pl.path</code></h1>
  is Windows paths to allow both forward and backward slashes (since Lua
  also accepts those)</p>
 
-<p> Dependencies: <a href="../libraries/pl.utils.html#">pl.utils</a>, <a href="http://stevedonovan.github.io/lua-stdlibs/modules/lfs.html">lfs</a></p>
+<p> Dependencies: <a href="../libraries/pl.utils.html#">pl.utils</a>, <a href="http://stevedonovan.github.io/lua-stdlibs/lfs.html">lfs</a></p>
 
 
 <h2><a href="#Functions">Functions</a></h2>
@@ -391,7 +391,7 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -412,7 +412,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -433,7 +433,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -454,7 +454,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -480,7 +480,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -501,7 +501,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -522,7 +522,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -544,7 +544,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -561,15 +561,15 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> dir, file = path.splitpath(<span class="string">"some/dir/myfile.txt"</span>)
+        <pre class="example"><span class="keyword">local</span> dir, file = path.<span class="function-name">splitpath</span>(<span class="string">"some/dir/myfile.txt"</span>)
 <span class="global">assert</span>(dir == <span class="string">"some/dir"</span>)
 <span class="global">assert</span>(file == <span class="string">"myfile.txt"</span>)
 
-<span class="keyword">local</span> dir, file = path.splitpath(<span class="string">"some/dir/"</span>)
+<span class="keyword">local</span> dir, file = path.<span class="function-name">splitpath</span>(<span class="string">"some/dir/"</span>)
 <span class="global">assert</span>(dir == <span class="string">"some/dir"</span>)
 <span class="global">assert</span>(file == <span class="string">""</span>)
 
-<span class="keyword">local</span> dir, file = path.splitpath(<span class="string">"some_dir"</span>)
+<span class="keyword">local</span> dir, file = path.<span class="function-name">splitpath</span>(<span class="string">"some_dir"</span>)
 <span class="global">assert</span>(dir == <span class="string">""</span>)
 <span class="global">assert</span>(file == <span class="string">"some_dir"</span>)</pre>
     </ul>
@@ -586,11 +586,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
         <li><span class="parameter">pwd</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          optional start path to use (default is current dir)
          (<em>optional</em>)
         </li>
@@ -613,7 +613,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -621,10 +621,10 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
         <li>
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
         root part (everything upto the "."", maybe empty)</li>
         <li>
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
         extension part (including the ".", maybe empty)</li>
     </ol>
 
@@ -632,11 +632,11 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> file_path, ext = path.splitext(<span class="string">"/bonzo/dog_stuff/cat.txt"</span>)
+        <pre class="example"><span class="keyword">local</span> file_path, ext = path.<span class="function-name">splitext</span>(<span class="string">"/bonzo/dog_stuff/cat.txt"</span>)
 <span class="global">assert</span>(file_path == <span class="string">"/bonzo/dog_stuff/cat"</span>)
 <span class="global">assert</span>(ext == <span class="string">".txt"</span>)
 
-<span class="keyword">local</span> file_path, ext = path.splitext(<span class="string">""</span>)
+<span class="keyword">local</span> file_path, ext = path.<span class="function-name">splitext</span>(<span class="string">""</span>)
 <span class="global">assert</span>(file_path == <span class="string">""</span>)
 <span class="global">assert</span>(ext == <span class="string">""</span>)</pre>
     </ul>
@@ -653,7 +653,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -661,7 +661,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
         everything before the last dir-separator
     </ol>
 
@@ -673,8 +673,8 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">path.dirname(<span class="string">"/some/path/file.txt"</span>)   <span class="comment">-- "/some/path"
-</span>path.dirname(<span class="string">"file.txt"</span>)              <span class="comment">-- "" (empty string)</span></pre>
+        <pre class="example">path.<span class="function-name">dirname</span>(<span class="string">"/some/path/file.txt"</span>)   <span class="comment">-- "/some/path"
+</span>path.<span class="function-name">dirname</span>(<span class="string">"file.txt"</span>)              <span class="comment">-- "" (empty string)</span></pre>
     </ul>
 
 </dd>
@@ -689,7 +689,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -697,7 +697,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
 
 
 
@@ -711,8 +711,8 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">path.basename(<span class="string">"/some/path/file.txt"</span>)  <span class="comment">-- "file.txt"
-</span>path.basename(<span class="string">"/some/path/file/"</span>)     <span class="comment">-- "" (empty string)</span></pre>
+        <pre class="example">path.<span class="function-name">basename</span>(<span class="string">"/some/path/file.txt"</span>)  <span class="comment">-- "file.txt"
+</span>path.<span class="function-name">basename</span>(<span class="string">"/some/path/file/"</span>)     <span class="comment">-- "" (empty string)</span></pre>
     </ul>
 
 </dd>
@@ -727,7 +727,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -735,7 +735,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
 
 
 
@@ -749,8 +749,8 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">path.extension(<span class="string">"/some/path/file.txt"</span>) <span class="comment">-- ".txt"
-</span>path.extension(<span class="string">"/some/path/file_txt"</span>) <span class="comment">-- "" (empty string)</span></pre>
+        <pre class="example">path.<span class="function-name">extension</span>(<span class="string">"/some/path/file.txt"</span>) <span class="comment">-- ".txt"
+</span>path.<span class="function-name">extension</span>(<span class="string">"/some/path/file_txt"</span>) <span class="comment">-- "" (empty string)</span></pre>
     </ul>
 
 </dd>
@@ -765,7 +765,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -775,13 +775,13 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">path.isabs(<span class="string">"hello/path"</span>)    <span class="comment">-- false
-</span>path.isabs(<span class="string">"/hello/path"</span>)   <span class="comment">-- true
+        <pre class="example">path.<span class="function-name">isabs</span>(<span class="string">"hello/path"</span>)    <span class="comment">-- false
+</span>path.<span class="function-name">isabs</span>(<span class="string">"/hello/path"</span>)   <span class="comment">-- true
 </span><span class="comment">-- Windows;
-</span>path.isabs(<span class="string">"hello\path"</span>)    <span class="comment">-- false
-</span>path.isabs(<span class="string">"\hello\path"</span>)   <span class="comment">-- true
-</span>path.isabs(<span class="string">"C:\hello\path"</span>) <span class="comment">-- true
-</span>path.isabs(<span class="string">"C:hello\path"</span>)  <span class="comment">-- false</span></pre>
+</span>path.<span class="function-name">isabs</span>(<span class="string">"hello\path"</span>)    <span class="comment">-- false
+</span>path.<span class="function-name">isabs</span>(<span class="string">"\hello\path"</span>)   <span class="comment">-- true
+</span>path.<span class="function-name">isabs</span>(<span class="string">"C:\hello\path"</span>) <span class="comment">-- true
+</span>path.<span class="function-name">isabs</span>(<span class="string">"C:hello\path"</span>)  <span class="comment">-- false</span></pre>
     </ul>
 
 </dd>
@@ -798,15 +798,15 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">p1</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
         <li><span class="parameter">p2</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
         <li><span class="parameter">...</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          more file paths
         </li>
     </ul>
@@ -814,7 +814,7 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-           <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
         the combined path
     </ol>
 
@@ -822,9 +822,9 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">path.join(<span class="string">"/first"</span>,<span class="string">"second"</span>,<span class="string">"third"</span>)   <span class="comment">-- "/first/second/third"
-</span>path.join(<span class="string">"first"</span>,<span class="string">"second/third"</span>)      <span class="comment">-- "first/second/third"
-</span>path.join(<span class="string">"/first"</span>,<span class="string">"/second"</span>,<span class="string">"third"</span>)  <span class="comment">-- "/second/third"</span></pre>
+        <pre class="example">path.<span class="function-name">join</span>(<span class="string">"/first"</span>,<span class="string">"second"</span>,<span class="string">"third"</span>)   <span class="comment">-- "/first/second/third"
+</span>path.<span class="function-name">join</span>(<span class="string">"first"</span>,<span class="string">"second/third"</span>)      <span class="comment">-- "first/second/third"
+</span>path.<span class="function-name">join</span>(<span class="string">"/first"</span>,<span class="string">"/second"</span>,<span class="string">"third"</span>)  <span class="comment">-- "/second/third"</span></pre>
     </ul>
 
 </dd>
@@ -847,7 +847,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
@@ -857,7 +857,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">path.normcase(<span class="string">"/Some/Path/File.txt"</span>)
+        <pre class="example">path.<span class="function-name">normcase</span>(<span class="string">"/Some/Path/File.txt"</span>)
 <span class="comment">-- Windows: "\some\path\file.txt"
 </span><span class="comment">-- Others : "/Some/Path/File.txt"</span></pre>
     </ul>
@@ -877,7 +877,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a file path
         </li>
     </ul>
@@ -898,11 +898,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a path
         </li>
         <li><span class="parameter">start</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          optional start point (default current directory)
          (<em>optional</em>)
         </li>
@@ -926,11 +926,28 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">P</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          A file path
         </li>
     </ul>
 
+    <h3>Returns:</h3>
+    <ol>
+
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        The file path with the <code>~</code> prefix substituted, or the input path if it had no prefix.
+    </ol>
+     <h3>Or</h3>
+    <ol>
+        <li>
+           <span class="types"><span class="type">nil</span></span>
+
+
+</li>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        Error message if the environment variables were unavailable.</li>
+    </ol>
 
 
 
@@ -962,11 +979,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">path1</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a file path
         </li>
         <li><span class="parameter">path2</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a file path
         </li>
     </ul>
@@ -994,7 +1011,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">mod</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          name of the module
         </li>
     </ul>
@@ -1063,7 +1080,7 @@ <h2 class="section-header "><a name="Fields"></a>Fields</h2>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.permute.html b/docs/libraries/pl.permute.html
index afb887e5..4f6fb4be 100644
--- a/docs/libraries/pl.permute.html
+++ b/docs/libraries/pl.permute.html
@@ -208,7 +208,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">permute.order_table {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>} <span class="comment">--&gt; {{2,3,1},{3,2,1},{3,1,2},{1,3,2},{2,1,3},{1,2,3}}</span></pre>
+        <pre class="example">permute.<span class="function-name">order_table</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>} <span class="comment">--&gt; {{2,3,1},{3,2,1},{3,1,2},{1,3,2},{2,1,3},{1,2,3}}</span></pre>
     </ul>
 
 </dd>
@@ -230,23 +230,23 @@ <h3>Parameters:</h3>
     <h3>Returns:</h3>
     <ol>
 
-        an iterator which provides the next permutation as return values in the same order as the provided lists, preceeded by an index
+        an iterator which provides the next permutation as return values in the same order as the provided lists, preceded by an index
     </ol>
 
 
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> strs = utils.pack(<span class="string">"one"</span>, <span class="keyword">nil</span>, <span class="string">"three"</span>)  <span class="comment">-- adds an 'n' field for nil-safety
-</span><span class="keyword">local</span> bools = utils.pack(<span class="keyword">true</span>, <span class="keyword">false</span>)
-<span class="keyword">local</span> iter = permute.list_iter(strs, bools)
-
-<span class="global">print</span>(iter())    <span class="comment">--&gt; 1, one, true
-</span><span class="global">print</span>(iter())    <span class="comment">--&gt; 2, nil, true
-</span><span class="global">print</span>(iter())    <span class="comment">--&gt; 3, three, true
-</span><span class="global">print</span>(iter())    <span class="comment">--&gt; 4, one, false
-</span><span class="global">print</span>(iter())    <span class="comment">--&gt; 5, nil, false
-</span><span class="global">print</span>(iter())    <span class="comment">--&gt; 6, three, false</span></pre>
+        <pre class="example"><span class="keyword">local</span> strs = utils.<span class="function-name">pack</span>(<span class="string">"one"</span>, <span class="keyword">nil</span>, <span class="string">"three"</span>)  <span class="comment">-- adds an 'n' field for nil-safety
+</span><span class="keyword">local</span> bools = utils.<span class="function-name">pack</span>(<span class="keyword">true</span>, <span class="keyword">false</span>)
+<span class="keyword">local</span> iter = permute.<span class="function-name">list_iter</span>(strs, bools)
+
+<span class="global">print</span>(<span class="function-name">iter</span>())    <span class="comment">--&gt; 1, one, true
+</span><span class="global">print</span>(<span class="function-name">iter</span>())    <span class="comment">--&gt; 2, nil, true
+</span><span class="global">print</span>(<span class="function-name">iter</span>())    <span class="comment">--&gt; 3, three, true
+</span><span class="global">print</span>(<span class="function-name">iter</span>())    <span class="comment">--&gt; 4, one, false
+</span><span class="global">print</span>(<span class="function-name">iter</span>())    <span class="comment">--&gt; 5, nil, false
+</span><span class="global">print</span>(<span class="function-name">iter</span>())    <span class="comment">--&gt; 6, three, false</span></pre>
     </ul>
 
 </dd>
@@ -275,9 +275,9 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> strs = utils.pack(<span class="string">"one"</span>, <span class="keyword">nil</span>, <span class="string">"three"</span>)  <span class="comment">-- adds an 'n' field for nil-safety
-</span><span class="keyword">local</span> bools = utils.pack(<span class="keyword">true</span>, <span class="keyword">false</span>)
-<span class="keyword">local</span> results = permute.list_table(strs, bools)
+        <pre class="example"><span class="keyword">local</span> strs = utils.<span class="function-name">pack</span>(<span class="string">"one"</span>, <span class="keyword">nil</span>, <span class="string">"three"</span>)  <span class="comment">-- adds an 'n' field for nil-safety
+</span><span class="keyword">local</span> bools = utils.<span class="function-name">pack</span>(<span class="keyword">true</span>, <span class="keyword">false</span>)
+<span class="keyword">local</span> results = permute.<span class="function-name">list_table</span>(strs, bools)
 <span class="comment">-- results = {
 </span><span class="comment">--   { "one, true, n = 2 }
 </span><span class="comment">--   { nil, true, n = 2 },
@@ -347,7 +347,7 @@ <h3>See also:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.pretty.html b/docs/libraries/pl.pretty.html
index 4561699e..35a5fdd9 100644
--- a/docs/libraries/pl.pretty.html
+++ b/docs/libraries/pl.pretty.html
@@ -174,7 +174,7 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          string to read in <code>{...}</code> format, possibly with some whitespace
  before or after the curly braces. A single line comment may be present
  at the beginning.
@@ -204,16 +204,16 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          Lua code.
         </li>
         <li><span class="parameter">env</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          environment used to run the code, empty by default.
          (<em>optional</em>)
         </li>
         <li><span class="parameter">paranoid</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          abort loading if any looping constructs a found in the code
  and disable string methods.
          (<em>optional</em>)
@@ -252,17 +252,17 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tbl</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          Table to serialize to a string.
         </li>
         <li><span class="parameter">space</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          The indent to use.
  Defaults to two spaces; pass an empty string for no indentation.
          (<em>optional</em>)
         </li>
         <li><span class="parameter">not_clever</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          Pass <code>true</code> for plain output, e.g <code>{[&apos;key&apos;]=1}</code>.
  Defaults to <code>false</code>.
          (<em>optional</em>)
@@ -292,11 +292,11 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          The table to write to a file or stdout.
         </li>
         <li><span class="parameter">filename</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          File name to write too. Defaults to writing
  to stdout.
          (<em>optional</em>)
@@ -371,14 +371,14 @@ <h3>Parameters:</h3>
          a number.
         </li>
         <li><span class="parameter">kind</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          one of <code>&apos;M&apos;</code> (memory in <code>KiB</code>, <code>MiB</code>, etc.),
  <code>&apos;N&apos;</code> (postfixes are <code>&apos;K&apos;</code>, <code>&apos;M&apos;</code> and <code>&apos;B&apos;</code>),
  or <code>&apos;T&apos;</code> (use commas as thousands separator), <code>&apos;N&apos;</code> by default.
          (<em>optional</em>)
         </li>
         <li><span class="parameter">prec</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          number of digits to use for <code>&apos;M&apos;</code> and <code>&apos;N&apos;</code>, <code>1</code> by default.
          (<em>optional</em>)
         </li>
@@ -395,7 +395,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.seq.html b/docs/libraries/pl.seq.html
index e694581f..48e8a2cb 100644
--- a/docs/libraries/pl.seq.html
+++ b/docs/libraries/pl.seq.html
@@ -121,7 +121,7 @@ <h1>Module <code>pl.seq</code></h1>
 <p>Manipulating iterators as sequences.</p>
 <p> See <a href="../manual/07-functional.md.html#Sequences">The Guide</a></p>
 
-<p> Dependencies: <a href="../libraries/pl.utils.html#">pl.utils</a>, <a href="../libraries/pl.types.html#">pl.types</a>, <a href="https://www.lua.org/manual/5.1/manual.html#5.9">debug</a></p>
+<p> Dependencies: <a href="../libraries/pl.utils.html#">pl.utils</a>, <a href="../libraries/pl.types.html#">pl.types</a>, <a href="https://www.lua.org/manual/5.4/manual.html#6.10">debug</a></p>
 
 
 <h2><a href="#Functions">Functions</a></h2>
@@ -273,8 +273,8 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">sum(list(t)) is the sum of all elements of t</pre></li>
-        <li><pre class="example"><span class="keyword">for</span> x <span class="keyword">in</span> list(t) <span class="keyword">do</span>...<span class="keyword">end</span></pre></li>
+        <li><pre class="example"><span class="function-name">sum</span>(<span class="function-name">list</span>(t)) is the sum of all elements of t</pre></li>
+        <li><pre class="example"><span class="keyword">for</span> x <span class="keyword">in</span> <span class="function-name">list</span>(t) <span class="keyword">do</span>...<span class="keyword">end</span></pre></li>
     </ul>
 
 </dd>
@@ -401,8 +401,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">copy(list(ls)) is equal to ls</pre></li>
-        <li><pre class="example">copy(list {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}) == List{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}</pre></li>
+        <li><pre class="example"><span class="function-name">copy</span>(<span class="function-name">list</span>(ls)) is equal to ls</pre></li>
+        <li><pre class="example"><span class="function-name">copy</span>(<span class="function-name">list</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}) == <span class="function-name">List</span>{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}</pre></li>
     </ul>
 
 </dd>
@@ -437,7 +437,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">copy2(<span class="global">ipairs</span>{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}) == {{<span class="number">1</span>,<span class="number">10</span>},{<span class="number">2</span>,<span class="number">20</span>},{<span class="number">3</span>,<span class="number">30</span>}}</pre>
+        <pre class="example"><span class="function-name">copy2</span>(<span class="global">ipairs</span>{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}) == {{<span class="number">1</span>,<span class="number">10</span>},{<span class="number">2</span>,<span class="number">20</span>},{<span class="number">3</span>,<span class="number">30</span>}}</pre>
     </ul>
 
 </dd>
@@ -544,7 +544,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">for</span> x,y <span class="keyword">in</span> seq.zip(ls1,ls2) <span class="keyword">do</span>....<span class="keyword">end</span></pre>
+        <pre class="example"><span class="keyword">for</span> x,y <span class="keyword">in</span> seq.<span class="function-name">zip</span>(ls1,ls2) <span class="keyword">do</span>....<span class="keyword">end</span></pre>
     </ul>
 
 </dd>
@@ -676,7 +676,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fn</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of two arguments
         </li>
         <li><span class="parameter">iter</span>
@@ -692,8 +692,8 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">seq.reduce(operator.add,seq.list{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}) == <span class="number">10</span></pre></li>
-        <li><pre class="example">seq.reduce(<span class="string">'-'</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>}) == -<span class="number">13</span></pre></li>
+        <li><pre class="example">seq.<span class="function-name">reduce</span>(operator.add,seq.<span class="function-name">list</span>{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}) == <span class="number">10</span></pre></li>
+        <li><pre class="example">seq.<span class="function-name">reduce</span>(<span class="string">'-'</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>}) == -<span class="number">13</span></pre></li>
     </ul>
 
 </dd>
@@ -861,7 +861,7 @@ <h3>Parameters:</h3>
          either a filename, file-like object, or 'STDIN' (for standard input)
         </li>
         <li><span class="parameter">...</span>
-         for Lua 5.2 only, optional format specifiers, as in <a href="https://www.lua.org/manual/5.1/manual.html#pdf-io.read">io.read</a>.
+         for Lua 5.2 only, optional format specifiers, as in <a href="https://www.lua.org/manual/5.4/manual.html#pdf-io.read">io.read</a>.
         </li>
     </ul>
 
@@ -881,7 +881,7 @@ <h3>Returns:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.sip.html b/docs/libraries/pl.sip.html
index d488b09f..c1812ea2 100644
--- a/docs/libraries/pl.sip.html
+++ b/docs/libraries/pl.sip.html
@@ -124,9 +124,9 @@ <h1>Module <code>pl.sip</code></h1>
 
 
 <pre>
-sip.match(<span class="string">'$v=$q'</span>,<span class="string">'name="dolly"'</span>,res)
+sip.<span class="function-name">match</span>(<span class="string">'$v=$q'</span>,<span class="string">'name="dolly"'</span>,res)
 ==&gt; res=={<span class="string">'name'</span>,<span class="string">'dolly'</span>}
-sip.match(<span class="string">'($q{first},$q{second})'</span>,<span class="string">'("john","smith")'</span>,res)
+sip.<span class="function-name">match</span>(<span class="string">'($q{first},$q{second})'</span>,<span class="string">'("john","smith")'</span>,res)
 ==&gt; res=={second=<span class="string">'smith'</span>,first=<span class="string">'john'</span>}
 </pre>
 
@@ -344,11 +344,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">spec</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a SIP pattern
         </li>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function to be called with the results of the match
         </li>
     </ul>
@@ -392,7 +392,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.strict.html b/docs/libraries/pl.strict.html
index 3c9c0bd3..33a2c114 100644
--- a/docs/libraries/pl.strict.html
+++ b/docs/libraries/pl.strict.html
@@ -166,17 +166,17 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">name</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          name of table
          (<em>optional</em>)
         </li>
         <li><span class="parameter">mod</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          the table to protect - if <code>nil</code> then we'll return a new table
          (<em>optional</em>)
         </li>
         <li><span class="parameter">predeclared</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
 
 <ul>
     <li>table of variables that are to be considered predeclared.</li>
@@ -222,7 +222,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">T</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          the table containing the tables to protect. Table <code>T</code> itself will NOT be protected.
         </li>
     </ul>
@@ -243,11 +243,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">mod</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          module table
         </li>
         <li><span class="parameter">name</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          module name
         </li>
     </ul>
@@ -263,7 +263,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.stringio.html b/docs/libraries/pl.stringio.html
index 7505d347..84e30119 100644
--- a/docs/libraries/pl.stringio.html
+++ b/docs/libraries/pl.stringio.html
@@ -123,14 +123,14 @@ <h1>Module <code>pl.stringio</code></h1>
 
 
 <pre>
-f = stringio.open(text)
-l1 = f:read()  <span class="comment">-- read first line
-</span>n,m = f:read (<span class="string">'*n'</span>,<span class="string">'*n'</span>) <span class="comment">-- read two numbers
-</span><span class="keyword">for</span> line <span class="keyword">in</span> f:lines() <span class="keyword">do</span> <span class="global">print</span>(line) <span class="keyword">end</span> <span class="comment">-- iterate over all lines
-</span>f = stringio.create()
-f:write(<span class="string">'hello'</span>)
-f:write(<span class="string">'dolly'</span>)
-<span class="global">assert</span>(f:value(),<span class="string">'hellodolly'</span>)
+f = stringio.<span class="function-name">open</span>(text)
+l1 = f:<span class="function-name">read</span>()  <span class="comment">-- read first line
+</span>n,m = f:<span class="function-name">read</span> (<span class="string">'*n'</span>,<span class="string">'*n'</span>) <span class="comment">-- read two numbers
+</span><span class="keyword">for</span> line <span class="keyword">in</span> f:<span class="function-name">lines</span>() <span class="keyword">do</span> <span class="global">print</span>(line) <span class="keyword">end</span> <span class="comment">-- iterate over all lines
+</span>f = stringio.<span class="function-name">create</span>()
+f:<span class="function-name">write</span>(<span class="string">'hello'</span>)
+f:<span class="function-name">write</span>(<span class="string">'dolly'</span>)
+<span class="global">assert</span>(f:<span class="function-name">value</span>(),<span class="string">'hellodolly'</span>)
 </pre>
 
 <p> See  <a href="../manual/03-strings.md.html#File_style_I_O_on_Strings">the Guide</a>.</p>
@@ -172,7 +172,7 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">f = create(); f:write(<span class="string">'hello, dolly\n'</span>); <span class="global">print</span>(f:value())</pre>
+        <pre class="example">f = <span class="function-name">create</span>(); f:<span class="function-name">write</span>(<span class="string">'hello, dolly\n'</span>); <span class="global">print</span>(f:<span class="function-name">value</span>())</pre>
     </ul>
 
 </dd>
@@ -188,7 +188,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          The input string.
         </li>
     </ul>
@@ -198,7 +198,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">fs = open <span class="string">'20 10'</span>; x,y = f:read (<span class="string">'*n'</span>,<span class="string">'*n'</span>); <span class="global">assert</span>(x == <span class="number">20</span> <span class="keyword">and</span> y == <span class="number">10</span>)</pre>
+        <pre class="example">fs = <span class="function-name">open</span> <span class="string">'20 10'</span>; x,y = f:<span class="function-name">read</span> (<span class="string">'*n'</span>,<span class="string">'*n'</span>); <span class="global">assert</span>(x == <span class="number">20</span> <span class="keyword">and</span> y == <span class="number">10</span>)</pre>
     </ul>
 
 </dd>
@@ -208,7 +208,7 @@ <h3>Usage:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.stringx.html b/docs/libraries/pl.stringx.html
index 590ce222..b00666f7 100644
--- a/docs/libraries/pl.stringx.html
+++ b/docs/libraries/pl.stringx.html
@@ -40,7 +40,7 @@ <h2>Contents</h2>
 <li><a href="#Partitioning_Strings">Partitioning Strings </a></li>
 <li><a href="#Text_handling">Text handling </a></li>
 <li><a href="#Template">Template </a></li>
-<li><a href="#Miscelaneous">Miscelaneous </a></li>
+<li><a href="#Miscellaneous">Miscellaneous </a></li>
 </ul>
 
 
@@ -128,7 +128,7 @@ <h1>Module <code>pl.stringx</code></h1>
 <p>Python-style extended string library.</p>
 <p> see 3.6.1 of the Python reference.
  If you want to make these available as string methods, then say
- <code>stringx.import()</code> to bring them into the standard <a href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> table.</p>
+ <code>stringx.import()</code> to bring them into the standard <a href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> table.</p>
 
 <p> See <a href="../manual/03-strings.md.html#">the Guide</a></p>
 
@@ -243,11 +243,11 @@ <h2><a href="#Partitioning_Strings">Partitioning Strings </a></h2>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#partition">partition (s, ch)</a></td>
-	<td class="summary">partition the string using first occurance of a delimiter</td>
+	<td class="summary">partition the string using first occurrence of a delimiter</td>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#rpartition">rpartition (s, ch)</a></td>
-	<td class="summary">partition the string p using last occurance of a delimiter</td>
+	<td class="summary">partition the string p using last occurrence of a delimiter</td>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#at">at (s, idx)</a></td>
@@ -292,7 +292,7 @@ <h2><a href="#Template">Template </a></h2>
 	<td class="summary">substitute values into a template, preserving indentation.</td>
 	</tr>
 </table>
-<h2><a href="#Miscelaneous">Miscelaneous </a></h2>
+<h2><a href="#Miscellaneous">Miscellaneous </a></h2>
 <table class="function_list">
 	<tr>
 	<td class="name" nowrap><a href="#lines">lines (s)</a></td>
@@ -300,7 +300,7 @@ <h2><a href="#Miscelaneous">Miscelaneous </a></h2>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#title">title (s)</a></td>
-	<td class="summary">inital word letters uppercase ('title case').</td>
+	<td class="summary">initial word letters uppercase ('title case').</td>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#shorten">shorten (s, w, tail)</a></td>
@@ -338,7 +338,7 @@ <h2 class="section-header "><a name="String_Predicates"></a>String Predicates </
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string
         </li>
     </ul>
@@ -359,7 +359,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string
         </li>
     </ul>
@@ -380,7 +380,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string
         </li>
     </ul>
@@ -402,7 +402,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string
         </li>
     </ul>
@@ -423,7 +423,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string
         </li>
     </ul>
@@ -444,7 +444,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string
         </li>
     </ul>
@@ -465,7 +465,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string
         </li>
         <li><span class="parameter">prefix</span>
@@ -489,7 +489,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string
         </li>
         <li><span class="parameter">suffix</span>
@@ -518,7 +518,7 @@ <h2 class="section-header "><a name="Strings_and_Lists"></a>Strings and Lists </
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">seq</span>
@@ -531,7 +531,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">stringx.join(<span class="string">' '</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}) == <span class="string">'1 2 3'</span></pre>
+        <pre class="example">stringx.<span class="function-name">join</span>(<span class="string">' '</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}) == <span class="string">'1 2 3'</span></pre>
     </ul>
 
 </dd>
@@ -550,11 +550,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string.
         </li>
         <li><span class="parameter">keep_ends</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          include line ends.
          (<em>optional</em>)
         </li>
@@ -581,16 +581,16 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">re</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a delimiter (defaults to whitespace)
          (<em>optional</em>)
         </li>
         <li><span class="parameter">n</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          maximum number of results
          (<em>optional</em>)
         </li>
@@ -606,9 +606,9 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">#(stringx.split(<span class="string">'one two'</span>)) == <span class="number">2</span></pre></li>
-        <li><pre class="example">stringx.split(<span class="string">'one,two,three'</span>, <span class="string">','</span>) == List{<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'three'</span>}</pre></li>
-        <li><pre class="example">stringx.split(<span class="string">'one,two,three'</span>, <span class="string">','</span>, <span class="number">2</span>) == List{<span class="string">'one'</span>,<span class="string">'two,three'</span>}</pre></li>
+        <li><pre class="example">#(stringx.<span class="function-name">split</span>(<span class="string">'one two'</span>)) == <span class="number">2</span></pre></li>
+        <li><pre class="example">stringx.<span class="function-name">split</span>(<span class="string">'one,two,three'</span>, <span class="string">','</span>) == <span class="function-name">List</span>{<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'three'</span>}</pre></li>
+        <li><pre class="example">stringx.<span class="function-name">split</span>(<span class="string">'one,two,three'</span>, <span class="string">','</span>, <span class="number">2</span>) == <span class="function-name">List</span>{<span class="string">'one'</span>,<span class="string">'two,three'</span>}</pre></li>
     </ul>
 
 </dd>
@@ -624,11 +624,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">tabsize</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
         [opt=8] number of spaces to expand each tab
         </li>
     </ul>
@@ -643,8 +643,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">stringx.expandtabs(<span class="string">'\tone,two,three'</span>, <span class="number">4</span>)   == <span class="string">'    one,two,three'</span></pre></li>
-        <li><pre class="example">stringx.expandtabs(<span class="string">'  \tone,two,three'</span>, <span class="number">4</span>) == <span class="string">'    one,two,three'</span></pre></li>
+        <li><pre class="example">stringx.<span class="function-name">expandtabs</span>(<span class="string">'\tone,two,three'</span>, <span class="number">4</span>)   == <span class="string">'    one,two,three'</span></pre></li>
+        <li><pre class="example">stringx.<span class="function-name">expandtabs</span>(<span class="string">'  \tone,two,three'</span>, <span class="number">4</span>) == <span class="string">'    one,two,three'</span></pre></li>
     </ul>
 
 </dd>
@@ -663,20 +663,20 @@ <h2 class="section-header "><a name="Finding_and_Replacing"></a>Finding and Repl
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">sub</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          substring
         </li>
         <li><span class="parameter">first</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          first index
          (<em>optional</em>)
         </li>
         <li><span class="parameter">last</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          last index
          (<em>optional</em>)
         </li>
@@ -703,20 +703,20 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">sub</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          substring
         </li>
         <li><span class="parameter">first</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          first index
          (<em>optional</em>)
         </li>
         <li><span class="parameter">last</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          last index
          (<em>optional</em>)
         </li>
@@ -744,19 +744,19 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">old</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the target substring
         </li>
         <li><span class="parameter">new</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the substitution
         </li>
         <li><span class="parameter">n</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          optional maximum number of substitutions
          (<em>optional</em>)
         </li>
@@ -783,15 +783,15 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">sub</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          substring
         </li>
         <li><span class="parameter">allow_overlap</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          allow matches to overlap
          (<em>optional</em>)
         </li>
@@ -802,8 +802,8 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="global">assert</span>(stringx.count(<span class="string">'banana'</span>, <span class="string">'ana'</span>) == <span class="number">1</span>)
-<span class="global">assert</span>(stringx.count(<span class="string">'banana'</span>, <span class="string">'ana'</span>, <span class="keyword">true</span>) == <span class="number">2</span>)</pre>
+        <pre class="example"><span class="global">assert</span>(stringx.<span class="function-name">count</span>(<span class="string">'banana'</span>, <span class="string">'ana'</span>) == <span class="number">1</span>)
+<span class="global">assert</span>(stringx.<span class="function-name">count</span>(<span class="string">'banana'</span>, <span class="string">'ana'</span>, <span class="keyword">true</span>) == <span class="number">2</span>)</pre>
     </ul>
 
 </dd>
@@ -822,15 +822,15 @@ <h2 class="section-header "><a name="Stripping_and_Justifying"></a>Stripping and
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">w</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          width of justification
         </li>
         <li><span class="parameter">ch</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          padding character
          (<em>default</em> ' ')
         </li>
@@ -841,7 +841,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">stringx.ljust(<span class="string">'hello'</span>, <span class="number">10</span>, <span class="string">'*'</span>) == <span class="string">'*****hello'</span></pre>
+        <pre class="example">stringx.<span class="function-name">ljust</span>(<span class="string">'hello'</span>, <span class="number">10</span>, <span class="string">'*'</span>) == <span class="string">'*****hello'</span></pre>
     </ul>
 
 </dd>
@@ -856,15 +856,15 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">w</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          width of justification
         </li>
         <li><span class="parameter">ch</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          padding character
          (<em>default</em> ' ')
         </li>
@@ -875,7 +875,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">stringx.rjust(<span class="string">'hello'</span>, <span class="number">10</span>, <span class="string">'*'</span>) == <span class="string">'hello*****'</span></pre>
+        <pre class="example">stringx.<span class="function-name">rjust</span>(<span class="string">'hello'</span>, <span class="number">10</span>, <span class="string">'*'</span>) == <span class="string">'hello*****'</span></pre>
     </ul>
 
 </dd>
@@ -890,15 +890,15 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">w</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          width of justification
         </li>
         <li><span class="parameter">ch</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          padding character
          (<em>default</em> ' ')
         </li>
@@ -909,7 +909,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">stringx.center(<span class="string">'hello'</span>, <span class="number">10</span>, <span class="string">'*'</span>) == <span class="string">'**hello***'</span></pre>
+        <pre class="example">stringx.<span class="function-name">center</span>(<span class="string">'hello'</span>, <span class="number">10</span>, <span class="string">'*'</span>) == <span class="string">'**hello***'</span></pre>
     </ul>
 
 </dd>
@@ -924,11 +924,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">chrs</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          default any whitespace character,
  but can be a string of characters to be trimmed
          (<em>default</em> '%s')
@@ -951,11 +951,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">chrs</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          default any whitespace character,
  but can be a string of characters to be trimmed
          (<em>default</em> '%s')
@@ -978,11 +978,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">chrs</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          default any whitespace character,
  but can be a string of characters to be trimmed
          (<em>default</em> '%s')
@@ -994,7 +994,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">stringx.strip(<span class="string">'  --== Hello ==--  '</span>, <span class="string">"- ="</span>)  <span class="comment">--&gt; 'Hello'</span></pre>
+        <pre class="example">stringx.<span class="function-name">strip</span>(<span class="string">'  --== Hello ==--  '</span>, <span class="string">"- ="</span>)  <span class="comment">--&gt; 'Hello'</span></pre>
     </ul>
 
 </dd>
@@ -1013,11 +1013,11 @@ <h2 class="section-header "><a name="Partitioning_Strings"></a>Partitioning Stri
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">re</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a Lua string pattern (defaults to whitespace)
          (<em>default</em> '%s')
         </li>
@@ -1037,7 +1037,7 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">a,b = line:splitv(<span class="string">'='</span>)</pre>
+        <pre class="example">a,b = line:<span class="function-name">splitv</span>(<span class="string">'='</span>)</pre>
     </ul>
 
 </dd>
@@ -1046,17 +1046,17 @@ <h3>Usage:</h3>
     <strong>partition (s, ch)</strong>
     </dt>
     <dd>
-    partition the string using first occurance of a delimiter
+    partition the string using first occurrence of a delimiter
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">ch</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          delimiter (match as plain string, no patterns)
         </li>
     </ul>
@@ -1075,8 +1075,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">{stringx.partition(<span class="string">'a,b,c'</span>, <span class="string">','</span>))} == {<span class="string">'a'</span>, <span class="string">','</span>, <span class="string">'b,c'</span>}</pre></li>
-        <li><pre class="example">{stringx.partition(<span class="string">'abc'</span>, <span class="string">'x'</span>))} == {<span class="string">'abc'</span>, <span class="string">''</span>, <span class="string">''</span>}</pre></li>
+        <li><pre class="example">{stringx.<span class="function-name">partition</span>(<span class="string">'a,b,c'</span>, <span class="string">','</span>))} == {<span class="string">'a'</span>, <span class="string">','</span>, <span class="string">'b,c'</span>}</pre></li>
+        <li><pre class="example">{stringx.<span class="function-name">partition</span>(<span class="string">'abc'</span>, <span class="string">'x'</span>))} == {<span class="string">'abc'</span>, <span class="string">''</span>, <span class="string">''</span>}</pre></li>
     </ul>
 
 </dd>
@@ -1085,17 +1085,17 @@ <h3>Usage:</h3>
     <strong>rpartition (s, ch)</strong>
     </dt>
     <dd>
-    partition the string p using last occurance of a delimiter
+    partition the string p using last occurrence of a delimiter
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">ch</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          delimiter (match as plain string, no patterns)
         </li>
     </ul>
@@ -1114,8 +1114,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">{stringx.rpartition(<span class="string">'a,b,c'</span>, <span class="string">','</span>))} == {<span class="string">'a,b'</span>, <span class="string">','</span>, <span class="string">'c'</span>}</pre></li>
-        <li><pre class="example">{stringx.rpartition(<span class="string">'abc'</span>, <span class="string">'x'</span>))} == {<span class="string">''</span>, <span class="string">''</span>, <span class="string">'abc'</span>}</pre></li>
+        <li><pre class="example">{stringx.<span class="function-name">rpartition</span>(<span class="string">'a,b,c'</span>, <span class="string">','</span>))} == {<span class="string">'a,b'</span>, <span class="string">','</span>, <span class="string">'c'</span>}</pre></li>
+        <li><pre class="example">{stringx.<span class="function-name">rpartition</span>(<span class="string">'abc'</span>, <span class="string">'x'</span>))} == {<span class="string">''</span>, <span class="string">''</span>, <span class="string">'abc'</span>}</pre></li>
     </ul>
 
 </dd>
@@ -1130,11 +1130,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">idx</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          an index (can be negative)
         </li>
     </ul>
@@ -1164,7 +1164,7 @@ <h2 class="section-header "><a name="Text_handling"></a>Text handling </h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the (multiline) string
         </li>
         <li><span class="parameter">n</span>
@@ -1172,7 +1172,7 @@ <h3>Parameters:</h3>
          the size of the indent
         </li>
         <li><span class="parameter">ch</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the character to use when indenting
          (<em>default</em> ' ')
         </li>
@@ -1201,7 +1201,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the (multiline) string
         </li>
     </ul>
@@ -1216,7 +1216,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> s = dedent <span class="string">[[
+        <pre class="example"><span class="keyword">local</span> s = <span class="function-name">dedent</span> <span class="string">[[
          One
 
        Two
@@ -1246,7 +1246,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string to format
         </li>
         <li><span class="parameter">width</span>
@@ -1287,7 +1287,7 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string to format
         </li>
         <li><span class="parameter">width</span>
@@ -1332,7 +1332,7 @@ <h2 class="section-header "><a name="Template"></a>Template </h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tmpl</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the template string
         </li>
     </ul>
@@ -1362,7 +1362,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tbl</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table of name-value pairs.
         </li>
     </ul>
@@ -1389,7 +1389,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tbl</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table of name-value pairs.
         </li>
     </ul>
@@ -1419,7 +1419,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tbl</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table of name-value pairs.
         </li>
     </ul>
@@ -1435,7 +1435,7 @@ <h3>Returns:</h3>
 
 </dd>
 </dl>
-    <h2 class="section-header "><a name="Miscelaneous"></a>Miscelaneous </h2>
+    <h2 class="section-header "><a name="Miscellaneous"></a>Miscellaneous </h2>
 
     <dl class="function">
     <dt>
@@ -1449,7 +1449,7 @@ <h2 class="section-header "><a name="Miscelaneous"></a>Miscelaneous </h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
     </ul>
@@ -1465,7 +1465,7 @@ <h3>Returns:</h3>
     <h3>Usage:</h3>
     <ul>
         <pre class="example"><span class="keyword">local</span> line_no = <span class="number">1</span>
-<span class="keyword">for</span> line <span class="keyword">in</span> stringx.lines(some_text) <span class="keyword">do</span>
+<span class="keyword">for</span> line <span class="keyword">in</span> stringx.<span class="function-name">lines</span>(some_text) <span class="keyword">do</span>
   <span class="global">print</span>(line_no, line)
   line_no = line_no + <span class="number">1</span>
 <span class="keyword">end</span></pre>
@@ -1477,14 +1477,14 @@ <h3>Usage:</h3>
     <strong>title (s)</strong>
     </dt>
     <dd>
-    inital word letters uppercase ('title case').
+    initial word letters uppercase ('title case').
  Here 'words' mean chunks of non-space characters.
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
     </ul>
@@ -1499,7 +1499,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">stringx.title(<span class="string">"hello world"</span>) == <span class="string">"Hello World"</span>)</pre>
+        <pre class="example">stringx.<span class="function-name">title</span>(<span class="string">"hello world"</span>) == <span class="string">"Hello World"</span>)</pre>
     </ul>
 
 </dd>
@@ -1515,15 +1515,15 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">w</span>
-            <span class="types"><span class="type">int</span></span>
-         the maxinum size allowed
+            <span class="types"><span class="type">integer</span></span>
+         the maximum size allowed
         </li>
         <li><span class="parameter">tail</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          true if we want to show the end of the string (head otherwise)
         </li>
     </ul>
@@ -1533,9 +1533,9 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">(<span class="string">'1234567890'</span>):shorten(<span class="number">8</span>) == <span class="string">'12345...'</span></pre></li>
-        <li><pre class="example">(<span class="string">'1234567890'</span>):shorten(<span class="number">8</span>, <span class="keyword">true</span>) == <span class="string">'...67890'</span></pre></li>
-        <li><pre class="example">(<span class="string">'1234567890'</span>):shorten(<span class="number">20</span>) == <span class="string">'1234567890'</span></pre></li>
+        <li><pre class="example">(<span class="string">'1234567890'</span>):<span class="function-name">shorten</span>(<span class="number">8</span>) == <span class="string">'12345...'</span></pre></li>
+        <li><pre class="example">(<span class="string">'1234567890'</span>):<span class="function-name">shorten</span>(<span class="number">8</span>, <span class="keyword">true</span>) == <span class="string">'...67890'</span></pre></li>
+        <li><pre class="example">(<span class="string">'1234567890'</span>):<span class="function-name">shorten</span>(<span class="number">20</span>) == <span class="string">'1234567890'</span></pre></li>
     </ul>
 
 </dd>
@@ -1571,7 +1571,7 @@ <h3>Returns:</h3>
     <dd>
     Python-style formatting operator.
  Calling <code>text.format_operator()</code> overloads the % operator for strings to give
- Python/Ruby style formated output.
+ Python/Ruby style formatted output.
  This is extended to also do template-like substitution for map-like data.</p>
 
 <p> Note this goes further than the original, and will allow these cases:</p>
@@ -1583,9 +1583,9 @@ <h3>Returns:</h3>
     <li>a function, as in gsub</li>
 </ol>
 
-<p> For the second two cases, it uses $-variable substituion.</p>
+<p> For the second two cases, it uses $-variable substitution.</p>
 
-<p> When called, this function will monkey-patch the global <a href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> metatable by
+<p> When called, this function will monkey-patch the global <a href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> metatable by
  adding a <code>__mod</code> method.</p>
 
 <p> See <a href="http://lua-users.org/wiki/StringInterpolation">the lua-users wiki</a>
@@ -1597,7 +1597,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="global">require</span> <span class="string">'pl.text'</span>.format_operator()
+        <pre class="example"><span class="global">require</span> <span class="string">'pl.text'</span>.<span class="function-name">format_operator</span>()
 <span class="keyword">local</span> out1 = <span class="string">'%s = %5.3f'</span> % {<span class="string">'PI'</span>,<span class="global">math</span>.pi}                   <span class="comment">--&gt; 'PI = 3.142'
 </span><span class="keyword">local</span> out2 = <span class="string">'$name = $value'</span> % {name=<span class="string">'dog'</span>,value=<span class="string">'Pluto'</span>}   <span class="comment">--&gt; 'dog = Pluto'</span></pre>
     </ul>
@@ -1623,7 +1623,7 @@ <h3>Usage:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.tablex.html b/docs/libraries/pl.tablex.html
index f9e82d07..48eea54a 100644
--- a/docs/libraries/pl.tablex.html
+++ b/docs/libraries/pl.tablex.html
@@ -364,7 +364,7 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
     </ul>
@@ -390,7 +390,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tbl</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
         <li><span class="parameter">idx</span>
@@ -409,8 +409,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">index_by({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>},{<span class="number">2</span>,<span class="number">4</span>}) == {<span class="number">20</span>,<span class="number">40</span>}</pre></li>
-        <li><pre class="example">index_by({one=<span class="number">1</span>,two=<span class="number">2</span>,three=<span class="number">3</span>},{<span class="string">'one'</span>,<span class="string">'three'</span>}) == {<span class="number">1</span>,<span class="number">3</span>}</pre></li>
+        <li><pre class="example"><span class="function-name">index_by</span>({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>},{<span class="number">2</span>,<span class="number">4</span>}) == {<span class="number">20</span>,<span class="number">40</span>}</pre></li>
+        <li><pre class="example"><span class="function-name">index_by</span>({one=<span class="number">1</span>,two=<span class="number">2</span>,three=<span class="number">3</span>},{<span class="string">'one'</span>,<span class="string">'three'</span>}) == {<span class="number">1</span>,<span class="number">3</span>}</pre></li>
     </ul>
 
 </dd>
@@ -426,11 +426,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          A function that takes at least one argument
         </li>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
         <li><span class="parameter">...</span>
@@ -459,15 +459,15 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">start</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
           number
         </li>
         <li><span class="parameter">finish</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          number
         </li>
         <li><span class="parameter">step</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
           make this negative for start &lt; finish
          (<em>default</em> 1)
         </li>
@@ -489,7 +489,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of two arguments
         </li>
         <li><span class="parameter">t</span>
@@ -512,7 +512,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">reduce(<span class="string">'+'</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}) == <span class="number">10</span></pre>
+        <pre class="example"><span class="function-name">reduce</span>(<span class="string">'+'</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}) == <span class="number">10</span></pre>
     </ul>
 
 </dd>
@@ -582,11 +582,11 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t1</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
         <li><span class="parameter">t2</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
     </ul>
@@ -619,11 +619,11 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t1</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
         <li><span class="parameter">t2</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
     </ul>
@@ -660,7 +660,7 @@ <h3>Parameters:</h3>
          a list-like table
         </li>
         <li><span class="parameter">cmp</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function that defines equality (otherwise uses ==)
         </li>
     </ul>
@@ -698,12 +698,12 @@ <h3>Parameters:</h3>
          a value
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          start range
          (<em>default</em> 1)
         </li>
         <li><span class="parameter">i2</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          end range
          (<em>default</em> #t)
         </li>
@@ -725,7 +725,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">n</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          size
         </li>
         <li><span class="parameter">val</span>
@@ -783,11 +783,11 @@ <h3>Parameters:</h3>
          a list-like table
         </li>
         <li><span class="parameter">i1</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          start index
         </li>
         <li><span class="parameter">i2</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          end index
         </li>
     </ul>
@@ -809,7 +809,7 @@ <h3>Returns:</h3>
     <dd>
     modifies a table to be read only.
  This only offers weak protection. Tables can still be modified with
- <a href="https://www.lua.org/manual/5.1/manual.html#pdf-table.insert">table.insert</a> and <a href="https://www.lua.org/manual/5.1/manual.html#pdf-rawset">rawset</a>.</p>
+ <a href="https://www.lua.org/manual/5.4/manual.html#pdf-table.insert">table.insert</a> and <a href="https://www.lua.org/manual/5.4/manual.html#pdf-rawset">rawset</a>.</p>
 
 <p> <em>NOTE</em>: for Lua 5.1 length, pairs and ipairs will not work, since the
  equivalent metamethods are only available in Lua 5.2 and newer.
@@ -818,7 +818,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          the table
         </li>
     </ul>
@@ -848,11 +848,11 @@ <h2 class="section-header "><a name="Copying"></a>Copying</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t1</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          destination table
         </li>
         <li><span class="parameter">t2</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          source (actually any iterable object)
         </li>
     </ul>
@@ -878,7 +878,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          an iterable source
         </li>
     </ul>
@@ -906,7 +906,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          A table
         </li>
     </ul>
@@ -940,17 +940,17 @@ <h3>Parameters:</h3>
          a list-like table
         </li>
         <li><span class="parameter">idest</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          where to start copying values into destination
          (<em>default</em> 1)
         </li>
         <li><span class="parameter">isrc</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          where to start copying values from source
          (<em>default</em> 1)
         </li>
         <li><span class="parameter">nsrc</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          number of elements to copy from source
          (<em>default</em> #src)
         </li>
@@ -980,17 +980,17 @@ <h3>Parameters:</h3>
          a list-like table
         </li>
         <li><span class="parameter">idest</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          where to start copying values into destination
          (<em>default</em> 1)
         </li>
         <li><span class="parameter">isrc</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          where to start copying values from source
          (<em>default</em> 1)
         </li>
         <li><span class="parameter">nsrc</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          number of elements to copy from source
          (<em>default</em> #src)
         </li>
@@ -1007,7 +1007,7 @@ <h3>Parameters:</h3>
     </dt>
     <dd>
     insert values into a table.
- similar to <a href="https://www.lua.org/manual/5.1/manual.html#pdf-table.insert">table.insert</a> but inserts values from given table <a href="../libraries/pl.tablex.html#values">values</a>,
+ similar to <a href="https://www.lua.org/manual/5.4/manual.html#pdf-table.insert">table.insert</a> but inserts values from given table <a href="../libraries/pl.tablex.html#values">values</a>,
  not the object itself, into table <code>t</code> at position <code>pos</code>.
 
 
@@ -1018,7 +1018,7 @@ <h3>Parameters:</h3>
          the list
         </li>
         <li><span class="parameter">position</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          (default is at end)
          (<em>optional</em>)
         </li>
@@ -1057,7 +1057,7 @@ <h3>Parameters:</h3>
          A value
         </li>
         <li><span class="parameter">ignore_mt</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          if true, ignore __eq metamethod (default false)
          (<em>optional</em>)
         </li>
@@ -1097,7 +1097,7 @@ <h3>Parameters:</h3>
          an array
         </li>
         <li><span class="parameter">cmp</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          A comparison function; <code>bool = cmp(t1_value, t2_value)</code>
         </li>
     </ul>
@@ -1112,9 +1112,9 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="global">assert</span>(tablex.compare({ <span class="number">1</span>, <span class="number">2</span>, <span class="number">3</span> }, { <span class="number">1</span>, <span class="number">2</span>, <span class="number">3</span> }, <span class="string">"=="</span>))
+        <pre class="example"><span class="global">assert</span>(tablex.<span class="function-name">compare</span>({ <span class="number">1</span>, <span class="number">2</span>, <span class="number">3</span> }, { <span class="number">1</span>, <span class="number">2</span>, <span class="number">3</span> }, <span class="string">"=="</span>))
 
-<span class="global">assert</span>(tablex.compare(
+<span class="global">assert</span>(tablex.<span class="function-name">compare</span>(
    {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>, hello = <span class="string">"world"</span>},  <span class="comment">-- fields are not compared!
 </span>   {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}, <span class="keyword">function</span>(v1, v2) <span class="keyword">return</span> v1 == v2 <span class="keyword">end</span>)</pre>
     </ul>
@@ -1172,7 +1172,7 @@ <h3>Parameters:</h3>
          A value
         </li>
         <li><span class="parameter">idx</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          index to start; -1 means last element,etc (default 1)
         </li>
     </ul>
@@ -1187,8 +1187,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">find({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>},<span class="number">20</span>) == <span class="number">2</span></pre></li>
-        <li><pre class="example">find({<span class="string">'a'</span>,<span class="string">'b'</span>,<span class="string">'a'</span>,<span class="string">'c'</span>},<span class="string">'a'</span>,<span class="number">2</span>) == <span class="number">3</span></pre></li>
+        <li><pre class="example"><span class="function-name">find</span>({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>},<span class="number">20</span>) == <span class="number">2</span></pre></li>
+        <li><pre class="example"><span class="function-name">find</span>({<span class="string">'a'</span>,<span class="string">'b'</span>,<span class="string">'a'</span>,<span class="string">'c'</span>},<span class="string">'a'</span>,<span class="number">2</span>) == <span class="number">3</span></pre></li>
     </ul>
 
 </dd>
@@ -1226,7 +1226,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">rfind({<span class="number">10</span>,<span class="number">10</span>,<span class="number">10</span>},<span class="number">10</span>) == <span class="number">3</span></pre>
+        <pre class="example"><span class="function-name">rfind</span>({<span class="number">10</span>,<span class="number">10</span>,<span class="number">10</span>},<span class="number">10</span>) == <span class="number">3</span></pre>
     </ul>
 
 </dd>
@@ -1246,11 +1246,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          A table
         </li>
         <li><span class="parameter">cmp</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          A comparison function
         </li>
         <li><span class="parameter">arg</span>
@@ -1272,22 +1272,22 @@ <h3>Usage:</h3>
     <ul>
         <pre class="example"><span class="comment">-- using an operator
 </span><span class="keyword">local</span> lst = { <span class="string">"Rudolph"</span>, <span class="keyword">true</span>, <span class="keyword">false</span>, <span class="number">15</span> }
-<span class="keyword">local</span> idx, cmp_result = tablex.rfind(lst, <span class="string">"=="</span>, <span class="string">"Rudolph"</span>)
+<span class="keyword">local</span> idx, cmp_result = tablex.<span class="function-name">rfind</span>(lst, <span class="string">"=="</span>, <span class="string">"Rudolph"</span>)
 <span class="global">assert</span>(idx == <span class="number">1</span>)
 <span class="global">assert</span>(cmp_result == <span class="keyword">true</span>)
 
-<span class="keyword">local</span> idx, cmp_result = tablex.rfind(lst, <span class="string">"=="</span>, <span class="keyword">false</span>)
+<span class="keyword">local</span> idx, cmp_result = tablex.<span class="function-name">rfind</span>(lst, <span class="string">"=="</span>, <span class="keyword">false</span>)
 <span class="global">assert</span>(idx == <span class="number">3</span>)
 <span class="global">assert</span>(cmp_result == <span class="keyword">true</span>)       <span class="comment">-- looking up 'false' works!
 </span>
 <span class="comment">-- using a function returning the value looked up
 </span><span class="keyword">local</span> cmp = <span class="keyword">function</span>(v1, v2) <span class="keyword">return</span> v1 == v2 <span class="keyword">and</span> v2 <span class="keyword">end</span>
-<span class="keyword">local</span> idx, cmp_result = tablex.rfind(lst, cmp, <span class="string">"Rudolph"</span>)
+<span class="keyword">local</span> idx, cmp_result = tablex.<span class="function-name">rfind</span>(lst, cmp, <span class="string">"Rudolph"</span>)
 <span class="global">assert</span>(idx == <span class="number">1</span>)
 <span class="global">assert</span>(cmp_result == <span class="string">"Rudolph"</span>)  <span class="comment">-- the value is returned
 </span>
 <span class="comment">-- NOTE: this fails, since 'false' cannot be returned!
-</span><span class="keyword">local</span> idx, cmp_result = tablex.rfind(lst, cmp, <span class="keyword">false</span>)
+</span><span class="keyword">local</span> idx, cmp_result = tablex.<span class="function-name">rfind</span>(lst, cmp, <span class="keyword">false</span>)
 <span class="global">assert</span>(idx == <span class="keyword">nil</span>)               <span class="comment">-- looking up 'false' failed!
 </span><span class="global">assert</span>(cmp_result == <span class="keyword">nil</span>)</pre>
     </ul>
@@ -1304,7 +1304,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          the table
         </li>
         <li><span class="parameter">value</span>
@@ -1327,7 +1327,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">search(_G,<span class="global">math</span>.sin,{<span class="global">package</span>.path}) == <span class="string">'math.sin'</span></pre>
+        <pre class="example"><span class="function-name">search</span>(_G,<span class="global">math</span>.sin,{<span class="global">package</span>.path}) == <span class="string">'math.sin'</span></pre>
     </ul>
 
 </dd>
@@ -1348,11 +1348,11 @@ <h2 class="section-header "><a name="MappingAndFiltering"></a>MappingAndFilterin
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          A function that takes at least one argument
         </li>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          A table
         </li>
         <li><span class="parameter">...</span>
@@ -1365,7 +1365,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">map(<span class="keyword">function</span>(v) <span class="keyword">return</span> v*v <span class="keyword">end</span>, {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,fred=<span class="number">2</span>}) is {<span class="number">100</span>,<span class="number">400</span>,<span class="number">900</span>,fred=<span class="number">4</span>}</pre>
+        <pre class="example"><span class="function-name">map</span>(<span class="keyword">function</span>(v) <span class="keyword">return</span> v*v <span class="keyword">end</span>, {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,fred=<span class="number">2</span>}) <span class="function-name">is</span> {<span class="number">100</span>,<span class="number">400</span>,<span class="number">900</span>,fred=<span class="number">4</span>}</pre>
     </ul>
 
 </dd>
@@ -1382,7 +1382,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          A function that takes at least one argument
         </li>
         <li><span class="parameter">t</span>
@@ -1404,7 +1404,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">imap(<span class="keyword">function</span>(v) <span class="keyword">return</span> v*v <span class="keyword">end</span>, {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,fred=<span class="number">2</span>}) is {<span class="number">100</span>,<span class="number">400</span>,<span class="number">900</span>}</pre>
+        <pre class="example"><span class="function-name">imap</span>(<span class="keyword">function</span>(v) <span class="keyword">return</span> v*v <span class="keyword">end</span>, {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,fred=<span class="number">2</span>}) <span class="function-name">is</span> {<span class="number">100</span>,<span class="number">400</span>,<span class="number">900</span>}</pre>
     </ul>
 
 </dd>
@@ -1419,7 +1419,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">name</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the method name
         </li>
         <li><span class="parameter">t</span>
@@ -1443,22 +1443,22 @@ <h3>Usage:</h3>
     <ul>
         <pre class="example"><span class="keyword">local</span> Car = {}
 Car.__index = Car
-<span class="keyword">function</span> Car.new(car)
+<span class="keyword">function</span> Car.<span class="function-name">new</span>(car)
   <span class="keyword">return</span> <span class="global">setmetatable</span>(car <span class="keyword">or</span> {}, Car)
 <span class="keyword">end</span>
 Car.speed = <span class="number">0</span>
-<span class="keyword">function</span> Car:faster(increase)
+<span class="keyword">function</span> Car:<span class="function-name">faster</span>(increase)
   self.speed = self.speed + increase
   <span class="keyword">return</span> self.speed
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> ferrari = Car.new{ name = <span class="string">"Ferrari"</span> }
-<span class="keyword">local</span> lamborghini = Car.new{ name = <span class="string">"Lamborghini"</span>, speed = <span class="number">50</span> }
+<span class="keyword">local</span> ferrari = Car.<span class="function-name">new</span>{ name = <span class="string">"Ferrari"</span> }
+<span class="keyword">local</span> lamborghini = Car.<span class="function-name">new</span>{ name = <span class="string">"Lamborghini"</span>, speed = <span class="number">50</span> }
 <span class="keyword">local</span> cars = { ferrari, lamborghini }
 
 <span class="global">assert</span>(ferrari.speed == <span class="number">0</span>)
 <span class="global">assert</span>(lamborghini.speed == <span class="number">50</span>)
-tablex.map_named_method(<span class="string">"faster"</span>, cars, <span class="number">10</span>)
+tablex.<span class="function-name">map_named_method</span>(<span class="string">"faster"</span>, cars, <span class="number">10</span>)
 <span class="global">assert</span>(ferrari.speed == <span class="number">10</span>)
 <span class="global">assert</span>(lamborghini.speed == <span class="number">60</span>)</pre>
     </ul>
@@ -1475,15 +1475,15 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of at least two arguments
         </li>
         <li><span class="parameter">t1</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
         <li><span class="parameter">t2</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
         <li><span class="parameter">...</span>
@@ -1501,7 +1501,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">map2(<span class="string">'+'</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,m=<span class="number">4</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,m=<span class="number">40</span>}) is {<span class="number">11</span>,<span class="number">22</span>,<span class="number">23</span>,m=<span class="number">44</span>}</pre>
+        <pre class="example"><span class="function-name">map2</span>(<span class="string">'+'</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,m=<span class="number">4</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,m=<span class="number">40</span>}) <span class="function-name">is</span> {<span class="number">11</span>,<span class="number">22</span>,<span class="number">23</span>,m=<span class="number">44</span>}</pre>
     </ul>
 
 </dd>
@@ -1517,7 +1517,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function of at least two arguments
         </li>
         <li><span class="parameter">t1</span>
@@ -1538,7 +1538,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">imap2(<span class="string">'+'</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,m=<span class="number">4</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,m=<span class="number">40</span>}) is {<span class="number">11</span>,<span class="number">22</span>,<span class="number">23</span>}</pre>
+        <pre class="example"><span class="function-name">imap2</span>(<span class="string">'+'</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,m=<span class="number">4</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,m=<span class="number">40</span>}) <span class="function-name">is</span> {<span class="number">11</span>,<span class="number">22</span>,<span class="number">23</span>}</pre>
     </ul>
 
 </dd>
@@ -1559,7 +1559,7 @@ <h3>Parameters:</h3>
          A function that takes as many arguments as there are tables
         </li>
         <li><span class="parameter">...</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          n tables
         </li>
         <li><span class="parameter">fun</span>
@@ -1572,8 +1572,8 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">mapn(<span class="keyword">function</span>(x,y,z) <span class="keyword">return</span> x+y+z <span class="keyword">end</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>},{<span class="number">100</span>,<span class="number">200</span>,<span class="number">300</span>}) is {<span class="number">111</span>,<span class="number">222</span>,<span class="number">333</span>}</pre></li>
-        <li><pre class="example">mapn(<span class="global">math</span>.max, {<span class="number">1</span>,<span class="number">20</span>,<span class="number">300</span>},{<span class="number">10</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">100</span>,<span class="number">200</span>,<span class="number">100</span>}) is    {<span class="number">100</span>,<span class="number">200</span>,<span class="number">300</span>}</pre></li>
+        <li><pre class="example"><span class="function-name">mapn</span>(<span class="keyword">function</span>(x,y,z) <span class="keyword">return</span> x+y+z <span class="keyword">end</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>},{<span class="number">100</span>,<span class="number">200</span>,<span class="number">300</span>}) <span class="function-name">is</span> {<span class="number">111</span>,<span class="number">222</span>,<span class="number">333</span>}</pre></li>
+        <li><pre class="example"><span class="function-name">mapn</span>(<span class="global">math</span>.max, {<span class="number">1</span>,<span class="number">20</span>,<span class="number">300</span>},{<span class="number">10</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">100</span>,<span class="number">200</span>,<span class="number">100</span>}) <span class="function-name">is</span>    {<span class="number">100</span>,<span class="number">200</span>,<span class="number">300</span>}</pre></li>
     </ul>
 
 </dd>
@@ -1591,11 +1591,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          A function which will be passed each key and value as arguments, plus any extra arguments to pairmap.
         </li>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          A table
         </li>
         <li><span class="parameter">...</span>
@@ -1608,8 +1608,8 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">pairmap(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> v <span class="keyword">end</span>,{fred=<span class="number">10</span>,bonzo=<span class="number">20</span>}) is {<span class="number">10</span>,<span class="number">20</span>} _or_ {<span class="number">20</span>,<span class="number">10</span>}</pre></li>
-        <li><pre class="example">pairmap(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> {k,v},k <span class="keyword">end</span>,{one=<span class="number">1</span>,two=<span class="number">2</span>}) is {one={<span class="string">'one'</span>,<span class="number">1</span>},two={<span class="string">'two'</span>,<span class="number">2</span>}}</pre></li>
+        <li><pre class="example"><span class="function-name">pairmap</span>(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> v <span class="keyword">end</span>,{fred=<span class="number">10</span>,bonzo=<span class="number">20</span>}) <span class="function-name">is</span> {<span class="number">10</span>,<span class="number">20</span>} <span class="function-name">_or_</span> {<span class="number">20</span>,<span class="number">10</span>}</pre></li>
+        <li><pre class="example"><span class="function-name">pairmap</span>(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> {k,v},k <span class="keyword">end</span>,{one=<span class="number">1</span>,two=<span class="number">2</span>}) <span class="function-name">is</span> {one={<span class="string">'one'</span>,<span class="number">1</span>},two={<span class="string">'two'</span>,<span class="number">2</span>}}</pre></li>
     </ul>
 
 </dd>
@@ -1628,7 +1628,7 @@ <h3>Parameters:</h3>
          a list-like table
         </li>
         <li><span class="parameter">pred</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a boolean function
         </li>
         <li><span class="parameter">arg</span>
@@ -1659,11 +1659,11 @@ <h2 class="section-header "><a name="Iterating"></a>Iterating</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function on the elements; <code>function(value, key, ...)</code>
         </li>
         <li><span class="parameter">...</span>
@@ -1697,7 +1697,7 @@ <h3>Parameters:</h3>
          a table
         </li>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a function with at least one argument
         </li>
         <li><span class="parameter">...</span>
@@ -1721,11 +1721,11 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          the table
         </li>
         <li><span class="parameter">f</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          an optional comparison function (f(x,y) is true if x &lt; y)
         </li>
     </ul>
@@ -1740,7 +1740,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">for</span> k,v <span class="keyword">in</span> tablex.sort(t) <span class="keyword">do</span> <span class="global">print</span>(k,v) <span class="keyword">end</span></pre>
+        <pre class="example"><span class="keyword">for</span> k,v <span class="keyword">in</span> tablex.<span class="function-name">sort</span>(t) <span class="keyword">do</span> <span class="global">print</span>(k,v) <span class="keyword">end</span></pre>
     </ul>
 
 </dd>
@@ -1755,11 +1755,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          the table
         </li>
         <li><span class="parameter">f</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          an optional comparison function (f(x,y) is true if x &lt; y)
         </li>
     </ul>
@@ -1774,7 +1774,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">for</span> k,v <span class="keyword">in</span> tablex.sortv(t) <span class="keyword">do</span> <span class="global">print</span>(k,v) <span class="keyword">end</span></pre>
+        <pre class="example"><span class="keyword">for</span> k,v <span class="keyword">in</span> tablex.<span class="function-name">sortv</span>(t) <span class="keyword">do</span> <span class="global">print</span>(k,v) <span class="keyword">end</span></pre>
     </ul>
 
 </dd>
@@ -1793,7 +1793,7 @@ <h2 class="section-header "><a name="Extraction"></a>Extraction</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          A list-like table where the values are the keys of the input table
         </li>
     </ul>
@@ -1814,7 +1814,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          A list-like table where the values are the values of the input table
         </li>
     </ul>
@@ -1842,11 +1842,11 @@ <h3>Parameters:</h3>
          a list-like table
         </li>
         <li><span class="parameter">first</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          An index
         </li>
         <li><span class="parameter">last</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          An index
         </li>
     </ul>
@@ -1878,15 +1878,15 @@ <h2 class="section-header "><a name="Merging"></a>Merging</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t1</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
         <li><span class="parameter">t2</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table
         </li>
         <li><span class="parameter">dup</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          true for a union, false for an intersection.
         </li>
     </ul>
@@ -1900,8 +1900,8 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <li><pre class="example">merge({alice=<span class="number">23</span>,fred=<span class="number">34</span>},{bob=<span class="number">25</span>,fred=<span class="number">34</span>}) is {fred=<span class="number">34</span>}</pre></li>
-        <li><pre class="example">merge({alice=<span class="number">23</span>,fred=<span class="number">34</span>},{bob=<span class="number">25</span>,fred=<span class="number">34</span>},<span class="keyword">true</span>) is {bob=<span class="number">25</span>,fred=<span class="number">34</span>,alice=<span class="number">23</span>}</pre></li>
+        <li><pre class="example"><span class="function-name">merge</span>({alice=<span class="number">23</span>,fred=<span class="number">34</span>},{bob=<span class="number">25</span>,fred=<span class="number">34</span>}) <span class="function-name">is</span> {fred=<span class="number">34</span>}</pre></li>
+        <li><pre class="example"><span class="function-name">merge</span>({alice=<span class="number">23</span>,fred=<span class="number">34</span>},{bob=<span class="number">25</span>,fred=<span class="number">34</span>},<span class="keyword">true</span>) <span class="function-name">is</span> {bob=<span class="number">25</span>,fred=<span class="number">34</span>,alice=<span class="number">23</span>}</pre></li>
     </ul>
 
 </dd>
@@ -1918,15 +1918,15 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s1</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a map-like table or set
         </li>
         <li><span class="parameter">s2</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a map-like table or set
         </li>
         <li><span class="parameter">symm</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          symmetric difference (default false)
         </li>
     </ul>
@@ -1963,7 +1963,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">zip({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>},{<span class="number">100</span>,<span class="number">200</span>,<span class="number">300</span>}) is {{<span class="number">10</span>,<span class="number">100</span>},{<span class="number">20</span>,<span class="number">200</span>},{<span class="number">30</span>,<span class="number">300</span>}}</pre>
+        <pre class="example"><span class="function-name">zip</span>({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>},{<span class="number">100</span>,<span class="number">200</span>,<span class="number">300</span>}) <span class="function-name">is</span> {{<span class="number">10</span>,<span class="number">100</span>},{<span class="number">20</span>,<span class="number">200</span>},{<span class="number">30</span>,<span class="number">300</span>}}</pre>
     </ul>
 
 </dd>
@@ -1973,7 +1973,7 @@ <h3>Usage:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.template.html b/docs/libraries/pl.template.html
index c2ac2c01..73658aad 100644
--- a/docs/libraries/pl.template.html
+++ b/docs/libraries/pl.template.html
@@ -184,43 +184,80 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <strong>substitute (str[, env])</strong>
     </dt>
     <dd>
-
-<p>expand the template using the specified environment.
+    expand the template using the specified environment.
  This function will compile and render the template. For more performant
  recurring usage use the two step approach by using <a href="../libraries/pl.template.html#compile">compile</a> and <a href="../libraries/pl.template.html#ct:render">ct:render</a>.
- There are six special fields in the environment table <code>env</code></p>
-
-<ul>
-    <li><code>_parent</code>: continue looking up in this table (e.g. <code>_parent=_G</code>).</li>
-    <li><code>_brackets</code>: bracket pair that wraps inline Lua expressions,  default is '()'.</li>
-    <li><code>_escape</code>: character marking Lua lines, default is '#'</li>
-    <li><code>_inline_escape</code>: character marking inline Lua expression, default is '$'.</li>
-    <li><code>_chunk_name</code>: chunk name for loaded templates, used if there
-     is an error in Lua code. Default is 'TMP'.</li>
-    <li><code>_debug</code>: if truthy, the generated code will be printed upon a render error</li>
-</ul>
-
-
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">str</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the template string
         </li>
-        <li><span class="parameter">env</span>
-            <span class="types"><span class="type">tab</span></span>
-         the environment
-         (<em>optional</em>)
+        <li><span class="parameter">env</span> the environment. This table has the following special fields:
+        <ul>
+        <li><span class="parameter">_parent</span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
+         continue looking up in this table (e.g. <code>_parent=_G</code>).
+         (<em>default</em> nil)
+        </li>
+        <li><span class="parameter">_brackets</span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+         bracket pair that wraps inline Lua expressions.
+         (<em>default</em> "()")
+        </li>
+        <li><span class="parameter">_escape</span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+         character marking Lua lines.
+         (<em>default</em> "#")
         </li>
+        <li><span class="parameter">_inline_escape</span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+         character marking inline Lua expression.
+         (<em>default</em> "$")
+        </li>
+        <li><span class="parameter">_chunk_name</span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+         chunk name for loaded templates, used if there
+ is an error in Lua code.
+         (<em>default</em> "TMP")
+        </li>
+        <li><span class="parameter">_debug</span>
+            <span class="types"><span class="type">boolean</span></span>
+         if truthy, the generated code will be printed upon a render error.
+         (<em>default</em> false)
+        </li>
+        </li></ul>
     </ul>
 
     <h3>Returns:</h3>
     <ol>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        render result</li>
+        <li>
+           <span class="types"><span class="type">nil</span></span>
+
+
+</li>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        source_code (only if '<code>env._debug</code>' was truthy).</li>
+    </ol>
+     <h3>Or</h3>
+    <ol>
+        <li>
+           <span class="types"><span class="type">nil</span></span>
+
 
-        <code>rendered template + nil + source_code</code>, or <code>nil + error + source_code</code>. The last
- return value (<code>source_code</code>) is only returned if the debug option is used.
+</li>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        error message</li>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        source_code (only if '<code>env._debug</code>' was truthy).</li>
     </ol>
 
 
@@ -238,17 +275,17 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">env</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          the environment.
          (<em>optional</em>)
         </li>
         <li><span class="parameter">parent</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          continue looking up in this table (e.g. <code>parent=_G</code>).
          (<em>optional</em>)
         </li>
         <li><span class="parameter">db</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          if thruthy, it will print the code upon a render error
  (provided the template was compiled with the debug option).
          (<em>optional</em>)
@@ -257,17 +294,39 @@ <h3>Parameters:</h3>
 
     <h3>Returns:</h3>
     <ol>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        render result</li>
+        <li>
+           <span class="types"><span class="type">nil</span></span>
 
-        <code>rendered template + nil + source_code</code>, or <code>nil + error + source_code</code>. The last return value
- (<code>source_code</code>) is only returned if the template was compiled with the debug option.
+
+</li>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        source_code (only if '<code>env._debug</code>' was truthy).</li>
+    </ol>
+     <h3>Or</h3>
+    <ol>
+        <li>
+           <span class="types"><span class="type">nil</span></span>
+
+
+</li>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        error message</li>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        source_code (only if '<code>env._debug</code>' was truthy).</li>
     </ol>
 
 
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> ct, err = template.compile(my_template)
-<span class="keyword">local</span> rendered , err = ct:render(my_env, parent)</pre>
+        <pre class="example"><span class="keyword">local</span> ct, err = template.<span class="function-name">compile</span>(my_template)
+<span class="keyword">local</span> rendered , err = ct:<span class="function-name">render</span>(my_env, parent)</pre>
     </ul>
 
 </dd>
@@ -276,50 +335,82 @@ <h3>Usage:</h3>
     <strong>compile (str[, opts])</strong>
     </dt>
     <dd>
-
-<p>compiles the template.
+    compiles the template.
  Returns an object that can repeatedly be rendered without parsing/compiling
- the template again.
- The options passed in the <code>opts</code> table support the following options:</p>
-
-<ul>
-    <li><code>chunk_name</code>: chunk name for loaded templates, used if there
-     is an error in Lua code. Default is 'TMP'.</li>
-    <li><code>escape</code>: character marking Lua lines, default is '#'</li>
-    <li><code>inline_escape</code>: character marking inline Lua expression, default is '$'.</li>
-    <li><code>inline_brackets</code>: bracket pair that wraps inline Lua expressions, default is '()'.</li>
-    <li><code>newline</code>: string to replace newline characters, default is <code>nil</code> (not replacing newlines).</li>
-    <li><a href="https://www.lua.org/manual/5.1/manual.html#5.9">debug</a>: if truthy, the generated source code will be retained within the compiled template object, default is <code>nil</code>.</li>
-</ul>
-
-
+ the template again. Preserves the line layout of the template so that line
+ numbers in error messages should point to the correct lines in the source
+ string.
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">str</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the template string
         </li>
-        <li><span class="parameter">opts</span>
-            <span class="types"><span class="type">tab</span></span>
-         the compilation options to use
-         (<em>optional</em>)
+        <li><span class="parameter">opts</span> the compilation options to use. This table supports the following options:
+        <ul>
+        <li><span class="parameter">chunk_name</span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+         chunk name for loaded templates, used if there
+ is an error in Lua code.
+         (<em>default</em> "TMP")
         </li>
+        <li><span class="parameter">escape</span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+         character marking Lua lines.
+         (<em>default</em> "#")
+        </li>
+        <li><span class="parameter">inline_escape</span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+         character marking inline Lua expression.
+         (<em>default</em> "$")
+        </li>
+        <li><span class="parameter">inline_brackets</span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+         bracket pair that wraps inline Lua expressions.
+         (<em>default</em> "()")
+        </li>
+        <li><span class="parameter">newline</span>
+            <span class="types"><span class="type">boolean</span></span>
+         if truthy, newlines will be stripped from text in the template.
+         (<em>default</em> false)
+        </li>
+        <li><span class="parameter">debug</span>
+            <span class="types"><span class="type">boolean</span></span>
+         if truthy, the generated code will be printed upon a render error.
+         (<em>default</em> false)
+        </li>
+        </li></ul>
     </ul>
 
     <h3>Returns:</h3>
     <ol>
 
-        template object, or <code>nil + error + source_code</code>
+           <span class="types"><span class="type">ct</span></span>
+        compiled template object
+    </ol>
+     <h3>Or</h3>
+    <ol>
+        <li>
+           <span class="types"><span class="type">nil</span></span>
+
+
+</li>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        error message</li>
+        <li>
+           <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
+        source_code</li>
     </ol>
 
 
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> ct, err = template.compile(my_template)
-<span class="keyword">local</span> rendered , err = ct:render(my_env, parent)</pre>
+        <pre class="example"><span class="keyword">local</span> ct, err = template.<span class="function-name">compile</span>(my_template)
+<span class="keyword">local</span> rendered , err = ct:<span class="function-name">render</span>(my_env, parent)</pre>
     </ul>
 
 </dd>
@@ -329,7 +420,7 @@ <h3>Usage:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.test.html b/docs/libraries/pl.test.html
index 72aff1de..64497e6f 100644
--- a/docs/libraries/pl.test.html
+++ b/docs/libraries/pl.test.html
@@ -124,13 +124,13 @@ <h1>Module <code>pl.test</code></h1>
 
 
 <pre>
-test.asserteq({<span class="number">1</span>,<span class="number">2</span>},{<span class="number">1</span>,<span class="number">2</span>}) <span class="comment">-- can compare tables
-</span>test.asserteq(<span class="number">1.2</span>,<span class="number">1.19</span>,<span class="number">0.02</span>) <span class="comment">-- compare FP numbers within precision
+test.<span class="function-name">asserteq</span>({<span class="number">1</span>,<span class="number">2</span>},{<span class="number">1</span>,<span class="number">2</span>}) <span class="comment">-- can compare tables
+</span>test.<span class="function-name">asserteq</span>(<span class="number">1.2</span>,<span class="number">1.19</span>,<span class="number">0.02</span>) <span class="comment">-- compare FP numbers within precision
 </span>T = test.tuple <span class="comment">-- used for comparing multiple results
-</span>test.asserteq(T(<span class="global">string</span>.find(<span class="string">" me"</span>,<span class="string">"me"</span>)),T(<span class="number">2</span>,<span class="number">3</span>))
+</span>test.<span class="function-name">asserteq</span>(<span class="function-name">T</span>(<span class="global">string</span>.<span class="function-name">find</span>(<span class="string">" me"</span>,<span class="string">"me"</span>)),<span class="function-name">T</span>(<span class="number">2</span>,<span class="number">3</span>))
 </pre>
 
-<p> Dependencies: <a href="../libraries/pl.utils.html#">pl.utils</a>, <a href="../libraries/pl.tablex.html#">pl.tablex</a>, <a href="../libraries/pl.pretty.html#">pl.pretty</a>, <a href="../libraries/pl.path.html#">pl.path</a>, <a href="https://www.lua.org/manual/5.1/manual.html#5.9">debug</a></p>
+<p> Dependencies: <a href="../libraries/pl.utils.html#">pl.utils</a>, <a href="../libraries/pl.tablex.html#">pl.tablex</a>, <a href="../libraries/pl.pretty.html#">pl.pretty</a>, <a href="../libraries/pl.path.html#">pl.path</a>, <a href="https://www.lua.org/manual/5.4/manual.html#6.10">debug</a></p>
 </p>
 
 
@@ -378,7 +378,7 @@ <h3>Parameters:</h3>
  Unlike regular array-like tables ('sequences') they may contain nils.
  Tuples understand equality and know how to print themselves out.
  The # operator is defined to be the size, irrespecive of any nils,
- and there is an <a href="https://www.lua.org/manual/5.1/manual.html#pdf-unpack">unpack</a> method.
+ and there is an <code>unpack</code> method.
 
 
     <h3>Parameters:</h3>
@@ -395,7 +395,7 @@ <h3>Parameters:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">asserteq(tuple( (<span class="string">'ab'</span>):find <span class="string">'a'</span>), tuple(<span class="number">1</span>,<span class="number">1</span>))</pre>
+        <pre class="example"><span class="function-name">asserteq</span>(<span class="function-name">tuple</span>( (<span class="string">'ab'</span>):<span class="function-name">find</span> <span class="string">'a'</span>), <span class="function-name">tuple</span>(<span class="number">1</span>,<span class="number">1</span>))</pre>
     </ul>
 
 </dd>
@@ -411,15 +411,15 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">msg</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a descriptive message
         </li>
         <li><span class="parameter">n</span>
-            <span class="types"><span class="type">int</span></span>
+            <span class="types"><span class="type">integer</span></span>
          number of times to call the function
         </li>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          the function
         </li>
         <li><span class="parameter">...</span>
@@ -438,7 +438,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.text.html b/docs/libraries/pl.text.html
index db3334df..a15af4c7 100644
--- a/docs/libraries/pl.text.html
+++ b/docs/libraries/pl.text.html
@@ -138,7 +138,7 @@ <h1>Module <code>pl.text</code></h1>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.types.html b/docs/libraries/pl.types.html
index 252005eb..b880da38 100644
--- a/docs/libraries/pl.types.html
+++ b/docs/libraries/pl.types.html
@@ -152,7 +152,7 @@ <h2><a href="#Functions">Functions</a></h2>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#is_iterable">is_iterable (val)</a></td>
-	<td class="summary">can an object be iterated over with <a href="https://www.lua.org/manual/5.1/manual.html#pdf-pairs">pairs</a>?</td>
+	<td class="summary">can an object be iterated over with <a href="https://www.lua.org/manual/5.4/manual.html#pdf-pairs">pairs</a>?</td>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#is_writeable">is_writeable (val)</a></td>
@@ -354,7 +354,7 @@ <h3>Returns:</h3>
     <strong>is_iterable (val)</strong>
     </dt>
     <dd>
-    can an object be iterated over with <a href="https://www.lua.org/manual/5.1/manual.html#pdf-pairs">pairs</a>?
+    can an object be iterated over with <a href="https://www.lua.org/manual/5.4/manual.html#pdf-pairs">pairs</a>?
  An object is iterable if:</p>
 
 <ul>
@@ -468,7 +468,7 @@ <h3>Returns:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.url.html b/docs/libraries/pl.url.html
index 7c973719..c102dc1b 100644
--- a/docs/libraries/pl.url.html
+++ b/docs/libraries/pl.url.html
@@ -154,11 +154,11 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
         <li><span class="parameter">quote_plus</span>
-            <span class="types"><span class="type">bool</span></span>
+            <span class="types"><span class="type">boolean</span></span>
          Also escape slashes and replace spaces by plus signs.
         </li>
     </ul>
@@ -184,7 +184,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">s</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the string
         </li>
     </ul>
@@ -205,7 +205,7 @@ <h3>Returns:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.utils.html b/docs/libraries/pl.utils.html
index 678907bb..7457815f 100644
--- a/docs/libraries/pl.utils.html
+++ b/docs/libraries/pl.utils.html
@@ -168,11 +168,11 @@ <h2><a href="#Functions">Functions</a></h2>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#npairs">npairs (t[, i_start=1[, i_end=t.n or #t[, step=1]]])</a></td>
-	<td class="summary">an iterator with indices, similar to <a href="https://www.lua.org/manual/5.1/manual.html#pdf-ipairs">ipairs</a>, but with a range.</td>
+	<td class="summary">an iterator with indices, similar to <a href="https://www.lua.org/manual/5.4/manual.html#pdf-ipairs">ipairs</a>, but with a range.</td>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#kpairs">kpairs (t)</a></td>
-	<td class="summary">an iterator over all non-integer keys (inverse of <a href="https://www.lua.org/manual/5.1/manual.html#pdf-ipairs">ipairs</a>).</td>
+	<td class="summary">an iterator over all non-integer keys (inverse of <a href="https://www.lua.org/manual/5.4/manual.html#pdf-ipairs">ipairs</a>).</td>
 	</tr>
 </table>
 <h2><a href="#Tables">Tables</a></h2>
@@ -373,10 +373,10 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> t = <span class="global">table</span>.pack(<span class="keyword">nil</span>, <span class="keyword">nil</span>, <span class="keyword">nil</span>, <span class="number">4</span>)
-<span class="keyword">local</span> a, b, c, d = <span class="global">table</span>.<span class="global">unpack</span>(t)   <span class="comment">-- this <a href="../libraries/pl.utils.html#unpack">unpack</a> is NOT nil-safe, so d == nil
+        <pre class="example"><span class="keyword">local</span> t = <span class="global">table</span>.<span class="function-name">pack</span>(<span class="keyword">nil</span>, <span class="keyword">nil</span>, <span class="keyword">nil</span>, <span class="number">4</span>)
+<span class="keyword">local</span> a, b, c, d = <span class="global">table</span>.<span class="function-name">unpack</span>(t)   <span class="comment">-- this <a href="../libraries/pl.utils.html#unpack">unpack</a> is NOT nil-safe, so d == nil
 </span>
-<span class="keyword">local</span> a, b, c, d = utils.<span class="global">unpack</span>(t)   <span class="comment">-- this is nil-safe, so d == 4</span></pre>
+<span class="keyword">local</span> a, b, c, d = utils.<span class="function-name">unpack</span>(t)   <span class="comment">-- this is nil-safe, so d == 4</span></pre>
     </ul>
 
 </dd>
@@ -392,7 +392,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">fmt</span>
-         The format (see <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.format">string.format</a>)
+         The format (see <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.format">string.format</a>)
         </li>
         <li><span class="parameter">...</span>
          Extra arguments for format
@@ -418,7 +418,7 @@ <h3>Parameters:</h3>
          File handle to write to.
         </li>
         <li><span class="parameter">fmt</span>
-         The format (see <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.format">string.format</a>).
+         The format (see <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.format">string.format</a>).
         </li>
         <li><span class="parameter">...</span>
          Extra arguments for format
@@ -497,7 +497,7 @@ <h3>Parameters:</h3>
          (<em>optional</em>)
         </li>
         <li><span class="parameter">tostr</span>
-         custom tostring function, called with (value,index). Defaults to <a href="https://www.lua.org/manual/5.1/manual.html#pdf-tostring">tostring</a>.
+         custom tostring function, called with (value,index). Defaults to <a href="https://www.lua.org/manual/5.4/manual.html#pdf-tostring">tostring</a>.
          (<em>optional</em>)
         </li>
     </ul>
@@ -541,11 +541,11 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">utils.is_type(<span class="string">"hello world"</span>, <span class="string">"string"</span>)   <span class="comment">--&gt; true
+        <pre class="example">utils.<span class="function-name">is_type</span>(<span class="string">"hello world"</span>, <span class="string">"string"</span>)   <span class="comment">--&gt; true
 </span><span class="comment">-- or check metatable
 </span><span class="keyword">local</span> my_mt = {}
 <span class="keyword">local</span> my_obj = <span class="global">setmetatable</span>(my_obj, my_mt)
-utils.is_type(my_obj, my_mt)  <span class="comment">--&gt; true</span></pre>
+utils.<span class="function-name">is_type</span>(my_obj, my_mt)  <span class="comment">--&gt; true</span></pre>
     </ul>
 
 </dd>
@@ -554,7 +554,7 @@ <h3>Usage:</h3>
     <strong>npairs (t[, i_start=1[, i_end=t.n or #t[, step=1]]])</strong>
     </dt>
     <dd>
-    an iterator with indices, similar to <a href="https://www.lua.org/manual/5.1/manual.html#pdf-ipairs">ipairs</a>, but with a range.
+    an iterator with indices, similar to <a href="https://www.lua.org/manual/5.4/manual.html#pdf-ipairs">ipairs</a>, but with a range.
  This is a nil-safe index based iterator that will return <code>nil</code> when there
  is a hole in a list. To be safe ensure that table <code>t.n</code> contains the length.
 
@@ -562,7 +562,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          the table to iterate over
         </li>
         <li><span class="parameter">i_start</span>
@@ -601,9 +601,9 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> t = utils.pack(<span class="keyword">nil</span>, <span class="number">123</span>, <span class="keyword">nil</span>)  <span class="comment">-- adds an <code>n</code> field when packing
+        <pre class="example"><span class="keyword">local</span> t = utils.<span class="function-name">pack</span>(<span class="keyword">nil</span>, <span class="number">123</span>, <span class="keyword">nil</span>)  <span class="comment">-- adds an <code>n</code> field when packing
 </span>
-<span class="keyword">for</span> i, v <span class="keyword">in</span> utils.npairs(t, <span class="number">2</span>) <span class="keyword">do</span>  <span class="comment">-- start at index 2
+<span class="keyword">for</span> i, v <span class="keyword">in</span> utils.<span class="function-name">npairs</span>(t, <span class="number">2</span>) <span class="keyword">do</span>  <span class="comment">-- start at index 2
 </span>  t[i] = <span class="global">tostring</span>(t[i])
 <span class="keyword">end</span>
 
@@ -616,19 +616,19 @@ <h3>Usage:</h3>
     <strong>kpairs (t)</strong>
     </dt>
     <dd>
-    an iterator over all non-integer keys (inverse of <a href="https://www.lua.org/manual/5.1/manual.html#pdf-ipairs">ipairs</a>).
+    an iterator over all non-integer keys (inverse of <a href="https://www.lua.org/manual/5.4/manual.html#pdf-ipairs">ipairs</a>).
  It will skip any key that is an integer number, so negative indices or an
  array with holes will not return those either (so it returns slightly less than
- 'the inverse of <a href="https://www.lua.org/manual/5.1/manual.html#pdf-ipairs">ipairs</a>').</p>
+ 'the inverse of <a href="https://www.lua.org/manual/5.4/manual.html#pdf-ipairs">ipairs</a>').</p>
 
-<p> This uses <a href="https://www.lua.org/manual/5.1/manual.html#pdf-pairs">pairs</a> under the hood, so any value that is iterable using <a href="https://www.lua.org/manual/5.1/manual.html#pdf-pairs">pairs</a>
+<p> This uses <a href="https://www.lua.org/manual/5.4/manual.html#pdf-pairs">pairs</a> under the hood, so any value that is iterable using <a href="https://www.lua.org/manual/5.4/manual.html#pdf-pairs">pairs</a>
  will work with this function.
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          the table to iterate over
         </li>
     </ul>
@@ -658,7 +658,7 @@ <h3>Usage:</h3>
   world = <span class="string">"Welt"</span>,
 }
 
-<span class="keyword">for</span> k, v <span class="keyword">in</span> utils.kpairs(t) <span class="keyword">do</span>
+<span class="keyword">for</span> k, v <span class="keyword">in</span> utils.<span class="function-name">kpairs</span>(t) <span class="keyword">do</span>
   <span class="global">print</span>(<span class="string">"German: "</span>, v)
 <span class="keyword">end</span>
 
@@ -776,8 +776,8 @@ <h3>Raises:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> param1 = assert_arg(<span class="number">1</span>,<span class="string">"hello"</span>,<span class="string">'table'</span>)  <span class="comment">--&gt; error: argument 1 expected a 'table', got a 'string'
-</span><span class="keyword">local</span> param4 = assert_arg(<span class="number">4</span>,<span class="string">'!@#$%^&amp;*'</span>,<span class="string">'string'</span>,path.isdir,<span class="string">'not a directory'</span>)
+        <pre class="example"><span class="keyword">local</span> param1 = <span class="function-name">assert_arg</span>(<span class="number">1</span>,<span class="string">"hello"</span>,<span class="string">'table'</span>)  <span class="comment">--&gt; error: argument 1 expected a 'table', got a 'string'
+</span><span class="keyword">local</span> param4 = <span class="function-name">assert_arg</span>(<span class="number">4</span>,<span class="string">'!@#$%^&amp;*'</span>,<span class="string">'string'</span>,path.isdir,<span class="string">'not a directory'</span>)
      <span class="comment">--&gt; error: argument 4: '!@#$%^&amp;*' not a directory</span></pre>
     </ul>
 
@@ -792,7 +792,7 @@ <h3>Usage:</h3>
  non-existing values, and/or converting strings/identifiers to other values.</p>
 
 <p> Calling on the object does the same, but returns a soft error; <code>nil + err</code>, if
- the call is succesful (the key exists), it will return the value.</p>
+ the call is successful (the key exists), it will return the value.</p>
 
 <p> When calling with varargs or an array the values will be equal to the keys.
  The enum object is read-only.
@@ -801,7 +801,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">...</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a> or <span class="type">vararg</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a> or <span class="type">vararg</span></span>
          the input for the Enum. If varargs or an array then the
  values in the Enum will be equal to the names (must be strings), if a hash-table
  then values remain (any type), and the keys must be strings.
@@ -820,7 +820,7 @@ <h3>Usage:</h3>
     <ul>
         <li><pre class="example"><span class="comment">-- Enum access at runtime
 </span><span class="keyword">local</span> obj = {}
-obj.MOVEMENT = utils.enum(<span class="string">"FORWARD"</span>, <span class="string">"REVERSE"</span>, <span class="string">"LEFT"</span>, <span class="string">"RIGHT"</span>)
+obj.MOVEMENT = utils.<span class="function-name">enum</span>(<span class="string">"FORWARD"</span>, <span class="string">"REVERSE"</span>, <span class="string">"LEFT"</span>, <span class="string">"RIGHT"</span>)
 
 <span class="keyword">if</span> current_movement == obj.MOVEMENT.FORWARD <span class="keyword">then</span>
   <span class="comment">-- do something
@@ -832,17 +832,17 @@ <h3>Usage:</h3>
 <span class="keyword">end</span></pre></li>
         <li><pre class="example"><span class="comment">-- standardized error codes
 </span><span class="keyword">local</span> obj = {
-  ERR = utils.enum {
+  ERR = utils.<span class="function-name">enum</span> {
     NOT_FOUND = <span class="string">"the item was not found"</span>,
     OUT_OF_BOUNDS = <span class="string">"the index is outside the allowed range"</span>
   },
 
   some_method = <span class="keyword">function</span>(self)
-    <span class="keyword">return</span> self.ERR.OUT_OF_BOUNDS
+    <span class="keyword">return</span> <span class="keyword">nil</span>, self.ERR.OUT_OF_BOUNDS
   <span class="keyword">end</span>,
 }
 
-<span class="keyword">local</span> result, err = obj:some_method()
+<span class="keyword">local</span> result, err = obj:<span class="function-name">some_method</span>()
 <span class="keyword">if</span> <span class="keyword">not</span> result <span class="keyword">then</span>
   <span class="keyword">if</span> err == obj.ERR.NOT_FOUND <span class="keyword">then</span>
     <span class="comment">-- check on error code, not magic strings
@@ -854,16 +854,16 @@ <h3>Usage:</h3>
 <span class="keyword">end</span></pre></li>
         <li><pre class="example"><span class="comment">-- validating/converting user-input
 </span><span class="keyword">local</span> color = <span class="string">"purple"</span>
-<span class="keyword">local</span> ansi_colors = utils.enum {
+<span class="keyword">local</span> ansi_colors = utils.<span class="function-name">enum</span> {
   black     = <span class="number">30</span>,
   red       = <span class="number">31</span>,
   green     = <span class="number">32</span>,
 }
-<span class="keyword">local</span> color_code, err = ansi_colors(color) <span class="comment">-- calling on the object, returns the value from the enum
+<span class="keyword">local</span> color_code, err = <span class="function-name">ansi_colors</span>(color) <span class="comment">-- calling on the object, returns the value from the enum
 </span><span class="keyword">if</span> <span class="keyword">not</span> color_code <span class="keyword">then</span>
   <span class="global">print</span>(<span class="string">"bad 'color', "</span> .. err)
   <span class="comment">-- "bad 'color', 'purple' is not a valid value (expected one of: 'black', 'red', 'green')"
-</span>  <span class="global">os</span>.exit(<span class="number">1</span>)
+</span>  <span class="global">os</span>.<span class="function-name">exit</span>(<span class="number">1</span>)
 <span class="keyword">end</span></pre></li>
     </ul>
 
@@ -936,7 +936,7 @@ <h3>Raises:</h3>
     <h3>Usage:</h3>
     <ul>
         <pre class="example"><span class="keyword">local</span> val = <span class="number">42</span>
-<span class="keyword">local</span> param2 = utils.assert_string(<span class="number">2</span>, val) <span class="comment">--&gt; error: argument 2 expected a 'string', got a 'number'</span></pre>
+<span class="keyword">local</span> param2 = utils.<span class="function-name">assert_string</span>(<span class="number">2</span>, val) <span class="comment">--&gt; error: argument 2 expected a 'string', got a 'number'</span></pre>
     </ul>
 
 </dd>
@@ -1002,7 +1002,7 @@ <h3>See also:</h3>
     <h3>Usage:</h3>
     <ul>
         <pre class="example"><span class="keyword">if</span> some_condition <span class="keyword">then</span>
-  <span class="keyword">return</span> utils.raise(<span class="string">"some condition was not met"</span>)  <span class="comment">-- MUST use 'return'!
+  <span class="keyword">return</span> utils.<span class="function-name">raise</span>(<span class="string">"some condition was not met"</span>)  <span class="comment">-- MUST use 'return'!
 </span><span class="keyword">end</span></pre>
     </ul>
 
@@ -1147,7 +1147,7 @@ <h3>Returns:</h3>
     <dd>
     Quote and escape an argument of a command.
  Quotes a single (or list of) argument(s) of a command to be passed
- to <a href="https://www.lua.org/manual/5.1/manual.html#pdf-os.execute">os.execute</a>, <code>pl.utils.execute</code> or <a href="../libraries/pl.utils.html#executeex">pl.utils.executeex</a>.
+ to <a href="https://www.lua.org/manual/5.4/manual.html#pdf-os.execute">os.execute</a>, <code>pl.utils.execute</code> or <a href="../libraries/pl.utils.html#executeex">pl.utils.executeex</a>.
 
 
     <h3>Parameters:</h3>
@@ -1168,7 +1168,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> options = utils.quote_arg {
+        <pre class="example"><span class="keyword">local</span> options = utils.<span class="function-name">quote_arg</span> {
     <span class="string">"-lluacov"</span>,
     <span class="string">"-e"</span>,
     <span class="string">"utils = print(require('pl.utils')._VERSION"</span>,
@@ -1208,9 +1208,9 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">utils.quit(-<span class="number">1</span>, <span class="string">"Error '%s' happened"</span>, <span class="string">"42"</span>)
+        <pre class="example">utils.<span class="function-name">quit</span>(-<span class="number">1</span>, <span class="string">"Error '%s' happened"</span>, <span class="string">"42"</span>)
 <span class="comment">-- is equivalent to
-</span>utils.quit(<span class="string">"Error '%s' happened"</span>, <span class="string">"42"</span>)  <span class="comment">--&gt; Error '42' happened</span></pre>
+</span>utils.<span class="function-name">quit</span>(<span class="string">"Error '%s' happened"</span>, <span class="string">"42"</span>)  <span class="comment">--&gt; Error '42' happened</span></pre>
     </ul>
 
 </dd>
@@ -1258,7 +1258,7 @@ <h3>Parameters:</h3>
          optional If truthy don't use Lua patterns
         </li>
         <li><span class="parameter">n</span>
-         optional maximum number of elements (if there are more, the last will remian un-split)
+         optional maximum number of elements (if there are more, the last will remain un-split)
         </li>
     </ul>
 
@@ -1318,7 +1318,7 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">first,<span class="global">next</span> = splitv(<span class="string">'user=jane=doe'</span>,<span class="string">'='</span>, <span class="keyword">false</span>, <span class="number">2</span>)
+        <pre class="example">first,<span class="global">next</span> = <span class="function-name">splitv</span>(<span class="string">'user=jane=doe'</span>,<span class="string">'='</span>, <span class="keyword">false</span>, <span class="number">2</span>)
 <span class="global">assert</span>(first == <span class="string">"user"</span>)
 <span class="global">assert</span>(<span class="global">next</span> == <span class="string">"jane=doe"</span>)</pre>
     </ul>
@@ -1342,14 +1342,14 @@ <h2 class="section-header "><a name="Functional"></a>Functional </h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">func</span>
-         a function of at least one argument
+         a function that takes exactly one argument (which later serves as the cache key) and returns a single value
         </li>
     </ul>
 
     <h3>Returns:</h3>
     <ol>
 
-        a function with at least one argument, which is used as the key.
+        a function taking one argument and returning a single value either from the cache or by running the original input function
     </ol>
 
 
@@ -1369,11 +1369,11 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">mt</span>
-            <span class="types"><span class="type">tab</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          metatable
         </li>
         <li><span class="parameter">fun</span>
-            <span class="types"><span class="type">func</span></span>
+            <span class="types"><span class="type">function</span></span>
          a callable that returns a function
         </li>
     </ul>
@@ -1409,8 +1409,8 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">string_lambda <span class="string">'|x|x+1'</span> (<span class="number">2</span>) == <span class="number">3</span>
-string_lambda <span class="string">'_+1'</span> (<span class="number">2</span>) == <span class="number">3</span></pre>
+        <pre class="example"><span class="function-name">string_lambda</span> <span class="string">'|x|x+1'</span> (<span class="number">2</span>) == <span class="number">3</span>
+<span class="function-name">string_lambda</span> <span class="string">'_+1'</span> (<span class="number">2</span>) == <span class="number">3</span></pre>
     </ul>
 
 </dd>
@@ -1448,14 +1448,14 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> <span class="keyword">function</span> f(msg, name)
+        <pre class="example"><span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">f</span>(msg, name)
   <span class="global">print</span>(msg .. <span class="string">" "</span> .. name)
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> hello = utils.bind1(f, <span class="string">"Hello"</span>)
+<span class="keyword">local</span> hello = utils.<span class="function-name">bind1</span>(f, <span class="string">"Hello"</span>)
 
-<span class="global">print</span>(hello(<span class="string">"world"</span>))     <span class="comment">--&gt; "Hello world"
-</span><span class="global">print</span>(hello(<span class="string">"sunshine"</span>))  <span class="comment">--&gt; "Hello sunshine"</span></pre>
+<span class="global">print</span>(<span class="function-name">hello</span>(<span class="string">"world"</span>))     <span class="comment">--&gt; "Hello world"
+</span><span class="global">print</span>(<span class="function-name">hello</span>(<span class="string">"sunshine"</span>))  <span class="comment">--&gt; "Hello sunshine"</span></pre>
     </ul>
 
 </dd>
@@ -1489,14 +1489,14 @@ <h3>Raises:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> <span class="keyword">function</span> f(a, b, c)
+        <pre class="example"><span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">f</span>(a, b, c)
   <span class="global">print</span>(a .. <span class="string">" "</span> .. b .. <span class="string">" "</span> .. c)
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> hello = utils.bind1(f, <span class="string">"world"</span>)
+<span class="keyword">local</span> hello = utils.<span class="function-name">bind1</span>(f, <span class="string">"world"</span>)
 
-<span class="global">print</span>(hello(<span class="string">"Hello"</span>, <span class="string">"!"</span>))  <span class="comment">--&gt; "Hello world !"
-</span><span class="global">print</span>(hello(<span class="string">"Bye"</span>, <span class="string">"?"</span>))    <span class="comment">--&gt; "Bye world ?"</span></pre>
+<span class="global">print</span>(<span class="function-name">hello</span>(<span class="string">"Hello"</span>, <span class="string">"!"</span>))  <span class="comment">--&gt; "Hello world !"
+</span><span class="global">print</span>(<span class="function-name">hello</span>(<span class="string">"Bye"</span>, <span class="string">"?"</span>))    <span class="comment">--&gt; "Bye world ?"</span></pre>
     </ul>
 
 </dd>
@@ -1536,12 +1536,12 @@ <h3>See also:</h3>
     <h3>Usage:</h3>
     <ul>
         <pre class="example"><span class="comment">-- write to the Nginx logs with OpenResty
-</span>utils.set_deprecation_func(<span class="keyword">function</span>(msg, trace)
-  ngx.log(ngx.WARN, msg, (trace <span class="keyword">and</span> (<span class="string">" "</span> .. trace) <span class="keyword">or</span> <span class="keyword">nil</span>))
+</span>utils.<span class="function-name">set_deprecation_func</span>(<span class="keyword">function</span>(msg, trace)
+  ngx.<span class="function-name">log</span>(ngx.WARN, msg, (trace <span class="keyword">and</span> (<span class="string">" "</span> .. trace) <span class="keyword">or</span> <span class="keyword">nil</span>))
 <span class="keyword">end</span>)
 
 <span class="comment">-- disable deprecation warnings
-</span>utils.set_deprecation_func()</pre>
+</span>utils.<span class="function-name">set_deprecation_func</span>()</pre>
     </ul>
 
 </dd>
@@ -1575,17 +1575,17 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example">warn(<span class="string">"@on"</span>)   <span class="comment">-- enable Lua warnings, they are usually off by default
+        <pre class="example"><span class="global">warn</span>(<span class="string">"@on"</span>)   <span class="comment">-- enable Lua warnings, they are usually off by default
 </span>
-<span class="keyword">function</span> stringx.islower(str)
-  raise_deprecation {
+<span class="keyword">function</span> stringx.<span class="function-name">islower</span>(str)
+  <span class="function-name">raise_deprecation</span> {
     source = <span class="string">"Penlight "</span> .. utils._VERSION,                   <span class="comment">-- optional
 </span>    message = <span class="string">"function 'islower' was renamed to 'is_lower'"</span>, <span class="comment">-- required
 </span>    version_removed = <span class="string">"2.0.0"</span>,                                <span class="comment">-- optional
 </span>    deprecated_after = <span class="string">"1.2.3"</span>,                               <span class="comment">-- optional
 </span>    no_trace = <span class="keyword">true</span>,                                          <span class="comment">-- optional
 </span>  }
-  <span class="keyword">return</span> stringx.is_lower(str)
+  <span class="keyword">return</span> stringx.<span class="function-name">is_lower</span>(str)
 <span class="keyword">end</span>
 <span class="comment">-- output: "[Penlight 1.9.2] function 'islower' was renamed to 'is_lower' (deprecated after 1.2.3, scheduled for removal in 2.0.0)"</span></pre>
     </ul>
@@ -1597,7 +1597,7 @@ <h3>Usage:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/libraries/pl.xml.html b/docs/libraries/pl.xml.html
index 7fcef3ea..58c98efc 100644
--- a/docs/libraries/pl.xml.html
+++ b/docs/libraries/pl.xml.html
@@ -125,7 +125,7 @@ <h1>Module <code>pl.xml</code></h1>
 
 
 <pre>
-&gt; d = xml.parse <span class="string">"&lt;nodes&gt;&lt;node id='1'&gt;alice&lt;/node&gt;&lt;/nodes&gt;"</span>
+&gt; d = xml.<span class="function-name">parse</span> <span class="string">"&lt;nodes&gt;&lt;node id='1'&gt;alice&lt;/node&gt;&lt;/nodes&gt;"</span>
 &gt; = d
 &lt;nodes&gt;&lt;node id=<span class="string">'1'</span>&gt;alice&lt;/node&gt;&lt;/nodes&gt;
 &gt; = xml.<span class="global">tostring</span>(d,<span class="string">''</span>,<span class="string">'  '</span>)
@@ -187,7 +187,7 @@ <h2><a href="#Functions">Functions</a></h2>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#Doc:add_direct_child">Doc:add_direct_child (child)</a></td>
-	<td class="summary">Append a child to the currrent Node (ignoring current position).</td>
+	<td class="summary">Append a child to the current Node (ignoring current position).</td>
 	</tr>
 	<tr>
 	<td class="name" nowrap><a href="#Doc:add_child">Doc:add_child (child)</a></td>
@@ -309,11 +309,11 @@ <h2 class="section-header "><a name="Functions"></a>Functions</h2>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tag</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the tag name
         </li>
         <li><span class="parameter">attr</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          attributes (table of name-value pairs)
          (<em>default</em> {})
         </li>
@@ -333,7 +333,7 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> doc = xml.new(<span class="string">"main"</span>, { hello = <span class="string">"world"</span>, answer = <span class="string">"42"</span> })
+        <pre class="example"><span class="keyword">local</span> doc = xml.<span class="function-name">new</span>(<span class="string">"main"</span>, { hello = <span class="string">"world"</span>, answer = <span class="string">"42"</span> })
 <span class="global">print</span>(doc)  <span class="comment">--&gt;  &lt;main hello='world' answer='42'/&gt;</span></pre>
     </ul>
 
@@ -383,11 +383,11 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tag</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a tag name
         </li>
         <li><span class="parameter">items</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          either a single child (text or Node), or a table where the hash
  part is the attributes and the list part is the children (text or Nodes).
         </li>
@@ -408,16 +408,16 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> doc = xml.elem(<span class="string">"top"</span>, <span class="string">"hello world"</span>)                <span class="comment">-- &lt;top&gt;hello world&lt;/top&gt;
-</span><span class="keyword">local</span> doc = xml.elem(<span class="string">"main"</span>, xml.new(<span class="string">"child"</span>))            <span class="comment">-- &lt;main&gt;&lt;child/&gt;&lt;/main&gt;
-</span><span class="keyword">local</span> doc = xml.elem(<span class="string">"main"</span>, { <span class="string">"this "</span>, <span class="string">"is "</span>, <span class="string">"nice"</span> })  <span class="comment">-- &lt;main&gt;this is nice&lt;/main&gt;
-</span><span class="keyword">local</span> doc = xml.elem(<span class="string">"main"</span>, { xml.new <span class="string">"this"</span>,
-                               xml.new <span class="string">"is"</span>,
-                               xml.new <span class="string">"nice"</span> })          <span class="comment">-- &lt;main&gt;&lt;this/&gt;&lt;is/&gt;&lt;nice/&gt;&lt;/main&gt;
-</span><span class="keyword">local</span> doc = xml.elem(<span class="string">"main"</span>, { hello = <span class="string">"world"</span> })         <span class="comment">-- &lt;main hello='world'/&gt;
-</span><span class="keyword">local</span> doc = xml.elem(<span class="string">"main"</span>, {
+        <pre class="example"><span class="keyword">local</span> doc = xml.<span class="function-name">elem</span>(<span class="string">"top"</span>, <span class="string">"hello world"</span>)                <span class="comment">-- &lt;top&gt;hello world&lt;/top&gt;
+</span><span class="keyword">local</span> doc = xml.<span class="function-name">elem</span>(<span class="string">"main"</span>, xml.<span class="function-name">new</span>(<span class="string">"child"</span>))            <span class="comment">-- &lt;main&gt;&lt;child/&gt;&lt;/main&gt;
+</span><span class="keyword">local</span> doc = xml.<span class="function-name">elem</span>(<span class="string">"main"</span>, { <span class="string">"this "</span>, <span class="string">"is "</span>, <span class="string">"nice"</span> })  <span class="comment">-- &lt;main&gt;this is nice&lt;/main&gt;
+</span><span class="keyword">local</span> doc = xml.<span class="function-name">elem</span>(<span class="string">"main"</span>, { xml.<span class="function-name">new</span> <span class="string">"this"</span>,
+                               xml.<span class="function-name">new</span> <span class="string">"is"</span>,
+                               xml.<span class="function-name">new</span> <span class="string">"nice"</span> })          <span class="comment">-- &lt;main&gt;&lt;this/&gt;&lt;is/&gt;&lt;nice/&gt;&lt;/main&gt;
+</span><span class="keyword">local</span> doc = xml.<span class="function-name">elem</span>(<span class="string">"main"</span>, { hello = <span class="string">"world"</span> })         <span class="comment">-- &lt;main hello='world'/&gt;
+</span><span class="keyword">local</span> doc = xml.<span class="function-name">elem</span>(<span class="string">"main"</span>, {
   <span class="string">"prefix"</span>,
-  xml.elem(<span class="string">"child"</span>, { <span class="string">"this "</span>, <span class="string">"is "</span>, <span class="string">"nice"</span>}),
+  xml.<span class="function-name">elem</span>(<span class="string">"child"</span>, { <span class="string">"this "</span>, <span class="string">"is "</span>, <span class="string">"nice"</span>}),
   <span class="string">"postfix"</span>,
   attrib = <span class="string">"value"</span>
 })   <span class="comment">-- &lt;main attrib='value'&gt;prefix&lt;child&gt;this is nice&lt;/child&gt;postfix&lt;/main&gt;"</span></pre>
@@ -440,7 +440,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">list</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a list of names, or a comma-separated string.
         </li>
     </ul>
@@ -460,8 +460,8 @@ <h3>See also:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> new_parent, new_child = xml.tags <span class="string">'mom, kid'</span>
-doc = new_parent {new_child <span class="string">'Bob'</span>, new_child <span class="string">'Annie'</span>}
+        <pre class="example"><span class="keyword">local</span> new_parent, new_child = xml.<span class="function-name">tags</span> <span class="string">'mom, kid'</span>
+doc = <span class="function-name">new_parent</span> {<span class="function-name">new_child</span> <span class="string">'Bob'</span>, <span class="function-name">new_child</span> <span class="string">'Annie'</span>}
 <span class="comment">-- &lt;mom&gt;&lt;kid&gt;Bob&lt;/kid&gt;&lt;kid&gt;Annie&lt;/kid&gt;&lt;/mom&gt;</span></pre>
     </ul>
 
@@ -478,11 +478,11 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tag</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the tag name
         </li>
         <li><span class="parameter">attrs</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          attributes (table of name-value pairs)
          (<em>default</em> {})
         </li>
@@ -498,9 +498,9 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> doc = xml.new(<span class="string">"main"</span>)
-doc:addtag(<span class="string">"penlight"</span>, { hello = <span class="string">"world"</span>})
-doc:addtag(<span class="string">"expat"</span>)  <span class="comment">-- added to 'penlight' since position moved
+        <pre class="example"><span class="keyword">local</span> doc = xml.<span class="function-name">new</span>(<span class="string">"main"</span>)
+doc:<span class="function-name">addtag</span>(<span class="string">"penlight"</span>, { hello = <span class="string">"world"</span>})
+doc:<span class="function-name">addtag</span>(<span class="string">"expat"</span>)  <span class="comment">-- added to 'penlight' since position moved
 </span><span class="global">print</span>(doc)  <span class="comment">--&gt;  &lt;main&gt;&lt;penlight hello='world'&gt;&lt;expat/&gt;&lt;/penlight&gt;&lt;/main&gt;</span></pre>
     </ul>
 
@@ -516,7 +516,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">text</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a string
         </li>
     </ul>
@@ -531,9 +531,9 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> doc = xml.new(<span class="string">"main"</span>)
-doc:text(<span class="string">"penlight"</span>)
-doc:text(<span class="string">"expat"</span>)
+        <pre class="example"><span class="keyword">local</span> doc = xml.<span class="function-name">new</span>(<span class="string">"main"</span>)
+doc:<span class="function-name">text</span>(<span class="string">"penlight"</span>)
+doc:<span class="function-name">text</span>(<span class="string">"expat"</span>)
 <span class="global">print</span>(doc)  <span class="comment">--&gt;  &lt;main&gt;&lt;penlightexpat&lt;/main&gt;</span></pre>
     </ul>
 
@@ -582,7 +582,7 @@ <h3>Returns:</h3>
     <strong>Doc:add_direct_child (child)</strong>
     </dt>
     <dd>
-    Append a child to the currrent Node (ignoring current position).
+    Append a child to the current Node (ignoring current position).
 
 
     <h3>Parameters:</h3>
@@ -602,10 +602,10 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> doc = xml.new(<span class="string">"main"</span>)
-doc:add_direct_child(<span class="string">"dog"</span>)
-doc:add_direct_child(xml.new(<span class="string">"child"</span>))
-doc:add_direct_child(<span class="string">"cat"</span>)
+        <pre class="example"><span class="keyword">local</span> doc = xml.<span class="function-name">new</span>(<span class="string">"main"</span>)
+doc:<span class="function-name">add_direct_child</span>(<span class="string">"dog"</span>)
+doc:<span class="function-name">add_direct_child</span>(xml.<span class="function-name">new</span>(<span class="string">"child"</span>))
+doc:<span class="function-name">add_direct_child</span>(<span class="string">"cat"</span>)
 <span class="global">print</span>(doc)  <span class="comment">--&gt;  &lt;main&gt;dog&lt;child/&gt;cat&lt;/main&gt;</span></pre>
     </ul>
 
@@ -635,11 +635,11 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> doc = xml.new(<span class="string">"main"</span>)
-doc:addtag(<span class="string">"one"</span>)
-doc:add_child(xml.new(<span class="string">"item1"</span>))
-doc:add_child(xml.new(<span class="string">"item2"</span>))
-doc:add_child(xml.new(<span class="string">"item3"</span>))
+        <pre class="example"><span class="keyword">local</span> doc = xml.<span class="function-name">new</span>(<span class="string">"main"</span>)
+doc:<span class="function-name">addtag</span>(<span class="string">"one"</span>)
+doc:<span class="function-name">add_child</span>(xml.<span class="function-name">new</span>(<span class="string">"item1"</span>))
+doc:<span class="function-name">add_child</span>(xml.<span class="function-name">new</span>(<span class="string">"item2"</span>))
+doc:<span class="function-name">add_child</span>(xml.<span class="function-name">new</span>(<span class="string">"item3"</span>))
 <span class="global">print</span>(doc)  <span class="comment">--&gt;  &lt;main&gt;&lt;one&gt;&lt;item1/&gt;&lt;item2/&gt;&lt;item3/&gt;&lt;/one&gt;&lt;/main&gt;</span></pre>
     </ul>
 
@@ -650,14 +650,14 @@ <h3>Usage:</h3>
     </dt>
     <dd>
     Set attributes of a document node.
- Will add/overwite values, but will not remove existing ones.
+ Will add/overwrite values, but will not remove existing ones.
  Operates on the Node itself, will not take position into account.
 
 
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a></span>
          a table containing attribute/value pairs
         </li>
     </ul>
@@ -785,7 +785,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tag</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a tag name
         </li>
         <li><span class="parameter">dont_recurse</span>
@@ -856,12 +856,12 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">tag</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          tag names to return. Returns all tags if not provided.
          (<em>default</em> nil)
         </li>
         <li><span class="parameter">xmlns</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          the namespace value ('xmlns' attribute) to return. If not
  provided will match all namespaces.
          (<em>default</em> nil)
@@ -934,7 +934,7 @@ <h3>Parameters:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">str</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          string value to escape
         </li>
     </ul>
@@ -949,7 +949,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> esc = xml.xml_escape(<span class="string">[["'&lt;&gt;&amp;]]</span>)  <span class="comment">--&gt; "&amp;quot;&amp;apos;&amp;lt;&amp;gt;&amp;amp;"</span></pre>
+        <pre class="example"><span class="keyword">local</span> esc = xml.<span class="function-name">xml_escape</span>(<span class="string">[["'&lt;&gt;&amp;]]</span>)  <span class="comment">--&gt; "&amp;quot;&amp;apos;&amp;lt;&amp;gt;&amp;amp;"</span></pre>
     </ul>
 
 </dd>
@@ -965,7 +965,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">str</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          string value to unescape
         </li>
     </ul>
@@ -980,7 +980,7 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> unesc = xml.xml_escape(<span class="string">"&amp;quot;&amp;apos;&amp;lt;&amp;gt;&amp;amp;"</span>)  <span class="comment">--&gt; [["'&lt;&gt;&amp;]]</span></pre>
+        <pre class="example"><span class="keyword">local</span> unesc = xml.<span class="function-name">xml_escape</span>(<span class="string">"&amp;quot;&amp;apos;&amp;lt;&amp;gt;&amp;amp;"</span>)  <span class="comment">--&gt; [["'&lt;&gt;&amp;]]</span></pre>
     </ul>
 
 </dd>
@@ -998,22 +998,22 @@ <h3>Parameters:</h3>
          an XML document
         </li>
         <li><span class="parameter">b_ind</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> or <span class="type">int</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> or <span class="type">int</span></span>
          an initial block-indent (required when <code>t_ind</code> is set)
          (<em>optional</em>)
         </li>
         <li><span class="parameter">t_ind</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> or <span class="type">int</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> or <span class="type">int</span></span>
          an tag-indent for each level (required when <code>a_ind</code> is set)
          (<em>optional</em>)
         </li>
         <li><span class="parameter">a_ind</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> or <span class="type">int</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> or <span class="type">int</span></span>
          if given, indent each attribute pair and put on a separate line
          (<em>optional</em>)
         </li>
         <li><span class="parameter">xml_preface</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> or <span class="type">bool</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> or <span class="type">bool</span></span>
          force prefacing with default or custom <?xml...>, if truthy then <code>&amp;lt;?xml version=&apos;1.0&apos;?&amp;gt;</code> will be used as default.
          (<em>optional</em>)
         </li>
@@ -1045,22 +1045,22 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">b_ind</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> or <span class="type">int</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> or <span class="type">int</span></span>
          an initial indent (required when <code>t_ind</code> is set)
          (<em>optional</em>)
         </li>
         <li><span class="parameter">t_ind</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> or <span class="type">int</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> or <span class="type">int</span></span>
          an indent for each level (required when <code>a_ind</code> is set)
          (<em>optional</em>)
         </li>
         <li><span class="parameter">a_ind</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> or <span class="type">int</span></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> or <span class="type">int</span></span>
          if given, indent each attribute pair and put on a separate line
          (<em>optional</em>)
         </li>
         <li><span class="parameter">xml_preface</span>
-            <span class="types"><a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          force prefacing with default or custom <?xml...>
          (<em>default</em> "&lt;?xml version='1.0'?&gt;")
         </li>
@@ -1099,12 +1099,12 @@ <h3>Returns:</h3>
 
     <h3>Usage:</h3>
     <ul>
-        <pre class="example"><span class="keyword">local</span> doc = xml.new(<span class="string">"main"</span>)
-doc:text(<span class="string">"one"</span>)
-doc:add_child(xml.elem <span class="string">"two"</span>)
-doc:text(<span class="string">"three"</span>)
+        <pre class="example"><span class="keyword">local</span> doc = xml.<span class="function-name">new</span>(<span class="string">"main"</span>)
+doc:<span class="function-name">text</span>(<span class="string">"one"</span>)
+doc:<span class="function-name">add_child</span>(xml.<span class="function-name">elem</span> <span class="string">"two"</span>)
+doc:<span class="function-name">text</span>(<span class="string">"three"</span>)
 
-<span class="keyword">local</span> t = doc:get_text()    <span class="comment">--&gt;  "onethree"</span></pre>
+<span class="keyword">local</span> t = doc:<span class="function-name">get_text</span>()    <span class="comment">--&gt;  "onethree"</span></pre>
     </ul>
 
 </dd>
@@ -1132,7 +1132,7 @@ <h3>Usage:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">doc</span>
-            <span class="types"><span class="type">Node</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">Node</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a Node object or string (text node)
         </li>
         <li><span class="parameter">strsubst</span>
@@ -1197,11 +1197,11 @@ <h3>See also:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">t1</span>
-            <span class="types"><span class="type">Node</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">Node</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a Node object or string (text node)
         </li>
         <li><span class="parameter">t2</span>
-            <span class="types"><span class="type">Node</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">Node</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a Node object or string (text node)
         </li>
     </ul>
@@ -1236,7 +1236,7 @@ <h3>Returns:</h3>
     <ol>
 
            <span class="types"><span class="type">boolean</span></span>
-        <code>true</code> if it is a <a href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a> with property <code>tag</code> being a string value.
+        <code>true</code> if it is a <a href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a> with property <code>tag</code> being a string value.
     </ol>
 
 
@@ -1256,7 +1256,7 @@ <h3>Returns:</h3>
     <h3>Parameters:</h3>
     <ul>
         <li><span class="parameter">doc</span>
-            <span class="types"><span class="type">Node</span> or <a class="type" href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a></span>
+            <span class="types"><span class="type">Node</span> or <a class="type" href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a></span>
          a Node object or string (text node)
         </li>
         <li><span class="parameter">depth_first</span>
@@ -1280,7 +1280,7 @@ <h3>Parameters:</h3>
     </dt>
     <dd>
     Parse a well-formed HTML file as a string.
- Tags are case-insenstive, DOCTYPE is ignored, and empty elements can be .. empty.
+ Tags are case-insensitive, DOCTYPE is ignored, and empty elements can be .. empty.
 
 
     <h3>Parameters:</h3>
@@ -1349,7 +1349,7 @@ <h3>Parameters:</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/manual/01-introduction.md.html b/docs/manual/01-introduction.md.html
index fe422561..f8759281 100644
--- a/docs/manual/01-introduction.md.html
+++ b/docs/manual/01-introduction.md.html
@@ -156,12 +156,12 @@ <h3>Purpose</h3>
 like <a href="../libraries/pl.input.html#fields">input.fields</a> default to shutting down the program immediately with a
 useful message. This is more appropriate behaviour for a <em>script</em> than providing
 a stack trace. (However, this default can be changed.) The lexer functions always
-throw errors, to simplify coding, and so should be wrapped in <a href="https://www.lua.org/manual/5.1/manual.html#pdf-pcall">pcall</a>.</p>
+throw errors, to simplify coding, and so should be wrapped in <a href="https://www.lua.org/manual/5.4/manual.html#pdf-pcall">pcall</a>.</p>
 
 <p>If you are used to Python conventions, please note that all indices consistently
 start at 1.</p>
 
-<p>The Lua function <a href="https://www.lua.org/manual/5.1/manual.html#pdf-table.foreach">table.foreach</a> has been deprecated in favour of the <code>for in</code>
+<p>The Lua function <code>table.foreach</code> has been deprecated in favour of the <code>for in</code>
 statement, but such an operation becomes particularly useful with the
 higher-order function support in Penlight. Note that <a href="../libraries/pl.tablex.html#foreach">tablex.foreach</a> reverses
 the order, so that the function is passed the value and then the key. Although
@@ -169,7 +169,7 @@ <h3>Purpose</h3>
 
 <p>The only important external dependence of Penlight is
 <a href="http://keplerproject.github.com/luafilesystem/manual.html">LuaFileSystem</a>
-(<a href="http://stevedonovan.github.io/lua-stdlibs/modules/lfs.html">lfs</a>), and if you want <a href="../libraries/pl.dir.html#copyfile">dir.copyfile</a> to work cleanly on Windows, you will need
+(<a href="http://stevedonovan.github.io/lua-stdlibs/lfs.html">lfs</a>), and if you want <a href="../libraries/pl.dir.html#copyfile">dir.copyfile</a> to work cleanly on Windows, you will need
 either <a href="http://alien.luaforge.net/">alien</a> or be using
 <a href="http://luajit.org">LuaJIT</a> as well. (The fallback is to call the equivalent
 shell commands.)</p>
@@ -194,7 +194,7 @@ <h3>To Inject or not to Inject?</h3>
 
 <pre>
 <span class="keyword">local</span> utils = <span class="global">require</span> <span class="string">'pl.utils'</span>
-utils.printf(<span class="string">"%s\n"</span>,<span class="string">"hello, world!"</span>)
+utils.<span class="function-name">printf</span>(<span class="string">"%s\n"</span>,<span class="string">"hello, world!"</span>)
 </pre>
 
 <p>or informally like:</p>
@@ -202,7 +202,7 @@ <h3>To Inject or not to Inject?</h3>
 
 <pre>
 <span class="global">require</span> <span class="string">'pl'</span>
-utils.printf(<span class="string">"%s\n"</span>,<span class="string">"That feels better"</span>)
+utils.<span class="function-name">printf</span>(<span class="string">"%s\n"</span>,<span class="string">"That feels better"</span>)
 </pre>
 
 <p><code>require &apos;pl&apos;</code> makes all the separate Penlight modules available, without needing
@@ -232,9 +232,9 @@ <h3>To Inject or not to Inject?</h3>
 <pre>
 <span class="keyword">local</span> _ENV,M = <span class="global">require</span> <span class="string">'pl.import_into'</span> ()
 
-<span class="keyword">function</span> answer ()
+<span class="keyword">function</span> <span class="function-name">answer</span> ()
     <span class="comment">-- all the Penlight modules are available!
-</span>    <span class="keyword">return</span> pretty.write(utils.split <span class="string">'10 20  30'</span>, <span class="string">''</span>)
+</span>    <span class="keyword">return</span> pretty.<span class="function-name">write</span>(utils.<span class="function-name">split</span> <span class="string">'10 20  30'</span>, <span class="string">''</span>)
 <span class="keyword">end</span>
 
 <span class="keyword">return</span> M
@@ -253,21 +253,21 @@ <h3>To Inject or not to Inject?</h3>
 front,  so this method is as efficient as explicitly loading required modules.</p>
 
 <p>You have an option to bring the <a href="../libraries/pl.stringx.html#">pl.stringx</a> methods into the standard string
-table. All strings have a metatable that allows for automatic lookup in <a href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a>,
+table. All strings have a metatable that allows for automatic lookup in <a href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a>,
 so we can say <code>s:upper()</code>. Importing <a href="../libraries/pl.stringx.html#">stringx</a> allows for its functions to also
 be called as methods: <code>s:strip()</code>,etc:</p>
 
 
 <pre>
 <span class="global">require</span> <span class="string">'pl'</span>
-stringx.import()
+stringx.<span class="function-name">import</span>()
 </pre>
 
 <p>or, more explicitly:</p>
 
 
 <pre>
-<span class="global">require</span>(<span class="string">'pl.stringx'</span>).import()
+<span class="global">require</span>(<span class="string">'pl.stringx'</span>).<span class="function-name">import</span>()
 </pre>
 
 <p>A more delicate operation is importing tables into the local environment. This is
@@ -276,8 +276,8 @@ <h3>To Inject or not to Inject?</h3>
 
 <pre>
 &gt; <span class="global">require</span> <span class="string">'pl'</span>
-&gt; utils.import(<span class="global">math</span>)
-&gt; = sin(<span class="number">1.2</span>)
+&gt; utils.<span class="function-name">import</span>(<span class="global">math</span>)
+&gt; = <span class="function-name">sin</span>(<span class="number">1.2</span>)
 <span class="number">0.93203908596723</span>
 </pre>
 
@@ -295,7 +295,7 @@ <h3>To Inject or not to Inject?</h3>
 <pre>
 &gt; <span class="global">require</span> <span class="string">'pl.strict'</span>
 &gt; <span class="global">print</span>(x)
-stdin:<span class="number">1</span>: variable <span class="string">'x'</span> is <span class="keyword">not</span> declared
+stdin:<span class="number">1</span>: <span class="function-name">variable</span> <span class="string">'x'</span> is <span class="keyword">not</span> declared
 &gt; x = <span class="keyword">nil</span>
 &gt; <span class="global">print</span>(x)
 <span class="keyword">nil</span>
@@ -306,8 +306,8 @@ <h3>To Inject or not to Inject?</h3>
 
 <p><a href="../libraries/pl.strict.html#">strict</a> also disallows assignment to global variables, except in the main
 program. Generally, modules have no business messing with global scope; if you
-must do it, then use a call to <a href="https://www.lua.org/manual/5.1/manual.html#pdf-rawset">rawset</a>. Similarly, if you have to check for the
-existence of a global, use <a href="https://www.lua.org/manual/5.1/manual.html#pdf-rawget">rawget</a>.</p>
+must do it, then use a call to <a href="https://www.lua.org/manual/5.4/manual.html#pdf-rawset">rawset</a>. Similarly, if you have to check for the
+existence of a global, use <a href="https://www.lua.org/manual/5.4/manual.html#pdf-rawget">rawget</a>.</p>
 
 <p>If you wish to enforce strictness globally, then just add <code>require &apos;pl.strict&apos;</code>
 at the end of <code>pl/init.lua</code>, otherwise call it from your main program.</p>
@@ -323,14 +323,14 @@ <h3>To Inject or not to Inject?</h3>
 </span><span class="keyword">local</span> strict = <span class="global">require</span> <span class="string">'pl.strict'</span>
 <span class="keyword">local</span> M = strict.<span class="global">module</span> (...)
 
-<span class="keyword">function</span> M.answer ()
+<span class="keyword">function</span> M.<span class="function-name">answer</span> ()
     <span class="keyword">return</span> <span class="number">42</span>
 <span class="keyword">end</span>
 
 <span class="keyword">return</span> M
 </pre>
 
-<p>If you were to accidently type <code>mymod.Answer()</code>, then you would get a runtime
+<p>If you were to accidentally type <code>mymod.Answer()</code>, then you would get a runtime
 error: "variable 'Answer' is not declared in 'mymod'".</p>
 
 <p>This can be applied to existing modules. You may desire to have the same level
@@ -338,7 +338,7 @@ <h3>To Inject or not to Inject?</h3>
 
 
 <pre>
-strict.make_all_strict(_G)
+strict.<span class="function-name">make_all_strict</span>(_G)
 </pre>
 
 <p>Thereafter a typo such as <code>math.cosine</code> will give you an explicit error, rather
@@ -349,7 +349,7 @@ <h3>What are function arguments in Penlight?</h3>
 
 <p>Many functions in Penlight themselves take function arguments, like <code>map</code> which
 applies a function to a list, element by element.  You can use existing
-functions, like <a href="https://www.lua.org/manual/5.1/manual.html#pdf-math.max">math.max</a>, anonymous functions (like `function(x,y) return x > y
+functions, like <a href="https://www.lua.org/manual/5.4/manual.html#pdf-math.max">math.max</a>, anonymous functions (like `function(x,y) return x > y
 end<code> ), or operations by name (e.g &apos;*&apos; or &apos;..&apos;).  The module </code>pl.operator` exports
 all the standard Lua operations, like the Python module of the same name.
 Penlight allows these to be referred to by name, so <a href="../libraries/pl.operator.html#gt">operator.gt</a> can be more
@@ -370,7 +370,7 @@ <h3>What are function arguments in Penlight?</h3>
 
 <pre>
 &gt; _1 = func._1
-&gt; = List{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}:map(_1+<span class="number">1</span>)
+&gt; = <span class="function-name">List</span>{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}:<span class="function-name">map</span>(_1+<span class="number">1</span>)
 {<span class="number">11</span>,<span class="number">21</span>,<span class="number">31</span>}
 </pre>
 
@@ -379,7 +379,7 @@ <h3>What are function arguments in Penlight?</h3>
 
 
 <pre>
-&gt; = List{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}:map <span class="string">'|x| x + 1'</span>
+&gt; = <span class="function-name">List</span>{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}:<span class="function-name">map</span> <span class="string">'|x| x + 1'</span>
 {<span class="number">11</span>,<span class="number">21</span>,<span class="number">31</span>}
 </pre>
 
@@ -396,11 +396,11 @@ <h3>Pros and Cons of Loopless Programming</h3>
 <pre>
 <span class="keyword">local</span> res = {}
 <span class="keyword">for</span> i = <span class="number">1</span>,#ls <span class="keyword">do</span>
-    res[i] = fun(ls[i])
+    res[i] = <span class="function-name">fun</span>(ls[i])
 <span class="keyword">end</span>
 </pre>
 
-<p>This can be efficiently and succintly expressed as <code>ls:map(fun)</code>. Not only is
+<p>This can be efficiently and succinctly expressed as <code>ls:map(fun)</code>. Not only is
 there less typing but the intention of the code is clearer. If readers of your
 code spend too much time trying to guess your intention by analyzing your loops,
 then you have failed to express yourself clearly. Similarly, <code>ls:filter(&apos;&gt;&apos;,0)</code>
@@ -438,7 +438,7 @@ <h3>Generally useful functions.</h3>
 
 <p>Utility functions like <code>is_type</code> help with identifying what
 kind of animal you are dealing with.
-The Lua <a href="https://www.lua.org/manual/5.1/manual.html#pdf-type">type</a> function handles the basic types, but can't distinguish between
+The Lua <a href="https://www.lua.org/manual/5.4/manual.html#pdf-type">type</a> function handles the basic types, but can't distinguish between
 different kinds of objects, which are all tables. So <code>is_type</code> handles both
 cases, like <code>is_type(s,&quot;string&quot;)</code> and <code>is_type(ls,List)</code>.</p>
 
@@ -447,7 +447,7 @@ <h3>Generally useful functions.</h3>
 
 
 <pre>
-<span class="keyword">function</span> t(...)
+<span class="keyword">function</span> <span class="function-name">t</span>(...)
     <span class="keyword">local</span> args = {...}
     ...
 <span class="keyword">end</span>
@@ -455,13 +455,13 @@ <h3>Generally useful functions.</h3>
 
 <p>But this will bite you someday when <code>nil</code> is one of the arguments, since this
 will put a 'hole' in your table. In particular, <code>#ls</code> will only give you the size
-upto the <code>nil</code> value.  Hence the need for <a href="https://www.lua.org/manual/5.1/manual.html#pdf-table.pack">table.pack</a> - this is a new Lua 5.2
+upto the <code>nil</code> value.  Hence the need for <a href="https://www.lua.org/manual/5.4/manual.html#pdf-table.pack">table.pack</a> - this is a new Lua 5.2
 function which Penlight defines also for Lua 5.1.</p>
 
 
 <pre>
-<span class="keyword">function</span> t(...)
-    <span class="keyword">local</span> args,n = <span class="global">table</span>.pack(...)
+<span class="keyword">function</span> <span class="function-name">t</span>(...)
+    <span class="keyword">local</span> args,n = <span class="global">table</span>.<span class="function-name">pack</span>(...)
     <span class="keyword">for</span> i = <span class="number">1</span>,n <span class="keyword">do</span>
       ...
     <span class="keyword">end</span>
@@ -477,15 +477,15 @@ <h3>Generally useful functions.</h3>
 
 
 <pre>
-sum = utils.memoize(<span class="keyword">function</span>(n)
+sum = utils.<span class="function-name">memoize</span>(<span class="keyword">function</span>(n)
     <span class="keyword">local</span> sum = <span class="number">0</span>
     <span class="keyword">for</span> i = <span class="number">1</span>,n <span class="keyword">do</span> sum = sum + i <span class="keyword">end</span>
     <span class="keyword">return</span> sum
 <span class="keyword">end</span>)
 ...
-s = sum(<span class="number">1e8</span>) <span class="comment">--takes time!
+s = <span class="function-name">sum</span>(<span class="number">1e8</span>) <span class="comment">--takes time!
 </span>...
-s = sum(<span class="number">1e8</span>) <span class="comment">--returned saved value!</span>
+s = <span class="function-name">sum</span>(<span class="number">1e8</span>) <span class="comment">--returned saved value!</span>
 </pre>
 
 <p>Penlight is fully compatible with Lua 5.1, 5.2 and LuaJIT 2. To ensure this,
@@ -500,10 +500,10 @@ <h3>Generally useful functions.</h3>
     <li>the environment for the compiled chunk</li>
 </ul>
 
-<p>Using <code>utils.load</code> should reduce the need to call the deprecated function <a href="https://www.lua.org/manual/5.1/manual.html#pdf-setfenv">setfenv</a>,
+<p>Using <code>utils.load</code> should reduce the need to call the deprecated function <code>setfenv</code>,
 and make your Lua 5.1 code 5.2-friendly.</p>
 
-<p>The <a href="../libraries/pl.utils.html#">utils</a> module exports <a href="https://www.lua.org/manual/5.1/manual.html#pdf-getfenv">getfenv</a> and <a href="https://www.lua.org/manual/5.1/manual.html#pdf-setfenv">setfenv</a> for
+<p>The <a href="../libraries/pl.utils.html#">utils</a> module exports <code>getfenv</code> and <code>setfenv</code> for
 Lua 5.2 as well, based on code by Sergey Rozhenko.  Note that these functions can fail
 for functions which don't access any globals.</p>
 
@@ -512,7 +512,7 @@ <h3>Application Support</h3>
 
 <p><a href="../libraries/pl.app.html#parse_args">app.parse_args</a> is a simple command-line argument parser. If called without any
 arguments, it tries to use the global <code>arg</code> array.  It returns the <em>flags</em>
-(options begining with '-') as a table of name/value pairs, and the <em>arguments</em>
+(options beginning with '-') as a table of name/value pairs, and the <em>arguments</em>
 as an array.  It knows about long GNU-style flag names, e.g. <code>--value</code>, and
 groups of short flags are understood, so that <code>-ab</code> is short for <code>-a -b</code>. The
 flags result would then look like <code>{value=true,a=true,b=true}</code>.</p>
@@ -526,8 +526,8 @@ <h3>Application Support</h3>
 
 <pre>
 &gt; <span class="global">require</span> <span class="string">'pl'</span>
-&gt; flags,args = app.parse_args({<span class="string">'-o'</span>,<span class="string">'fred'</span>,<span class="string">'-n10'</span>,<span class="string">'fred.txt'</span>},{o=<span class="keyword">true</span>})
-&gt; pretty.dump(flags)
+&gt; flags,args = app.<span class="function-name">parse_args</span>({<span class="string">'-o'</span>,<span class="string">'fred'</span>,<span class="string">'-n10'</span>,<span class="string">'fred.txt'</span>},{o=<span class="keyword">true</span>})
+&gt; pretty.<span class="function-name">dump</span>(flags)
 {o=<span class="string">'fred'</span>,n=<span class="string">'10'</span>}
 </pre>
 
@@ -535,7 +535,7 @@ <h3>Application Support</h3>
 or arguments for you, or raise errors. For that, have a look at
 <a href="../manual/08-additional.md.html#Command_line_Programs_with_Lapp">Lapp</a>.</p>
 
-<p>An application which consists of several files usually cannot use <a href="https://www.lua.org/manual/5.1/manual.html#pdf-require">require</a> to
+<p>An application which consists of several files usually cannot use <a href="https://www.lua.org/manual/5.4/manual.html#pdf-require">require</a> to
 load files in the same directory as the main script.  <code>app.require_here()</code>
 ensures that the Lua module path is modified so that files found locally are
 found first. In the <code>examples</code> directory, <a href="../examples/test-symbols.lua.html#">test-symbols.lua</a> uses this function
@@ -585,51 +585,51 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
 </span>
 class = <span class="global">require</span> <span class="string">'pl.class'</span>
 
-class.Animal()
+class.<span class="function-name">Animal</span>()
 
-<span class="keyword">function</span> Animal:_init(name)
+<span class="keyword">function</span> Animal:<span class="function-name">_init</span>(name)
     self.name = name
 <span class="keyword">end</span>
 
-<span class="keyword">function</span> Animal:__tostring()
-  <span class="keyword">return</span> self.name..<span class="string">': '</span>..self:speak()
+<span class="keyword">function</span> Animal:<span class="function-name">__tostring</span>()
+  <span class="keyword">return</span> self.name..<span class="string">': '</span>..self:<span class="function-name">speak</span>()
 <span class="keyword">end</span>
 
-class.Dog(Animal)
+class.<span class="function-name">Dog</span>(Animal)
 
-<span class="keyword">function</span> Dog:speak()
+<span class="keyword">function</span> Dog:<span class="function-name">speak</span>()
   <span class="keyword">return</span> <span class="string">'bark'</span>
 <span class="keyword">end</span>
 
-class.Cat(Animal)
+class.<span class="function-name">Cat</span>(Animal)
 
-<span class="keyword">function</span> Cat:_init(name,breed)
-    self:super(name)  <span class="comment">-- must init base!
+<span class="keyword">function</span> Cat:<span class="function-name">_init</span>(name,breed)
+    self:<span class="function-name">super</span>(name)  <span class="comment">-- must init base!
 </span>    self.breed = breed
 <span class="keyword">end</span>
 
-<span class="keyword">function</span> Cat:speak()
+<span class="keyword">function</span> Cat:<span class="function-name">speak</span>()
   <span class="keyword">return</span> <span class="string">'meow'</span>
 <span class="keyword">end</span>
 
-class.Lion(Cat)
+class.<span class="function-name">Lion</span>(Cat)
 
-<span class="keyword">function</span> Lion:speak()
+<span class="keyword">function</span> Lion:<span class="function-name">speak</span>()
   <span class="keyword">return</span> <span class="string">'roar'</span>
 <span class="keyword">end</span>
 
-fido = Dog(<span class="string">'Fido'</span>)
-felix = Cat(<span class="string">'Felix'</span>,<span class="string">'Tabby'</span>)
-leo = Lion(<span class="string">'Leo'</span>,<span class="string">'African'</span>)
+fido = <span class="function-name">Dog</span>(<span class="string">'Fido'</span>)
+felix = <span class="function-name">Cat</span>(<span class="string">'Felix'</span>,<span class="string">'Tabby'</span>)
+leo = <span class="function-name">Lion</span>(<span class="string">'Leo'</span>,<span class="string">'African'</span>)
 
 $ lua -i animal.lua
 &gt; = fido,felix,leo
 Fido: bark      Felix: meow     Leo: roar
-&gt; = leo:is_a(Animal)
+&gt; = leo:<span class="function-name">is_a</span>(Animal)
 <span class="keyword">true</span>
-&gt; = leo:is_a(Dog)
+&gt; = leo:<span class="function-name">is_a</span>(Dog)
 <span class="keyword">false</span>
-&gt; = leo:is_a(Cat)
+&gt; = leo:<span class="function-name">is_a</span>(Cat)
 <span class="keyword">true</span>
 </pre>
 
@@ -661,12 +661,12 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
 
 
 <pre>
-&gt; class.Fred()
-&gt; a = Fred()
+&gt; class.<span class="function-name">Fred</span>()
+&gt; a = <span class="function-name">Fred</span>()
 &gt; = a
 Fred: <span class="number">00459330</span>
-&gt; Alice = class()
-&gt; b = Alice()
+&gt; Alice = <span class="function-name">class</span>()
+&gt; b = <span class="function-name">Alice</span>()
 &gt; = b
 <span class="global">table</span>: <span class="number">00459</span>AE8
 &gt; Alice._name = <span class="string">'Alice'</span>
@@ -690,7 +690,7 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
 <pre>
 <span class="keyword">local</span> class = <span class="global">require</span> <span class="string">'pl.class'</span>
 
-class.Named {
+class.<span class="function-name">Named</span> {
     _init = <span class="keyword">function</span>(self,name)
         self.name = name
     <span class="keyword">end</span>;
@@ -700,7 +700,7 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
     <span class="keyword">end</span>;
 }
 
-b = Named <span class="string">'dog'</span>
+b = <span class="function-name">Named</span> <span class="string">'dog'</span>
 <span class="global">print</span>(b)
 <span class="comment">--&gt; boo dog</span>
 </pre>
@@ -726,9 +726,9 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
 
 
 <pre>
-class.Strings(List)
+class.<span class="function-name">Strings</span>(List)
 
-<span class="keyword">function</span> Strings:my_method()
+<span class="keyword">function</span> Strings:<span class="function-name">my_method</span>()
 ...
 <span class="keyword">end</span>
 </pre>
@@ -740,7 +740,7 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
 
 
 <pre>
-Strings:catch(<span class="keyword">function</span>(self,name)
+Strings:<span class="function-name">catch</span>(<span class="keyword">function</span>(self,name)
     <span class="keyword">return</span> <span class="keyword">function</span>() <span class="global">error</span>(<span class="string">"no such method "</span>..name,<span class="number">2</span>) <span class="keyword">end</span>
 <span class="keyword">end</span>)
 </pre>
@@ -750,16 +750,16 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
 
 
 <pre>
-Strings:catch(List.default_map_with(<span class="global">string</span>))
+Strings:<span class="function-name">catch</span>(List.<span class="function-name">default_map_with</span>(<span class="global">string</span>))
 
-ls = Strings{<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'three'</span>}
-asserteq(ls:upper(),{<span class="string">'ONE'</span>,<span class="string">'TWO'</span>,<span class="string">'THREE'</span>})
-asserteq(ls:sub(<span class="number">1</span>,<span class="number">2</span>),{<span class="string">'on'</span>,<span class="string">'tw'</span>,<span class="string">'th'</span>})
+ls = <span class="function-name">Strings</span>{<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'three'</span>}
+<span class="function-name">asserteq</span>(ls:<span class="function-name">upper</span>(),{<span class="string">'ONE'</span>,<span class="string">'TWO'</span>,<span class="string">'THREE'</span>})
+<span class="function-name">asserteq</span>(ls:<span class="function-name">sub</span>(<span class="number">1</span>,<span class="number">2</span>),{<span class="string">'on'</span>,<span class="string">'tw'</span>,<span class="string">'th'</span>})
 </pre>
 
 <p>So we've converted a unknown method invocation into a map using the function of
-that name found in <a href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a>.  So for a <code>Vector</code> (which is a specialization of <a href="../classes/pl.List.html#">List</a>
-for numbers) it makes sense to make <a href="https://www.lua.org/manual/5.1/manual.html#5.6">math</a> the default map so that <code>v:sin()</code> makes
+that name found in <a href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a>.  So for a <code>Vector</code> (which is a specialization of <a href="../classes/pl.List.html#">List</a>
+for numbers) it makes sense to make <a href="https://www.lua.org/manual/5.4/manual.html#6.7">math</a> the default map so that <code>v:sin()</code> makes
 sense.</p>
 
 <p>Note that <code>map</code> operations return a object of the same type - this is often called
@@ -770,13 +770,13 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
 
 
 <pre>
-<span class="keyword">local</span> sizes = ls:map <span class="string">'#'</span>
-asserteq(sizes, {<span class="number">3</span>,<span class="number">3</span>,<span class="number">5</span>})
-asserteq(utils.<span class="global">type</span>(sizes),<span class="string">'Strings'</span>)
-asserteq(sizes:is_a(Strings),<span class="keyword">true</span>)
-sizes = Vector:cast(sizes)
-asserteq(utils.<span class="global">type</span>(sizes),<span class="string">'Vector'</span>)
-asserteq(sizes+<span class="number">1</span>,{<span class="number">4</span>,<span class="number">4</span>,<span class="number">6</span>})
+<span class="keyword">local</span> sizes = ls:<span class="function-name">map</span> <span class="string">'#'</span>
+<span class="function-name">asserteq</span>(sizes, {<span class="number">3</span>,<span class="number">3</span>,<span class="number">5</span>})
+<span class="function-name">asserteq</span>(utils.<span class="global">type</span>(sizes),<span class="string">'Strings'</span>)
+<span class="function-name">asserteq</span>(sizes:<span class="function-name">is_a</span>(Strings),<span class="keyword">true</span>)
+sizes = Vector:<span class="function-name">cast</span>(sizes)
+<span class="function-name">asserteq</span>(utils.<span class="global">type</span>(sizes),<span class="string">'Vector'</span>)
+<span class="function-name">asserteq</span>(sizes+<span class="number">1</span>,{<span class="number">4</span>,<span class="number">4</span>,<span class="number">6</span>})
 </pre>
 
 <p>About <code>utils.type</code>: it can only return a string for a class type if that class does
@@ -790,31 +790,31 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
 
 
 <pre>
-<span class="keyword">local</span> MyProps = class(class.properties)
+<span class="keyword">local</span> MyProps = <span class="function-name">class</span>(class.properties)
 <span class="keyword">local</span> setted_a, got_b
 
-<span class="keyword">function</span> MyProps:_init ()
+<span class="keyword">function</span> MyProps:<span class="function-name">_init</span> ()
     self._a = <span class="number">1</span>
     self._b = <span class="number">2</span>
 <span class="keyword">end</span>
 
-<span class="keyword">function</span> MyProps:set_a (v)
+<span class="keyword">function</span> MyProps:<span class="function-name">set_a</span> (v)
     setted_a = <span class="keyword">true</span>
     self._a = v
 <span class="keyword">end</span>
 
-<span class="keyword">function</span> MyProps:get_b ()
+<span class="keyword">function</span> MyProps:<span class="function-name">get_b</span> ()
     got_b = <span class="keyword">true</span>
     <span class="keyword">return</span> self._b
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> mp = MyProps()
+<span class="keyword">local</span> mp = <span class="function-name">MyProps</span>()
 
 mp.a = <span class="number">10</span>
 
-asserteq(mp.a,<span class="number">10</span>)
-asserteq(mp.b,<span class="number">2</span>)
-asserteq(setted_a <span class="keyword">and</span> got_b, <span class="keyword">true</span>)
+<span class="function-name">asserteq</span>(mp.a,<span class="number">10</span>)
+<span class="function-name">asserteq</span>(mp.b,<span class="number">2</span>)
+<span class="function-name">asserteq</span>(setted_a <span class="keyword">and</span> got_b, <span class="keyword">true</span>)
 </pre>
 
 <p>The convention is that the internal field name is prefixed with an underscore;
@@ -836,7 +836,7 @@ <h3>Simplifying Object-Oriented Programming in Lua</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/manual/02-arrays.md.html b/docs/manual/02-arrays.md.html
index 28dc6a2d..daa493d4 100644
--- a/docs/manual/02-arrays.md.html
+++ b/docs/manual/02-arrays.md.html
@@ -142,24 +142,24 @@ <h3>Python-style Lists</h3>
 
 <pre>
 &gt; List = <span class="global">require</span> <span class="string">'pl.List'</span>  <span class="comment">--&gt; automatic with require 'pl' &lt;---
-</span>&gt; l = List()
-&gt; l:append(<span class="number">10</span>)
-&gt; l:append(<span class="number">20</span>)
-&gt; = l
+</span>&gt; l = <span class="function-name">List</span>()
+&gt; l:<span class="function-name">append</span>(<span class="number">10</span>)
+&gt; l:<span class="function-name">append</span>(<span class="number">20</span>)
+&gt; = <span class="function-name">l</span>
 {<span class="number">10</span>,<span class="number">20</span>}
-&gt; l:extend {<span class="number">30</span>,<span class="number">40</span>}
+&gt; l:<span class="function-name">extend</span> {<span class="number">30</span>,<span class="number">40</span>}
 {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>}
-&gt; l:insert(<span class="number">1</span>,<span class="number">5</span>)
+&gt; l:<span class="function-name">insert</span>(<span class="number">1</span>,<span class="number">5</span>)
 {<span class="number">5</span>,<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>}
-&gt; = l:pop()
+&gt; = l:<span class="function-name">pop</span>()
 <span class="number">40</span>
-&gt; = l
+&gt; = <span class="function-name">l</span>
 {<span class="number">5</span>,<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
-&gt; = l:index(<span class="number">30</span>)
+&gt; = l:<span class="function-name">index</span>(<span class="number">30</span>)
 <span class="number">4</span>
-&gt; = l:contains(<span class="number">30</span>)
+&gt; = l:<span class="function-name">contains</span>(<span class="number">30</span>)
 <span class="keyword">true</span>
-&gt; = l:reverse()  <span class="comment">---&gt; note: doesn't make a copy!
+&gt; = l:<span class="function-name">reverse</span>()  <span class="comment">---&gt; note: doesn't make a copy!
 </span>{<span class="number">30</span>,<span class="number">20</span>,<span class="number">10</span>,<span class="number">5</span>}
 </pre>
 
@@ -174,22 +174,22 @@ <h3>Python-style Lists</h3>
 
 <p>A particular feature of Python lists is <em>slicing</em>. This is fully supported in
 this version of <a href="../classes/pl.List.html#">List</a>, except we use 1-based indexing. So <a href="../classes/pl.List.html#List:slice">List.slice</a> works
-rather like <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.sub">string.sub</a>:</p>
+rather like <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.sub">string.sub</a>:</p>
 
 
 <pre>
-&gt; l = List {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>}
-&gt; = l:slice(<span class="number">1</span>,<span class="number">1</span>)  <span class="comment">---&gt; note: creates a new list!
+&gt; l = <span class="function-name">List</span> {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>}
+&gt; = l:<span class="function-name">slice</span>(<span class="number">1</span>,<span class="number">1</span>)  <span class="comment">---&gt; note: creates a new list!
 </span>{<span class="number">10</span>}
-&gt; = l:slice(<span class="number">2</span>,<span class="number">2</span>)
+&gt; = l:<span class="function-name">slice</span>(<span class="number">2</span>,<span class="number">2</span>)
 {<span class="number">20</span>}
-&gt; = l:slice(<span class="number">2</span>,<span class="number">3</span>)
+&gt; = l:<span class="function-name">slice</span>(<span class="number">2</span>,<span class="number">3</span>)
 {<span class="number">20</span>,<span class="number">30</span>}
-&gt; = l:slice(<span class="number">2</span>,-<span class="number">2</span>)
+&gt; = l:<span class="function-name">slice</span>(<span class="number">2</span>,-<span class="number">2</span>)
 {<span class="number">20</span>,<span class="number">30</span>}
-&gt; = l:slice_assign(<span class="number">2</span>,<span class="number">2</span>,{<span class="number">21</span>,<span class="number">22</span>,<span class="number">23</span>})
+&gt; = l:<span class="function-name">slice_assign</span>(<span class="number">2</span>,<span class="number">2</span>,{<span class="number">21</span>,<span class="number">22</span>,<span class="number">23</span>})
 {<span class="number">10</span>,<span class="number">21</span>,<span class="number">22</span>,<span class="number">23</span>,<span class="number">30</span>,<span class="number">40</span>}
-&gt; = l:chop(<span class="number">1</span>,<span class="number">1</span>)
+&gt; = l:<span class="function-name">chop</span>(<span class="number">1</span>,<span class="number">1</span>)
 {<span class="number">21</span>,<span class="number">22</span>,<span class="number">23</span>,<span class="number">30</span>,<span class="number">40</span>}
 </pre>
 
@@ -204,24 +204,24 @@ <h3>Python-style Lists</h3>
 
 
 <pre>
-&gt; l1 = List {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
-&gt; l2 = List {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
+&gt; l1 = <span class="function-name">List</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
+&gt; l2 = <span class="function-name">List</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
 &gt; = l1 == l2
 <span class="keyword">true</span>
-&gt; = l1..l2
+&gt; = l1..<span class="function-name">l2</span>
 {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
 </pre>
 
 <p>The <a href="../classes/pl.List.html#">List</a> constructor can be passed a function. If so, it's assumed that this is
 an iterator function that can be repeatedly called to generate a sequence.  One
-such function is <a href="https://www.lua.org/manual/5.1/manual.html#pdf-io.lines">io.lines</a>; the following short, intense little script counts
+such function is <a href="https://www.lua.org/manual/5.4/manual.html#pdf-io.lines">io.lines</a>; the following short, intense little script counts
 the number of lines in standard input:</p>
 
 
 <pre>
 <span class="comment">-- linecount.lua
 </span><span class="global">require</span> <span class="string">'pl'</span>
-ls = List(<span class="global">io</span>.lines())
+ls = <span class="function-name">List</span>(<span class="global">io</span>.<span class="function-name">lines</span>())
 <span class="global">print</span>(#ls)
 </pre>
 
@@ -230,7 +230,7 @@ <h3>Python-style Lists</h3>
 
 
 <pre>
-&gt; <span class="keyword">for</span> ch <span class="keyword">in</span> List.iterate <span class="string">'help'</span> <span class="keyword">do</span> <span class="global">io</span>.write(ch,<span class="string">' '</span>) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> ch <span class="keyword">in</span> List.<span class="function-name">iterate</span> <span class="string">'help'</span> <span class="keyword">do</span> <span class="global">io</span>.<span class="function-name">write</span>(ch,<span class="string">' '</span>) <span class="keyword">end</span>
 h e l p &gt;
 </pre>
 
@@ -241,17 +241,17 @@ <h3>Python-style Lists</h3>
 instance, you can <em>partition</em> a list into a table of sublists using a function.
 In the simplest form, you use a predicate (a function returning a boolean value)
 to partition the list into two lists, one of elements matching and another of
-elements not matching. But you can use any function; if we use <a href="https://www.lua.org/manual/5.1/manual.html#pdf-type">type</a> then the
+elements not matching. But you can use any function; if we use <a href="https://www.lua.org/manual/5.4/manual.html#pdf-type">type</a> then the
 keys will be the standard Lua type names.</p>
 
 
 <pre>
-&gt; ls = List{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}
+&gt; ls = <span class="function-name">List</span>{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>}
 &gt; ops = <span class="global">require</span> <span class="string">'pl.operator'</span>
-&gt; ls:partition(<span class="keyword">function</span>(x) <span class="keyword">return</span> x &gt; <span class="number">2</span> <span class="keyword">end</span>)
+&gt; ls:<span class="function-name">partition</span>(<span class="keyword">function</span>(x) <span class="keyword">return</span> x &gt; <span class="number">2</span> <span class="keyword">end</span>)
 {<span class="keyword">false</span>={<span class="number">1</span>,<span class="number">2</span>},<span class="keyword">true</span>={<span class="number">3</span>,<span class="number">4</span>}}
-&gt; ls = List{<span class="string">'one'</span>,<span class="global">math</span>.sin,List{<span class="number">1</span>},<span class="number">10</span>,<span class="number">20</span>,List{<span class="number">1</span>,<span class="number">2</span>}}
-&gt; ls:partition(<span class="global">type</span>)
+&gt; ls = <span class="function-name">List</span>{<span class="string">'one'</span>,<span class="global">math</span>.sin,<span class="function-name">List</span>{<span class="number">1</span>},<span class="number">10</span>,<span class="number">20</span>,<span class="function-name">List</span>{<span class="number">1</span>,<span class="number">2</span>}}
+&gt; ls:<span class="function-name">partition</span>(<span class="global">type</span>)
 {<span class="keyword">function</span>={<span class="keyword">function</span>: <span class="number">00369110</span>},<span class="global">string</span>={one},number={<span class="number">10</span>,<span class="number">20</span>},<span class="global">table</span>={{<span class="number">1</span>},{<span class="number">1</span>,<span class="number">2</span>}}}
 </pre>
 
@@ -271,7 +271,7 @@ <h3>Python-style Lists</h3>
 <code>push</code> (add a value to the end). <code>push</code> is provided as an alias for <code>append</code>, and
 the other stack operation (size) is simply the size operator <code>#</code>.  Queues can
 also be implemented; you use <code>pop</code> to take values out of the queue, and <code>put</code> to
-insert a value at the begining.</p>
+insert a value at the beginning.</p>
 
 <p>You may derive classes from <a href="../classes/pl.List.html#">List</a>, and since the list-returning methods
 are covariant, the result of <code>slice</code> etc will return lists of the derived type,
@@ -280,13 +280,13 @@ <h3>Python-style Lists</h3>
 
 
 <pre>
-n1 = NA{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
-n2 = NA{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
+n1 = <span class="function-name">NA</span>{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
+n2 = <span class="function-name">NA</span>{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
 ns = n1 + <span class="number">2</span>*n2
-asserteq(ns,{<span class="number">12</span>,<span class="number">24</span>,<span class="number">36</span>})
-min,max = ns:slice(<span class="number">1</span>,<span class="number">2</span>):minmax()
-asserteq(T(min,max),T(<span class="number">12</span>,<span class="number">24</span>))
-asserteq(n1:normalize():sum(),<span class="number">1</span>,<span class="number">1e-8</span>)
+<span class="function-name">asserteq</span>(ns,{<span class="number">12</span>,<span class="number">24</span>,<span class="number">36</span>})
+min,max = ns:<span class="function-name">slice</span>(<span class="number">1</span>,<span class="number">2</span>):<span class="function-name">minmax</span>()
+<span class="function-name">asserteq</span>(<span class="function-name">T</span>(min,max),<span class="function-name">T</span>(<span class="number">12</span>,<span class="number">24</span>))
+<span class="function-name">asserteq</span>(n1:<span class="function-name">normalize</span>():<span class="function-name">sum</span>(),<span class="number">1</span>,<span class="number">1e-8</span>)
 </pre>
 
 <p><a name="Map_and_Set_classes"></a></p>
@@ -304,9 +304,9 @@ <h3>Map and Set classes</h3>
 
 <pre>
 &gt; Map = <span class="global">require</span> <span class="string">'pl.Map'</span>
-&gt; m = Map{one=<span class="number">1</span>,two=<span class="number">2</span>}
-&gt; m:update {three=<span class="number">3</span>,four=<span class="number">4</span>,two=<span class="number">20</span>}
-&gt; = m == M{one=<span class="number">1</span>,two=<span class="number">20</span>,three=<span class="number">3</span>,four=<span class="number">4</span>}
+&gt; m = <span class="function-name">Map</span>{one=<span class="number">1</span>,two=<span class="number">2</span>}
+&gt; m:<span class="function-name">update</span> {three=<span class="number">3</span>,four=<span class="number">4</span>,two=<span class="number">20</span>}
+&gt; = m == <span class="function-name">M</span>{one=<span class="number">1</span>,two=<span class="number">20</span>,three=<span class="number">3</span>,four=<span class="number">4</span>}
 <span class="keyword">true</span>
 </pre>
 
@@ -316,10 +316,10 @@ <h3>Map and Set classes</h3>
 
 
 <pre>
-&gt; m = Map{one=<span class="number">1</span>,two=<span class="number">2</span>,three=<span class="number">3</span>}
-&gt; = m:getvalues {<span class="string">'one'</span>,<span class="string">'three'</span>}
+&gt; m = <span class="function-name">Map</span>{one=<span class="number">1</span>,two=<span class="number">2</span>,three=<span class="number">3</span>}
+&gt; = m:<span class="function-name">getvalues</span> {<span class="string">'one'</span>,<span class="string">'three'</span>}
 {<span class="number">1</span>,<span class="number">3</span>}
-&gt; = m:getvalues(m:keys()) == m:values()
+&gt; = m:<span class="function-name">getvalues</span>(m:<span class="function-name">keys</span>()) == m:<span class="function-name">values</span>()
 <span class="keyword">true</span>
 </pre>
 
@@ -327,7 +327,7 @@ <h3>Map and Set classes</h3>
 
 
 <pre>
-&gt; <span class="global">print</span>(m:get <span class="string">'one'</span>, m:get <span class="string">'two'</span>)
+&gt; <span class="global">print</span>(m:<span class="function-name">get</span> <span class="string">'one'</span>, m:<span class="function-name">get</span> <span class="string">'two'</span>)
 <span class="number">1</span>     <span class="number">2</span>
 </pre>
 
@@ -349,23 +349,23 @@ <h3>Map and Set classes</h3>
 
 <p>A <a href="../classes/pl.Set.html#">Set</a> can be seen as a special kind of <a href="../classes/pl.Map.html#">Map</a>, where all the values are <code>true</code>,
 the keys are the values, and the order is not important. So in this case
-<a href="../classes/pl.Set.html#pl.Set:values">Set.values</a> is defined to return a list of the keys.  Sets can display
+<a href="../classes/pl.Set.html#pl.set:values">Set.values</a> is defined to return a list of the keys.  Sets can display
 themselves, and the basic operations like <code>union</code> (<code>+</code>) and <code>intersection</code> (<code>*</code>)
 are defined.</p>
 
 
 <pre>
 &gt; Set = <span class="global">require</span> <span class="string">'pl.Set'</span>
-&gt; = Set{<span class="string">'one'</span>,<span class="string">'two'</span>} == Set{<span class="string">'two'</span>,<span class="string">'one'</span>}
+&gt; = <span class="function-name">Set</span>{<span class="string">'one'</span>,<span class="string">'two'</span>} == <span class="function-name">Set</span>{<span class="string">'two'</span>,<span class="string">'one'</span>}
 <span class="keyword">true</span>
-&gt; fruit = Set{<span class="string">'apple'</span>,<span class="string">'banana'</span>,<span class="string">'orange'</span>}
+&gt; fruit = <span class="function-name">Set</span>{<span class="string">'apple'</span>,<span class="string">'banana'</span>,<span class="string">'orange'</span>}
 &gt; = fruit[<span class="string">'banana'</span>]
 <span class="keyword">true</span>
 &gt; = fruit[<span class="string">'hazelnut'</span>]
 <span class="keyword">nil</span>
-&gt; = fruit:values()
+&gt; = fruit:<span class="function-name">values</span>()
 {apple,orange,banana}
-&gt; colours = Set{<span class="string">'red'</span>,<span class="string">'orange'</span>,<span class="string">'green'</span>,<span class="string">'blue'</span>}
+&gt; colours = <span class="function-name">Set</span>{<span class="string">'red'</span>,<span class="string">'orange'</span>,<span class="string">'green'</span>,<span class="string">'blue'</span>}
 &gt; = fruit,colours
 [apple,orange,banana]   [blue,green,orange,red]
 &gt; = fruit+colours
@@ -374,7 +374,7 @@ <h3>Map and Set classes</h3>
 [orange]
 </pre>
 
-<p>There are also the functions <a href="../classes/pl.Set.html#pl.Set:difference">Set.difference</a> and <code>Set.symmetric_difference</code>. The
+<p>There are also the functions <a href="../classes/pl.Set.html#pl.set:difference">Set.difference</a> and <code>Set.symmetric_difference</code>. The
 first answers the question 'what fruits are not colours?' and the second 'what
 are fruits and colours but not both?'</p>
 
@@ -407,7 +407,7 @@ <h3>Useful Operations on Tables</h3>
 associative map which happens to be particularly efficient at acting like an
 array.)</p>
 
-<p>The functions provided in <a href="https://www.lua.org/manual/5.1/manual.html#5.5">table</a> provide all the basic manipulations on Lua
+<p>The functions provided in <a href="https://www.lua.org/manual/5.4/manual.html#6.6">table</a> provide all the basic manipulations on Lua
 tables, but as we saw with the <a href="../classes/pl.List.html#">List</a> class, it is useful to build higher-level
 operations on top of those functions. For instance, to copy a table involves this
 kind of loop:</p>
@@ -431,9 +431,9 @@ <h3>Useful Operations on Tables</h3>
 
 
 <pre>
-asserteq(icopy({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>}),{<span class="number">20</span>,<span class="number">30</span>})   <span class="comment">-- start at 1
-</span>asserteq(icopy({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>},<span class="number">2</span>),{<span class="number">1</span>,<span class="number">20</span>,<span class="number">30</span>}) <span class="comment">-- start at 2
-</span>asserteq(icopy({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>},<span class="number">2</span>,<span class="number">2</span>),{<span class="number">1</span>,<span class="number">30</span>}) <span class="comment">-- start at 2, copy from 2</span>
+<span class="function-name">asserteq</span>(<span class="function-name">icopy</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>}),{<span class="number">20</span>,<span class="number">30</span>})   <span class="comment">-- start at 1
+</span><span class="function-name">asserteq</span>(<span class="function-name">icopy</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>},<span class="number">2</span>),{<span class="number">1</span>,<span class="number">20</span>,<span class="number">30</span>}) <span class="comment">-- start at 2
+</span><span class="function-name">asserteq</span>(<span class="function-name">icopy</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>},<span class="number">2</span>,<span class="number">2</span>),{<span class="number">1</span>,<span class="number">30</span>}) <span class="comment">-- start at 2, copy from 2</span>
 </pre>
 
 <p>(This code from the <a href="../libraries/pl.tablex.html#">tablex</a> test module shows the use of <a href="../libraries/pl.test.html#asserteq">pl.test.asserteq</a>)</p>
@@ -442,9 +442,9 @@ <h3>Useful Operations on Tables</h3>
 
 
 <pre>
-asserteq(move({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>}),{<span class="number">20</span>,<span class="number">30</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>})
-asserteq(move({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>},<span class="number">2</span>),{<span class="number">1</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>})
-asserteq(move({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>},<span class="number">2</span>,<span class="number">2</span>),{<span class="number">1</span>,<span class="number">30</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>})
+<span class="function-name">asserteq</span>(<span class="function-name">move</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>}),{<span class="number">20</span>,<span class="number">30</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>})
+<span class="function-name">asserteq</span>(<span class="function-name">move</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>},<span class="number">2</span>),{<span class="number">1</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>})
+<span class="function-name">asserteq</span>(<span class="function-name">move</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">20</span>,<span class="number">30</span>},<span class="number">2</span>,<span class="number">2</span>),{<span class="number">1</span>,<span class="number">30</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>})
 </pre>
 
 <p>(The difference is somewhat like that between C's <code>strcpy</code> and <code>memmove</code>.)</p>
@@ -454,13 +454,13 @@ <h3>Useful Operations on Tables</h3>
 <a href="../libraries/pl.tablex.html#icopy">icopy</a>, and <a href="../libraries/pl.tablex.html#move">move</a> if you are updating a range in the destination.</p>
 
 <p>To complete this set of operations, there is <a href="../libraries/pl.tablex.html#insertvalues">insertvalues</a> which works like
-<a href="https://www.lua.org/manual/5.1/manual.html#pdf-table.insert">table.insert</a> except that one provides a table of values to be inserted, and
+<a href="https://www.lua.org/manual/5.4/manual.html#pdf-table.insert">table.insert</a> except that one provides a table of values to be inserted, and
 <a href="../libraries/pl.tablex.html#removevalues">removevalues</a> which removes a range of values.</p>
 
 
 <pre>
-asserteq(insertvalues({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>},<span class="number">2</span>,{<span class="number">20</span>,<span class="number">30</span>}),{<span class="number">1</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
-asserteq(insertvalues({<span class="number">1</span>,<span class="number">2</span>},{<span class="number">3</span>,<span class="number">4</span>}),{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+<span class="function-name">asserteq</span>(<span class="function-name">insertvalues</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>},<span class="number">2</span>,{<span class="number">20</span>,<span class="number">30</span>}),{<span class="number">1</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+<span class="function-name">asserteq</span>(<span class="function-name">insertvalues</span>({<span class="number">1</span>,<span class="number">2</span>},{<span class="number">3</span>,<span class="number">4</span>}),{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
 </pre>
 
 <p>Another example:</p>
@@ -469,9 +469,9 @@ <h3>Useful Operations on Tables</h3>
 <pre>
 &gt; T = <span class="global">require</span> <span class="string">'pl.tablex'</span>
 &gt; t = {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>}
-&gt; = T.removevalues(t,<span class="number">2</span>,<span class="number">3</span>)
+&gt; = T.<span class="function-name">removevalues</span>(t,<span class="number">2</span>,<span class="number">3</span>)
 {<span class="number">10</span>,<span class="number">40</span>}
-&gt; = T.insertvalues(t,<span class="number">2</span>,{<span class="number">20</span>,<span class="number">30</span>})
+&gt; = T.<span class="function-name">insertvalues</span>(t,<span class="number">2</span>,{<span class="number">20</span>,<span class="number">30</span>})
 {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>}
 </pre>
 
@@ -481,22 +481,22 @@ <h3>Useful Operations on Tables</h3>
 
 <pre>
 &gt; t1 = {<span class="number">1</span>,{<span class="number">2</span>,<span class="number">3</span>},<span class="number">4</span>}
-&gt; t2 = deepcopy(t1)
+&gt; t2 = <span class="function-name">deepcopy</span>(t1)
 &gt; = t1 == t2
 <span class="keyword">false</span>
-&gt; = deepcompare(t1,t2)
+&gt; = <span class="function-name">deepcompare</span>(t1,t2)
 <span class="keyword">true</span>
 </pre>
 
 <p><a href="../libraries/pl.tablex.html#find">find</a> will return the index of a given value in a list-like table. Note that
-like <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.find">string.find</a> you can specify an index to start searching, so that all
+like <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.find">string.find</a> you can specify an index to start searching, so that all
 instances can be found. There is an optional fourth argument, which makes the
 search start at the end and go backwards, so we could define <a href="../libraries/pl.tablex.html#rfind">rfind</a> like so:</p>
 
 
 <pre>
-<span class="keyword">function</span> rfind(t,val,istart)
-    <span class="keyword">return</span> tablex.find(t,val,istart,<span class="keyword">true</span>)
+<span class="keyword">function</span> <span class="function-name">rfind</span>(t,val,istart)
+    <span class="keyword">return</span> tablex.<span class="function-name">find</span>(t,val,istart,<span class="keyword">true</span>)
 <span class="keyword">end</span>
 </pre>
 
@@ -509,11 +509,11 @@ <h3>Useful Operations on Tables</h3>
 
 <pre>
 &gt; t = {<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'three'</span>}
-&gt; = tablex.find(t,<span class="string">'two'</span>)
+&gt; = tablex.<span class="function-name">find</span>(t,<span class="string">'two'</span>)
 <span class="number">2</span>
-&gt; = tablex.find(t,<span class="string">'four'</span>)
+&gt; = tablex.<span class="function-name">find</span>(t,<span class="string">'four'</span>)
 <span class="keyword">nil</span>
-&gt; il = tablex.index_map(t)
+&gt; il = tablex.<span class="function-name">index_map</span>(t)
 &gt; = il[<span class="string">'two'</span>]
 <span class="number">2</span>
 &gt; = il.two
@@ -526,7 +526,7 @@ <h3>Useful Operations on Tables</h3>
 
 
 <pre>
-&gt; = deepcompare(makeset {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},makeset {<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>})
+&gt; = <span class="function-name">deepcompare</span>(<span class="function-name">makeset</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},<span class="function-name">makeset</span> {<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>})
 <span class="keyword">true</span>
 </pre>
 
@@ -538,7 +538,7 @@ <h3>Useful Operations on Tables</h3>
 (last-month.txt)
 smith,john
 brady,maureen
-mongale,thabo
+mongale,<span class="function-name">thabo</span>
 
 (this-month.txt)
 smith,john
@@ -554,16 +554,16 @@ <h3>Useful Operations on Tables</h3>
 <pre>
 <span class="global">require</span> <span class="string">'pl'</span>
 
-<span class="keyword">function</span> read_employees(file)
-  <span class="keyword">local</span> ls = List(<span class="global">io</span>.lines(file)) <span class="comment">-- a list of employees
-</span>  <span class="keyword">return</span> tablex.makeset(ls)
+<span class="keyword">function</span> <span class="function-name">read_employees</span>(file)
+  <span class="keyword">local</span> ls = <span class="function-name">List</span>(<span class="global">io</span>.<span class="function-name">lines</span>(file)) <span class="comment">-- a list of employees
+</span>  <span class="keyword">return</span> tablex.<span class="function-name">makeset</span>(ls)
 <span class="keyword">end</span>
 
-last = read_employees <span class="string">'last-month.txt'</span>
-this = read_employees <span class="string">'this-month.txt'</span>
+last = <span class="function-name">read_employees</span> <span class="string">'last-month.txt'</span>
+this = <span class="function-name">read_employees</span> <span class="string">'this-month.txt'</span>
 
 <span class="comment">-- who is in this but not in last?
-</span>diff = tablex.difference(this,last)
+</span>diff = tablex.<span class="function-name">difference</span>(this,last)
 
 <span class="comment">-- in a set, the keys are the values...
 </span><span class="keyword">for</span> e <span class="keyword">in</span> <span class="global">pairs</span>(diff) <span class="keyword">do</span> <span class="global">print</span>(e) <span class="keyword">end</span>
@@ -596,7 +596,7 @@ <h3>Useful Operations on Tables</h3>
 
 <pre>
 &gt; ops = <span class="global">require</span> <span class="string">'pl.operator'</span>
-&gt; = tablex.find_if({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>},ops.gt,<span class="number">20</span>)
+&gt; = tablex.<span class="function-name">find_if</span>({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>},ops.gt,<span class="number">20</span>)
 <span class="number">3</span>       <span class="keyword">true</span>
 </pre>
 
@@ -613,9 +613,9 @@ <h3>Useful Operations on Tables</h3>
 
 
 <pre>
-&gt; = compare_no_order({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>})
+&gt; = <span class="function-name">compare_no_order</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>})
 <span class="keyword">true</span>
-&gt; = compare_no_order({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>},<span class="string">'=='</span>)
+&gt; = <span class="function-name">compare_no_order</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">2</span>,<span class="number">1</span>,<span class="number">3</span>},<span class="string">'=='</span>)
 <span class="keyword">true</span>
 </pre>
 
@@ -630,11 +630,11 @@ <h3>Useful Operations on Tables</h3>
 
 <pre>
 &gt; t = {john=<span class="number">27</span>,jane=<span class="number">31</span>,mary=<span class="number">24</span>}
-&gt; <span class="keyword">for</span> name,age <span class="keyword">in</span> tablex.sort(t) <span class="keyword">do</span> <span class="global">print</span>(name,age) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> name,age <span class="keyword">in</span> tablex.<span class="function-name">sort</span>(t) <span class="keyword">do</span> <span class="global">print</span>(name,age) <span class="keyword">end</span>
 jane    <span class="number">31</span>
 john    <span class="number">27</span>
 mary    <span class="number">24</span>
-&gt; <span class="keyword">for</span> name,age <span class="keyword">in</span> tablex.sortv(t) <span class="keyword">do</span> <span class="global">print</span>(name,age) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> name,age <span class="keyword">in</span> tablex.<span class="function-name">sortv</span>(t) <span class="keyword">do</span> <span class="global">print</span>(name,age) <span class="keyword">end</span>
 mary    <span class="number">24</span>
 john    <span class="number">27</span>
 jane    <span class="number">31</span>
@@ -651,9 +651,9 @@ <h3>Useful Operations on Tables</h3>
 <pre>
 &gt; S1 = {john=<span class="number">27</span>,jane=<span class="number">31</span>,mary=<span class="number">24</span>}
 &gt; S2 = {jane=<span class="number">31</span>,jones=<span class="number">50</span>}
-&gt; = tablex.merge(S1, S2, <span class="keyword">false</span>)
+&gt; = tablex.<span class="function-name">merge</span>(S1, S2, <span class="keyword">false</span>)
 {jane=<span class="number">31</span>}
-&gt; = tablex.merge(S1, S2, <span class="keyword">true</span>)
+&gt; = tablex.<span class="function-name">merge</span>(S1, S2, <span class="keyword">true</span>)
 {mary=<span class="number">24</span>,jane=<span class="number">31</span>,john=<span class="number">27</span>,jones=<span class="number">50</span>}
 </pre>
 
@@ -665,9 +665,9 @@ <h3>Useful Operations on Tables</h3>
 
 
 <pre>
-&gt; = map(<span class="global">math</span>.sin, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+&gt; = <span class="function-name">map</span>(<span class="global">math</span>.sin, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
 {  <span class="number">0.84</span>,  <span class="number">0.91</span>,  <span class="number">0.14</span>, -<span class="number">0.76</span>}
-&gt; = map(<span class="keyword">function</span>(x) <span class="keyword">return</span> x*x <span class="keyword">end</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+&gt; = <span class="function-name">map</span>(<span class="keyword">function</span>(x) <span class="keyword">return</span> x*x <span class="keyword">end</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
 {<span class="number">1</span>,<span class="number">4</span>,<span class="number">9</span>,<span class="number">16</span>}
 </pre>
 
@@ -682,9 +682,9 @@ <h3>Useful Operations on Tables</h3>
 
 <pre>
 &gt; t = {fred=<span class="number">10</span>,bonzo=<span class="number">20</span>,alice=<span class="number">4</span>}
-&gt; = pairmap(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> v <span class="keyword">end</span>, t)
+&gt; = <span class="function-name">pairmap</span>(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> v <span class="keyword">end</span>, t)
 {<span class="number">4</span>,<span class="number">10</span>,<span class="number">20</span>}
-&gt; = pairmap(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> k <span class="keyword">end</span>, t)
+&gt; = <span class="function-name">pairmap</span>(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> k <span class="keyword">end</span>, t)
 {<span class="string">'alice'</span>,<span class="string">'fred'</span>,<span class="string">'bonzo'</span>}
 </pre>
 
@@ -694,7 +694,7 @@ <h3>Useful Operations on Tables</h3>
 
 
 <pre>
-&gt; = pairmap(t,<span class="keyword">function</span>(k,v) <span class="keyword">return</span> v+<span class="number">10</span>, k:upper() <span class="keyword">end</span>)
+&gt; = <span class="function-name">pairmap</span>(t,<span class="keyword">function</span>(k,v) <span class="keyword">return</span> v+<span class="number">10</span>, k:<span class="function-name">upper</span>() <span class="keyword">end</span>)
 {BONZO=<span class="number">30</span>,FRED=<span class="number">20</span>,ALICE=<span class="number">14</span>}
 </pre>
 
@@ -702,9 +702,9 @@ <h3>Useful Operations on Tables</h3>
 
 
 <pre>
-&gt; map2(ops.add,{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">10</span>,<span class="number">20</span>})
+&gt; <span class="function-name">map2</span>(ops.add,{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">10</span>,<span class="number">20</span>})
 {<span class="number">11</span>,<span class="number">22</span>}
-&gt; map2(<span class="string">'*'</span>,{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">10</span>,<span class="number">20</span>})
+&gt; <span class="function-name">map2</span>(<span class="string">'*'</span>,{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">10</span>,<span class="number">20</span>})
 {<span class="number">10</span>,<span class="number">40</span>}
 </pre>
 
@@ -713,9 +713,9 @@ <h3>Useful Operations on Tables</h3>
 
 
 <pre>
-&gt; reduce (<span class="string">'+'</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>})
+&gt; <span class="function-name">reduce</span> (<span class="string">'+'</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>})
 <span class="number">6</span>
-&gt; reduce (<span class="string">'..'</span>, {<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'three'</span>})
+&gt; <span class="function-name">reduce</span> (<span class="string">'..'</span>, {<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'three'</span>})
 <span class="string">'onetwothree'</span>
 </pre>
 
@@ -723,7 +723,7 @@ <h3>Useful Operations on Tables</h3>
 
 
 <pre>
-&gt; = zip({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>})
+&gt; = <span class="function-name">zip</span>({<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>})
 {{<span class="number">1</span>,<span class="number">10</span>},{<span class="number">2</span>,<span class="number">20</span>},{<span class="number">3</span>,<span class="number">30</span>}}
 </pre>
 
@@ -750,13 +750,13 @@ <h3>Operations on two-dimensional tables</h3>
 provides generalizations of the higher-level operations provided by <a href="../libraries/pl.tablex.html#">pl.tablex</a>
 for one-dimensional arrays.</p>
 
-<p><a href="../libraries/pl.array2d.html#iter">iter</a> is a useful generalization of <a href="https://www.lua.org/manual/5.1/manual.html#pdf-ipairs">ipairs</a>. (The extra parameter determines
+<p><a href="../libraries/pl.array2d.html#iter">iter</a> is a useful generalization of <a href="https://www.lua.org/manual/5.4/manual.html#pdf-ipairs">ipairs</a>. (The extra parameter determines
 whether you want the indices as well.)</p>
 
 
 <pre>
 &gt; a = {{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">3</span>,<span class="number">4</span>}}
-&gt; <span class="keyword">for</span> i,j,v <span class="keyword">in</span> array2d.iter(a,<span class="keyword">true</span>) <span class="keyword">do</span> <span class="global">print</span>(i,j,v) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> i,j,v <span class="keyword">in</span> array2d.<span class="function-name">iter</span>(a,<span class="keyword">true</span>) <span class="keyword">do</span> <span class="global">print</span>(i,j,v) <span class="keyword">end</span>
 <span class="number">1</span>       <span class="number">1</span>       <span class="number">1</span>
 <span class="number">1</span>       <span class="number">2</span>       <span class="number">2</span>
 <span class="number">2</span>       <span class="number">1</span>       <span class="number">3</span>
@@ -771,7 +771,7 @@ <h3>Operations on two-dimensional tables</h3>
 
 
 <pre>
-&gt; array2d.map(<span class="string">'-'</span>,a,<span class="number">1</span>)
+&gt; array2d.<span class="function-name">map</span>(<span class="string">'-'</span>,a,<span class="number">1</span>)
 {{<span class="number">0</span>,<span class="number">1</span>},{<span class="number">2</span>,<span class="number">3</span>}}
 </pre>
 
@@ -779,7 +779,7 @@ <h3>Operations on two-dimensional tables</h3>
 
 
 <pre>
-&gt; array2d.column(a,<span class="number">1</span>)
+&gt; array2d.<span class="function-name">column</span>(a,<span class="number">1</span>)
 {<span class="number">1</span>,<span class="number">3</span>}
 </pre>
 
@@ -790,12 +790,12 @@ <h3>Operations on two-dimensional tables</h3>
 
 
 <pre>
-&gt; array2d.reduce_rows(<span class="string">'+'</span>,a)
+&gt; array2d.<span class="function-name">reduce_rows</span>(<span class="string">'+'</span>,a)
 {<span class="number">3</span>,<span class="number">7</span>}
-&gt; array2d.reduce_cols(<span class="string">'+'</span>,a)
+&gt; array2d.<span class="function-name">reduce_cols</span>(<span class="string">'+'</span>,a)
 {<span class="number">4</span>,<span class="number">6</span>}
 &gt; <span class="comment">-- same as tablex.reduce('*',array.reduce_rows('+',a))
-</span>&gt; array2d.reduce2(<span class="string">'*'</span>,<span class="string">'+'</span>,a)
+</span>&gt; array2d.<span class="function-name">reduce2</span>(<span class="string">'*'</span>,<span class="string">'+'</span>,a)
 <span class="number">21</span>    `
 </pre>
 
@@ -808,24 +808,24 @@ <h3>Operations on two-dimensional tables</h3>
 <pre>
 &gt; b = {{<span class="number">10</span>,<span class="number">20</span>},{<span class="number">30</span>,<span class="number">40</span>}}
 &gt; a = {{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">3</span>,<span class="number">4</span>}}
-&gt; = array2d.map2(<span class="string">'+'</span>,<span class="number">2</span>,<span class="number">2</span>,a,b)  <span class="comment">-- two 2D arrays
+&gt; = array2d.<span class="function-name">map2</span>(<span class="string">'+'</span>,<span class="number">2</span>,<span class="number">2</span>,a,b)  <span class="comment">-- two 2D arrays
 </span>{{<span class="number">11</span>,<span class="number">22</span>},{<span class="number">33</span>,<span class="number">44</span>}}
-&gt; = array2d.map2(<span class="string">'+'</span>,<span class="number">1</span>,<span class="number">2</span>,{<span class="number">10</span>,<span class="number">100</span>},a)  <span class="comment">-- 1D, 2D
+&gt; = array2d.<span class="function-name">map2</span>(<span class="string">'+'</span>,<span class="number">1</span>,<span class="number">2</span>,{<span class="number">10</span>,<span class="number">100</span>},a)  <span class="comment">-- 1D, 2D
 </span>{{<span class="number">11</span>,<span class="number">102</span>},{<span class="number">13</span>,<span class="number">104</span>}}
-&gt; = array2d.map2(<span class="string">'*'</span>,<span class="number">2</span>,<span class="number">1</span>,a,{<span class="number">1</span>,-<span class="number">1</span>})  <span class="comment">-- 2D, 1D
+&gt; = array2d.<span class="function-name">map2</span>(<span class="string">'*'</span>,<span class="number">2</span>,<span class="number">1</span>,a,{<span class="number">1</span>,-<span class="number">1</span>})  <span class="comment">-- 2D, 1D
 </span>{{<span class="number">1</span>,-<span class="number">2</span>},{<span class="number">3</span>,-<span class="number">4</span>}}
 </pre>
 
 <p>Of course, you are not limited to simple arithmetic. Say we have a 2D array of
 strings, and wish to print it out with proper right justification. The first step
-is to create all the string lengths by mapping <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.len">string.len</a> over the array, the
-second is to reduce this along the columns using <a href="https://www.lua.org/manual/5.1/manual.html#pdf-math.max">math.max</a> to get maximum column
+is to create all the string lengths by mapping <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.len">string.len</a> over the array, the
+second is to reduce this along the columns using <a href="https://www.lua.org/manual/5.4/manual.html#pdf-math.max">math.max</a> to get maximum column
 widths, and last, apply <a href="../libraries/pl.stringx.html#rjust">stringx.rjust</a> with these widths.</p>
 
 
 <pre>
-maxlens = reduce_cols(<span class="global">math</span>.max,map(<span class="string">'#'</span>,lines))
-lines = map2(stringx.rjust,<span class="number">2</span>,<span class="number">1</span>,lines,maxlens)
+maxlens = <span class="function-name">reduce_cols</span>(<span class="global">math</span>.max,<span class="function-name">map</span>(<span class="string">'#'</span>,lines))
+lines = <span class="function-name">map2</span>(stringx.rjust,<span class="number">2</span>,<span class="number">1</span>,lines,maxlens)
 </pre>
 
 <p>There is <a href="../libraries/pl.array2d.html#product">product</a> which returns  the <em>Cartesian product</em> of two 1D arrays. The
@@ -834,14 +834,14 @@ <h3>Operations on two-dimensional tables</h3>
 
 
 <pre>
-&gt; array2d.product(<span class="string">'{}'</span>,{<span class="number">1</span>,<span class="number">2</span>},{<span class="string">'a'</span>,<span class="string">'b'</span>})
+&gt; array2d.<span class="function-name">product</span>(<span class="string">'{}'</span>,{<span class="number">1</span>,<span class="number">2</span>},{<span class="string">'a'</span>,<span class="string">'b'</span>})
 {{{<span class="number">1</span>,<span class="string">'b'</span>},{<span class="number">2</span>,<span class="string">'a'</span>}},{{<span class="number">1</span>,<span class="string">'a'</span>},{<span class="number">2</span>,<span class="string">'b'</span>}}}
 </pre>
 
 <p>There is a set of operations which work in-place on 2D arrays. You can
 <a href="../libraries/pl.array2d.html#swap_rows">swap_rows</a> and <a href="../libraries/pl.array2d.html#swap_cols">swap_cols</a>; the first really is a simple one-liner, but the idea
 here is to give the operation a name. <a href="../libraries/pl.array2d.html#remove_row">remove_row</a> and <a href="../libraries/pl.array2d.html#remove_col">remove_col</a> are
-generalizations of <a href="https://www.lua.org/manual/5.1/manual.html#pdf-table.remove">table.remove</a>. Likewise, <a href="../libraries/pl.array2d.html#extract_rows">extract_rows</a> and <a href="../libraries/pl.array2d.html#extract_cols">extract_cols</a>
+generalizations of <a href="https://www.lua.org/manual/5.4/manual.html#pdf-table.remove">table.remove</a>. Likewise, <a href="../libraries/pl.array2d.html#extract_rows">extract_rows</a> and <a href="../libraries/pl.array2d.html#extract_cols">extract_cols</a>
 are given arrays of indices and discard anything else. So, for instance,
 <code>extract_cols(A,{2,4})</code> will leave just columns 2 and 4 in the array.</p>
 
@@ -851,19 +851,19 @@ <h3>Operations on two-dimensional tables</h3>
 
 <pre>
 &gt; A = {{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>},{<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>},{<span class="number">7</span>,<span class="number">8</span>,<span class="number">9</span>}}
-&gt; B = slice(A,<span class="number">1</span>,<span class="number">1</span>,<span class="number">2</span>,<span class="number">2</span>)
-&gt; write(B)
+&gt; B = <span class="function-name">slice</span>(A,<span class="number">1</span>,<span class="number">1</span>,<span class="number">2</span>,<span class="number">2</span>)
+&gt; <span class="function-name">write</span>(B)
  <span class="number">1</span> <span class="number">2</span>
  <span class="number">4</span> <span class="number">5</span>
-&gt; B = slice(A,<span class="number">2</span>,<span class="number">2</span>)
-&gt; write(B,<span class="keyword">nil</span>,<span class="string">'%4.1f'</span>)
+&gt; B = <span class="function-name">slice</span>(A,<span class="number">2</span>,<span class="number">2</span>)
+&gt; <span class="function-name">write</span>(B,<span class="keyword">nil</span>,<span class="string">'%4.1f'</span>)
  <span class="number">5.0</span> <span class="number">6.0</span>
  <span class="number">8.0</span> <span class="number">9.0</span>
 </pre>
 
 <p>Here <a href="../libraries/pl.array2d.html#write">write</a> is used to print out an array nicely; the second parameter is <code>nil</code>,
 which is the default (stdout) but can be any file object and the third parameter
-is an optional format (as used in <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.format">string.format</a>).</p>
+is an optional format (as used in <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.format">string.format</a>).</p>
 
 <p><a href="../libraries/pl.array2d.html#parse_range">parse_range</a> will take a spreadsheet range like 'A1:B2' or 'R1C1:R2C2' and
 return the range as four numbers, which can be passed to <a href="../libraries/pl.array2d.html#slice">slice</a>. The rule is
@@ -875,7 +875,7 @@ <h3>Operations on two-dimensional tables</h3>
 
 
 <pre>
-&gt; <span class="keyword">for</span> i,j,v <span class="keyword">in</span> iter(A,<span class="keyword">true</span>,<span class="number">2</span>,<span class="number">2</span>) <span class="keyword">do</span> <span class="global">print</span>(i,j,v) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> i,j,v <span class="keyword">in</span> <span class="function-name">iter</span>(A,<span class="keyword">true</span>,<span class="number">2</span>,<span class="number">2</span>) <span class="keyword">do</span> <span class="global">print</span>(i,j,v) <span class="keyword">end</span>
 <span class="number">2</span>       <span class="number">2</span>       <span class="number">5</span>
 <span class="number">2</span>       <span class="number">3</span>       <span class="number">6</span>
 <span class="number">3</span>       <span class="number">2</span>       <span class="number">8</span>
@@ -889,8 +889,8 @@ <h3>Operations on two-dimensional tables</h3>
 
 
 <pre>
-asserteq(
-    array.new(<span class="number">3</span>,<span class="number">3</span>,L<span class="string">'|i,j| i==j and 1 or 0'</span>),
+<span class="function-name">asserteq</span>(
+    array.<span class="function-name">new</span>(<span class="number">3</span>,<span class="number">3</span>,<span class="function-name">L</span><span class="string">'|i,j| i==j and 1 or 0'</span>),
     {{<span class="number">1</span>,<span class="number">0</span>,<span class="number">0</span>},{<span class="number">0</span>,<span class="number">1</span>,<span class="number">0</span>},{<span class="number">0</span>,<span class="number">0</span>,<span class="number">1</span>}}
 )
 </pre>
@@ -907,7 +907,7 @@ <h3>Operations on two-dimensional tables</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/manual/03-strings.md.html b/docs/manual/03-strings.md.html
index f6e20149..7aa67564 100644
--- a/docs/manual/03-strings.md.html
+++ b/docs/manual/03-strings.md.html
@@ -138,22 +138,22 @@ <h3>Extra String Methods</h3>
 
 
 <pre>
-&gt; stringx.import()
-&gt; (<span class="string">'bonzo.dog'</span>):endswith {<span class="string">'.dog'</span>,<span class="string">'.cat'</span>}
+&gt; stringx.<span class="function-name">import</span>()
+&gt; (<span class="string">'bonzo.dog'</span>):<span class="function-name">endswith</span> {<span class="string">'.dog'</span>,<span class="string">'.cat'</span>}
 <span class="keyword">true</span>
-&gt; (<span class="string">'bonzo.txt'</span>):endswith {<span class="string">'.dog'</span>,<span class="string">'.cat'</span>}
+&gt; (<span class="string">'bonzo.txt'</span>):<span class="function-name">endswith</span> {<span class="string">'.dog'</span>,<span class="string">'.cat'</span>}
 <span class="keyword">false</span>
-&gt; (<span class="string">'bonzo.cat'</span>):endswith {<span class="string">'.dog'</span>,<span class="string">'.cat'</span>}
+&gt; (<span class="string">'bonzo.cat'</span>):<span class="function-name">endswith</span> {<span class="string">'.dog'</span>,<span class="string">'.cat'</span>}
 <span class="keyword">true</span>
-&gt; (<span class="string">' stuff'</span>):ljust(<span class="number">20</span>,<span class="string">'+'</span>)
+&gt; (<span class="string">' stuff'</span>):<span class="function-name">ljust</span>(<span class="number">20</span>,<span class="string">'+'</span>)
 <span class="string">'++++++++++++++ stuff'</span>
-&gt; (<span class="string">'  stuff '</span>):lstrip()
+&gt; (<span class="string">'  stuff '</span>):<span class="function-name">lstrip</span>()
 <span class="string">'stuff '</span>
-&gt; (<span class="string">'  stuff '</span>):rstrip()
+&gt; (<span class="string">'  stuff '</span>):<span class="function-name">rstrip</span>()
 <span class="string">'  stuff'</span>
-&gt; (<span class="string">'  stuff '</span>):strip()
+&gt; (<span class="string">'  stuff '</span>):<span class="function-name">strip</span>()
 <span class="string">'stuff'</span>
-&gt; <span class="keyword">for</span> s <span class="keyword">in</span> (<span class="string">'one\ntwo\nthree\n'</span>):lines() <span class="keyword">do</span> <span class="global">print</span>(s) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> s <span class="keyword">in</span> (<span class="string">'one\ntwo\nthree\n'</span>):<span class="function-name">lines</span>() <span class="keyword">do</span> <span class="global">print</span>(s) <span class="keyword">end</span>
 one
 two
 three
@@ -161,9 +161,9 @@ <h3>Extra String Methods</h3>
 
 <p>Most of these can be fairly easily implemented using the Lua string library,
 which is more general and powerful. But they are convenient operations to have
-easily at hand. Note that can be injected into the <a href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> table if you use
+easily at hand. Note that can be injected into the <a href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> table if you use
 <a href="../libraries/pl.stringx.html#import">stringx.import</a>, but a simple alias like <code>local stringx = require &apos;pl.stringx&apos;</code>
-is preferrable. This is the recommended practice when writing modules for
+is preferable. This is the recommended practice when writing modules for
 consumption by other people, since it is bad manners to change the global state
 of the rest of the system. Magic may be used for convenience, but there is always
 a price.</p>
@@ -179,8 +179,8 @@ <h3>String Templates</h3>
 
 <pre>
 <span class="keyword">local</span> Template = <span class="global">require</span> (<span class="string">'pl.text'</span>).Template
-t = Template(<span class="string">'${here} is the $answer'</span>)
-<span class="global">print</span>(t:substitute {here = <span class="string">'Lua'</span>, answer = <span class="string">'best'</span>})
+t = <span class="function-name">Template</span>(<span class="string">'${here} is the $answer'</span>)
+<span class="global">print</span>(t:<span class="function-name">substitute</span> {here = <span class="string">'Lua'</span>, answer = <span class="string">'best'</span>})
 ==&gt;
 Lua is the best
 </pre>
@@ -199,20 +199,20 @@ <h3>String Templates</h3>
 <span class="comment">-- testtemplate.lua
 </span><span class="keyword">local</span> Template = <span class="global">require</span> (<span class="string">'pl.text'</span>).Template
 
-t = Template <span class="string">[[
+t = <span class="function-name">Template</span> <span class="string">[[
     for i = 1,#$t do
         $body
     end
 ]]</span>
 
-body = Template <span class="string">[[
+body = <span class="function-name">Template</span> <span class="string">[[
 local row = $t[i]
 for j = 1,#row do
     fun(row[j])
 end
 ]]</span>
 
-<span class="global">print</span>(t:indent_substitute {body=body,t=<span class="string">'tbl'</span>})
+<span class="global">print</span>(t:<span class="function-name">indent_substitute</span> {body=body,t=<span class="string">'tbl'</span>})
 </pre>
 
 <p>And the output is:</p>
@@ -222,7 +222,7 @@ <h3>String Templates</h3>
 <span class="keyword">for</span> i = <span class="number">1</span>,#tbl <span class="keyword">do</span>
     <span class="keyword">local</span> row = tbl[i]
     <span class="keyword">for</span> j = <span class="number">1</span>,#row <span class="keyword">do</span>
-        fun(row[j])
+        <span class="function-name">fun</span>(row[j])
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 </pre>
@@ -239,16 +239,16 @@ <h3>String Templates</h3>
 for indenting multiline strings.</p>
 
 <p>New in Penlight with the 0.9 series is <code>text.format_operator</code>. Calling this
-enables Python-style string formating using the modulo operator <code>%</code>:</p>
+enables Python-style string formatting using the modulo operator <code>%</code>:</p>
 
 
 <pre>
-&gt; text.format_operator()
+&gt; text.<span class="function-name">format_operator</span>()
 &gt; = <span class="string">'%s[%d]'</span> % {<span class="string">'dog'</span>,<span class="number">1</span>}
 dog[<span class="number">1</span>]
 </pre>
 
-<p>So in its simplest form it saves the typing involved with <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.format">string.format</a>; it
+<p>So in its simplest form it saves the typing involved with <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.format">string.format</a>; it
 will also expand <code>$</code> variables using named fields:</p>
 
 
@@ -269,7 +269,7 @@ <h3>Another Style of Template</h3>
 are only two rules:</p>
 
 <ul>
-    <li>Lines begining with <code>#</code> are Lua</li>
+    <li>Lines beginning with <code>#</code> are Lua</li>
     <li>Otherwise, anything inside <code>$()</code> is a Lua expression.</li>
 </ul>
 
@@ -279,7 +279,7 @@ <h3>Another Style of Template</h3>
 <pre>
 &lt;ul&gt;
 # <span class="keyword">for</span> i,val <span class="keyword">in</span> <span class="global">ipairs</span>(T) <span class="keyword">do</span>
-&lt;li&gt;$(i) = $(val:upper())&lt;/li&gt;
+&lt;li&gt;$(i) = $(val:<span class="function-name">upper</span>())&lt;/li&gt;
 # <span class="keyword">end</span>
 &lt;/ul&gt;
 </pre>
@@ -293,7 +293,7 @@ <h3>Another Style of Template</h3>
   <span class="global">ipairs</span> = <span class="global">ipairs</span>,
   T = {<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'three'</span>}
 }
-res = template.substitute(tmpl, my_env)
+res = template.<span class="function-name">substitute</span>(tmpl, my_env)
 </pre>
 
 <p>and we get</p>
@@ -349,7 +349,7 @@ <h3>Another Style of Template</h3>
 }
 ]]</span>
 
-<span class="global">print</span>(subst(templ,{
+<span class="global">print</span>(<span class="function-name">subst</span>(templ,{
     _escape = <span class="string">'&gt;'</span>,
     <span class="global">ipairs</span> = <span class="global">ipairs</span>,
     mod = {
@@ -369,10 +369,10 @@ <h3>File-style I/O on Strings</h3>
 
 
 <pre>
-&gt; f = stringio.open <span class="string">'first line\n10 20 30\n'</span>
-&gt; = f:read()
+&gt; f = stringio.<span class="function-name">open</span> <span class="string">'first line\n10 20 30\n'</span>
+&gt; = f:<span class="function-name">read</span>()
 first line
-&gt; = f:read(<span class="string">'*n'</span>,<span class="string">'*n'</span>,<span class="string">'*n'</span>)
+&gt; = f:<span class="function-name">read</span>(<span class="string">'*n'</span>,<span class="string">'*n'</span>,<span class="string">'*n'</span>)
 <span class="number">10</span>    <span class="number">20</span>    <span class="number">30</span>
 </pre>
 
@@ -382,7 +382,7 @@ <h3>File-style I/O on Strings</h3>
 string.</p>
 
 <p><a href="../libraries/pl.stringio.html#create">stringio.create</a> creates a writeable file-like object. You then use <code>write</code> to
-this stream, and finally extract the builded string using <code>value</code>.  This 'string
+this stream, and finally extract the built string using <code>value</code>.  This 'string
 builder' pattern is useful for efficiently creating large strings.</p>
 
 
@@ -390,7 +390,7 @@ <h3>File-style I/O on Strings</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/manual/04-paths.md.html b/docs/manual/04-paths.md.html
index 070a3ea0..03295a9d 100644
--- a/docs/manual/04-paths.md.html
+++ b/docs/manual/04-paths.md.html
@@ -139,25 +139,25 @@ <h3>Working with Paths</h3>
 
 <pre>
 &gt; p = <span class="string">'c:\\bonzo\\DOG.txt'</span>
-&gt; = path.normcase (p)  <span class="comment">---&gt; only makes sense on Windows
+&gt; = path.<span class="function-name">normcase</span> (p)  <span class="comment">---&gt; only makes sense on Windows
 </span>c:\bonzo\dog.txt
-&gt; = path.splitext (p)
+&gt; = path.<span class="function-name">splitext</span> (p)
 c:\bonzo\DOG    .txt
-&gt; = path.extension (p)
+&gt; = path.<span class="function-name">extension</span> (p)
 .txt
-&gt; = path.basename (p)
+&gt; = path.<span class="function-name">basename</span> (p)
 DOG.txt
-&gt; = path.exists(p)
+&gt; = path.<span class="function-name">exists</span>(p)
 <span class="keyword">false</span>
-&gt; = path.join (<span class="string">'fred'</span>,<span class="string">'alice.txt'</span>)
+&gt; = path.<span class="function-name">join</span> (<span class="string">'fred'</span>,<span class="string">'alice.txt'</span>)
 fred\alice.txt
-&gt; = path.exists <span class="string">'pretty.lua'</span>
+&gt; = path.<span class="function-name">exists</span> <span class="string">'pretty.lua'</span>
 <span class="keyword">true</span>
-&gt; = path.getsize <span class="string">'pretty.lua'</span>
+&gt; = path.<span class="function-name">getsize</span> <span class="string">'pretty.lua'</span>
 <span class="number">2125</span>
-&gt; = path.isfile <span class="string">'pretty.lua'</span>
+&gt; = path.<span class="function-name">isfile</span> <span class="string">'pretty.lua'</span>
 <span class="keyword">true</span>
-&gt; = path.isdir <span class="string">'pretty.lua'</span>
+&gt; = path.<span class="function-name">isdir</span> <span class="string">'pretty.lua'</span>
 <span class="keyword">false</span>
 </pre>
 
@@ -168,22 +168,22 @@ <h3>Working with Paths</h3>
 
 
 <pre>
-&gt; = path.expanduser <span class="string">'~/mydata.txt'</span>
+&gt; = path.<span class="function-name">expanduser</span> <span class="string">'~/mydata.txt'</span>
 <span class="string">'C:\Documents and Settings\SJDonova/mydata.txt'</span>
 
-&gt; = path.expanduser <span class="string">'~/mydata.txt'</span>
+&gt; = path.<span class="function-name">expanduser</span> <span class="string">'~/mydata.txt'</span>
 /home/sdonovan/mydata.txt
 </pre>
 
-<p>Under Windows, <a href="https://www.lua.org/manual/5.1/manual.html#pdf-os.tmpname">os.tmpname</a> returns a path which leads to your drive root full of
+<p>Under Windows, <a href="https://www.lua.org/manual/5.4/manual.html#pdf-os.tmpname">os.tmpname</a> returns a path which leads to your drive root full of
 temporary files. (And increasingly, you do not have access to this root folder.)
 This is corrected by <a href="../libraries/pl.path.html#tmpname">path.tmpname</a>, which uses the environment variable TMP:</p>
 
 
 <pre>
-&gt; <span class="global">os</span>.tmpname()  <span class="comment">-- not a good place to put temporary files!
+&gt; <span class="global">os</span>.<span class="function-name">tmpname</span>()  <span class="comment">-- not a good place to put temporary files!
 </span><span class="string">'\s25g.'</span>
-&gt; path.tmpname()
+&gt; path.<span class="function-name">tmpname</span>()
 <span class="string">'C:\DOCUME~1\SJDonova\LOCALS~1\Temp\s25g.1'</span>
 </pre>
 
@@ -191,17 +191,17 @@ <h3>Working with Paths</h3>
 of a particular Lua module.  So on my system, <code>package_path(&apos;pl.path&apos;)</code> returns
 'C:\Program Files\Lua\5.1\lualibs\pl\path.lua', and <code>package_path(&apos;ifs&apos;)</code> returns
 'C:\Program Files\Lua\5.1\clibs\lfs.dll'. It is implemented in terms of
-<a href="https://www.lua.org/manual/5.1/manual.html#pdf-package.searchpath">package.searchpath</a>, which is a new function in Lua 5.2 which has been
+<a href="https://www.lua.org/manual/5.4/manual.html#pdf-package.searchpath">package.searchpath</a>, which is a new function in Lua 5.2 which has been
 implemented for Lua 5.1 in Penlight.</p>
 
 <p><a name="File_Operations"></a></p>
 <h3>File Operations</h3>
 
 <p><a href="../libraries/pl.file.html#">pl.file</a> is a new module that provides more sensible names for common file
-operations. For instance, <a href="https://www.lua.org/manual/5.1/manual.html#pdf-file:read">file.read</a> and <a href="https://www.lua.org/manual/5.1/manual.html#pdf-file:write">file.write</a> are aliases for
+operations. For instance, <a href="https://www.lua.org/manual/5.4/manual.html#pdf-file:read">file.read</a> and <a href="https://www.lua.org/manual/5.4/manual.html#pdf-file:write">file.write</a> are aliases for
 <a href="../libraries/pl.utils.html#readfile">utils.readfile</a> and <a href="../libraries/pl.utils.html#writefile">utils.writefile</a>.</p>
 
-<p>Smaller files can be efficiently read and written in one operation. <a href="https://www.lua.org/manual/5.1/manual.html#pdf-file:read">file.read</a>
+<p>Smaller files can be efficiently read and written in one operation. <a href="https://www.lua.org/manual/5.4/manual.html#pdf-file:read">file.read</a>
 is passed a filename and returns the contents as a string, if successful; if not,
 then it returns <code>nil</code> and the actual error message. There is an optional boolean
 parameter if you want the file to be read in binary mode (this makes no
@@ -211,7 +211,7 @@ <h3>File Operations</h3>
 the file was not specified, but this can lead to nasty bugs; use <code>io.read &apos;*a&apos;</code>
 to grab all of standard input.</p>
 
-<p>Similarly, <a href="https://www.lua.org/manual/5.1/manual.html#pdf-file:write">file.write</a> takes a filename and a string which will be written to
+<p>Similarly, <a href="https://www.lua.org/manual/5.4/manual.html#pdf-file:write">file.write</a> takes a filename and a string which will be written to
 that file.</p>
 
 <p>For example, this little script converts a file into upper case:</p>
@@ -220,11 +220,11 @@ <h3>File Operations</h3>
 <pre>
 <span class="global">require</span> <span class="string">'pl'</span>
 <span class="global">assert</span>(#arg == <span class="number">2</span>, <span class="string">'supply two filenames'</span>)
-text = <span class="global">assert</span>(file.read(arg[<span class="number">1</span>]))
-<span class="global">assert</span>(file.write(arg[<span class="number">2</span>],text:upper()))
+text = <span class="global">assert</span>(file.<span class="function-name">read</span>(arg[<span class="number">1</span>]))
+<span class="global">assert</span>(file.<span class="function-name">write</span>(arg[<span class="number">2</span>],text:<span class="function-name">upper</span>()))
 </pre>
 
-<p>Copying files is suprisingly tricky. <a href="../libraries/pl.file.html#copy">file.copy</a> and <a href="../libraries/pl.file.html#move">file.move</a> attempt to use
+<p>Copying files is surprisingly tricky. <a href="../libraries/pl.file.html#copy">file.copy</a> and <a href="../libraries/pl.file.html#move">file.move</a> attempt to use
 the best implementation possible. On Windows, they link to the API functions
 <code>CopyFile</code> and <code>MoveFile</code>, but only if the <code>alien</code> package is installed (this is
 true for Lua for Windows.) Otherwise, the system copy command is used. This can
@@ -240,19 +240,19 @@ <h3>Directory Operations</h3>
 functions in the Python <code>fnmatch</code> module. <code>getdirectories</code> will return all
 directories contained in a directory, and <code>getfiles</code> will return all files in a
 directory which match a shell pattern. These functions return the files as a
-table, unlike <a href="http://stevedonovan.github.io/lua-stdlibs/modules/lfs.html#dir">lfs.dir</a> which returns an iterator.)</p>
+table, unlike <a href="http://stevedonovan.github.io/lua-stdlibs/lfs.html#dir">lfs.dir</a> which returns an iterator.)</p>
 
 <p><a href="../libraries/pl.dir.html#makepath">dir.makepath</a> can create a full path, creating subdirectories as necessary;
 <code>rmtree</code> is the Nuclear Option of file deleting functions, since it will
-recursively clear out and delete all directories found begining at a path (there
+recursively clear out and delete all directories found beginning at a path (there
 is a similar function with this name in the Python <code>shutils</code> module.)</p>
 
 
 <pre>
-&gt; = dir.makepath <span class="string">'t\\temp\\bonzo'</span>
-&gt; = path.isdir <span class="string">'t\\temp\\bonzo'</span>
+&gt; = dir.<span class="function-name">makepath</span> <span class="string">'t\\temp\\bonzo'</span>
+&gt; = path.<span class="function-name">isdir</span> <span class="string">'t\\temp\\bonzo'</span>
 <span class="keyword">true</span>
-&gt; = dir.rmtree <span class="string">'t'</span>
+&gt; = dir.<span class="function-name">rmtree</span> <span class="string">'t'</span>
 </pre>
 
 <p><a href="../libraries/pl.dir.html#rmtree">dir.rmtree</a> depends on <a href="../libraries/pl.dir.html#walk">dir.walk</a>, which is a powerful tool for scanning a whole
@@ -262,12 +262,12 @@ <h3>Directory Operations</h3>
 <pre>
 <span class="comment">--- remove a whole directory tree.
 </span><span class="comment">-- @param path A directory path
-</span><span class="keyword">function</span> dir.rmtree(fullpath)
-    <span class="keyword">for</span> root,dirs,files <span class="keyword">in</span> dir.walk(fullpath) <span class="keyword">do</span>
+</span><span class="keyword">function</span> dir.<span class="function-name">rmtree</span>(fullpath)
+    <span class="keyword">for</span> root,dirs,files <span class="keyword">in</span> dir.<span class="function-name">walk</span>(fullpath) <span class="keyword">do</span>
         <span class="keyword">for</span> i,f <span class="keyword">in</span> <span class="global">ipairs</span>(files) <span class="keyword">do</span>
-            <span class="global">os</span>.remove(path.join(root,f))
+            <span class="global">os</span>.<span class="function-name">remove</span>(path.<span class="function-name">join</span>(root,f))
         <span class="keyword">end</span>
-        lfs.rmdir(root)
+        lfs.<span class="function-name">rmdir</span>(root)
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 </pre>
@@ -284,7 +284,7 @@ <h3>Directory Operations</h3>
 </span><span class="global">require</span> <span class="string">'pl'</span>
 p1 = <span class="string">[[d:\dev\lua\libs]]</span>
 p2 = <span class="string">[[D:\dev\lua\libs\..\tests]]</span>
-dir.clonetree(p1,p2,dir.copyfile)
+dir.<span class="function-name">clonetree</span>(p1,p2,dir.copyfile)
 </pre>
 
 <p>A more sophisticated version, which only copies files which have been modified:</p>
@@ -292,12 +292,12 @@ <h3>Directory Operations</h3>
 
 <pre>
 <span class="comment">-- p1 and p2 as before, or from arg[1] and arg[2]
-</span>dir.clonetree(p1,p2,<span class="keyword">function</span>(f1,f2)
+</span>dir.<span class="function-name">clonetree</span>(p1,p2,<span class="keyword">function</span>(f1,f2)
   <span class="keyword">local</span> res
-  <span class="keyword">local</span> t1,t2 = path.getmtime(f1),path.getmtime(f2)
+  <span class="keyword">local</span> t1,t2 = path.<span class="function-name">getmtime</span>(f1),path.<span class="function-name">getmtime</span>(f2)
   <span class="comment">-- f2 might not exist, so be careful about t2
 </span>  <span class="keyword">if</span> <span class="keyword">not</span> t2 <span class="keyword">or</span> t1 &gt; t2 <span class="keyword">then</span>
-    res = dir.copyfile(f1,f2)
+    res = dir.<span class="function-name">copyfile</span>(f1,f2)
   <span class="keyword">end</span>
   <span class="keyword">return</span> res <span class="comment">-- indicates successful operation
 </span><span class="keyword">end</span>)
@@ -313,7 +313,7 @@ <h3>Directory Operations</h3>
 
 <pre>
 &gt; p3 = <span class="string">[[d:\dev]]</span>
-&gt; = tablex.reduce(path.common_prefix,{p1,p2,p3})
+&gt; = tablex.<span class="function-name">reduce</span>(path.common_prefix,{p1,p2,p3})
 <span class="string">'d:\dev'</span>
 </pre>
 
@@ -322,7 +322,7 @@ <h3>Directory Operations</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/manual/05-dates.md.html b/docs/manual/05-dates.md.html
index c04b0365..946e08c3 100644
--- a/docs/manual/05-dates.md.html
+++ b/docs/manual/05-dates.md.html
@@ -129,22 +129,22 @@ <h3>Creating and Displaying Dates</h3>
 
 <p>The <a href="../classes/pl.Date.html#">Date</a> class provides a simplified way to work with <a href="http://www.lua.org/pil/22.1.html">date and
 time</a> in Lua; it leans heavily on the functions
-<a href="https://www.lua.org/manual/5.1/manual.html#pdf-os.date">os.date</a> and <a href="https://www.lua.org/manual/5.1/manual.html#pdf-os.time">os.time</a>.</p>
+<a href="https://www.lua.org/manual/5.4/manual.html#pdf-os.date">os.date</a> and <a href="https://www.lua.org/manual/5.4/manual.html#pdf-os.time">os.time</a>.</p>
 
-<p>A <a href="../classes/pl.Date.html#">Date</a> object can be constructed from a table, just like with <a href="https://www.lua.org/manual/5.1/manual.html#pdf-os.time">os.time</a>.
+<p>A <a href="../classes/pl.Date.html#">Date</a> object can be constructed from a table, just like with <a href="https://www.lua.org/manual/5.4/manual.html#pdf-os.time">os.time</a>.
 Methods are provided to get and set the various parts of the date.</p>
 
 
 <pre>
-&gt; d = Date {year = <span class="number">2011</span>, month = <span class="number">3</span>, day = <span class="number">2</span> }
+&gt; d = <span class="function-name">Date</span> {year = <span class="number">2011</span>, month = <span class="number">3</span>, day = <span class="number">2</span> }
 &gt; = d
 <span class="number">2011</span>-<span class="number">03</span>-<span class="number">02</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = d:month(),d:year(),d:day()
+&gt; = d:<span class="function-name">month</span>(),d:<span class="function-name">year</span>(),d:<span class="function-name">day</span>()
 <span class="number">3</span>    <span class="number">2011</span>    <span class="number">2</span>
-&gt; d:month(<span class="number">4</span>)
+&gt; d:<span class="function-name">month</span>(<span class="number">4</span>)
 &gt; = d
 <span class="number">2011</span>-<span class="number">04</span>-<span class="number">02</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; d:add {day=<span class="number">1</span>}
+&gt; d:<span class="function-name">add</span> {day=<span class="number">1</span>}
 &gt; = d
 <span class="number">2011</span>-<span class="number">04</span>-<span class="number">03</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
 </pre>
@@ -153,11 +153,11 @@ <h3>Creating and Displaying Dates</h3>
 
 
 <pre>
-&gt; = d:weekday_name()
+&gt; = d:<span class="function-name">weekday_name</span>()
 Sun
-&gt; = d:last_day()
+&gt; = d:<span class="function-name">last_day</span>()
 <span class="number">2011</span>-<span class="number">04</span>-<span class="number">30</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = d:month_name(<span class="keyword">true</span>)
+&gt; = d:<span class="function-name">month_name</span>(<span class="keyword">true</span>)
 April
 </pre>
 
@@ -166,25 +166,25 @@ <h3>Creating and Displaying Dates</h3>
 
 
 <pre>
-&gt; iso = Date.Format <span class="string">'yyyy-mm-dd'</span>
-&gt; d = iso:parse <span class="string">'2010-04-10'</span>
-&gt; amer = Date.Format <span class="string">'mm/dd/yyyy'</span>
+&gt; iso = Date.<span class="function-name">Format</span> <span class="string">'yyyy-mm-dd'</span>
+&gt; d = iso:<span class="function-name">parse</span> <span class="string">'2010-04-10'</span>
+&gt; amer = Date.<span class="function-name">Format</span> <span class="string">'mm/dd/yyyy'</span>
 &gt; = amer:<span class="global">tostring</span>(d)
 <span class="number">04</span>/<span class="number">10</span>/<span class="number">2010</span>
 </pre>
 
-<p>With the 0.9.7 relase, the <a href="../classes/pl.Date.html#">Date</a> constructor has become more flexible. You may
+<p>With the 0.9.7 release, the <a href="../classes/pl.Date.html#">Date</a> constructor has become more flexible. You may
 omit any of the 'year', 'month' or 'day' fields:</p>
 
 
 <pre>
-&gt; = Date { year = <span class="number">2008</span> }
+&gt; = <span class="function-name">Date</span> { year = <span class="number">2008</span> }
 <span class="number">2008</span>-<span class="number">01</span>-<span class="number">01</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = Date { month = <span class="number">3</span> }
+&gt; = <span class="function-name">Date</span> { month = <span class="number">3</span> }
 <span class="number">2011</span>-<span class="number">03</span>-<span class="number">01</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = Date { day = <span class="number">20</span> }
+&gt; = <span class="function-name">Date</span> { day = <span class="number">20</span> }
 <span class="number">2011</span>-<span class="number">10</span>-<span class="number">20</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = Date { hour = <span class="number">14</span>, min = <span class="number">30</span> }
+&gt; = <span class="function-name">Date</span> { hour = <span class="number">14</span>, min = <span class="number">30</span> }
 <span class="number">2011</span>-<span class="number">10</span>-<span class="number">13</span> <span class="number">14</span>:<span class="number">30</span>:<span class="number">00</span>
 </pre>
 
@@ -195,8 +195,8 @@ <h3>Creating and Displaying Dates</h3>
 
 
 <pre>
-&gt; d = Date { day = <span class="number">03</span> }
-&gt; = d:hour(<span class="number">18</span>):min(<span class="number">30</span>)
+&gt; d = <span class="function-name">Date</span> { day = <span class="number">03</span> }
+&gt; = d:<span class="function-name">hour</span>(<span class="number">18</span>):<span class="function-name">min</span>(<span class="number">30</span>)
 <span class="number">2011</span>-<span class="number">10</span>-<span class="number">03</span> <span class="number">18</span>:<span class="number">30</span>:<span class="number">00</span>
 </pre>
 
@@ -204,9 +204,9 @@ <h3>Creating and Displaying Dates</h3>
 
 
 <pre>
-&gt; = Date(<span class="number">2011</span>,<span class="number">10</span>,<span class="number">3</span>)
+&gt; = <span class="function-name">Date</span>(<span class="number">2011</span>,<span class="number">10</span>,<span class="number">3</span>)
 <span class="number">2011</span>-<span class="number">10</span>-<span class="number">03</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = Date(<span class="number">2011</span>,<span class="number">10</span>,<span class="number">3</span>,<span class="number">18</span>,<span class="number">30</span>,<span class="number">23</span>)
+&gt; = <span class="function-name">Date</span>(<span class="number">2011</span>,<span class="number">10</span>,<span class="number">3</span>,<span class="number">18</span>,<span class="number">30</span>,<span class="number">23</span>)
 <span class="number">2011</span>-<span class="number">10</span>-<span class="number">03</span> <span class="number">18</span>:<span class="number">30</span>:<span class="number">23</span>
 </pre>
 
@@ -217,24 +217,24 @@ <h3>Creating and Displaying Dates</h3>
 
 
 <pre>
-&gt; df = Date.Format()
-&gt; = df:parse <span class="string">'5.30pm'</span>
+&gt; df = Date.<span class="function-name">Format</span>()
+&gt; = df:<span class="function-name">parse</span> <span class="string">'5.30pm'</span>
 <span class="number">2011</span>-<span class="number">10</span>-<span class="number">13</span> <span class="number">17</span>:<span class="number">30</span>:<span class="number">00</span>
-&gt; = df:parse <span class="string">'1730'</span>
+&gt; = df:<span class="function-name">parse</span> <span class="string">'1730'</span>
 <span class="keyword">nil</span>     day out of range: <span class="number">1730</span> is <span class="keyword">not</span> between <span class="number">1</span> <span class="keyword">and</span> <span class="number">31</span>
-&gt; = df:parse <span class="string">'17.30'</span>
+&gt; = df:<span class="function-name">parse</span> <span class="string">'17.30'</span>
 <span class="number">2011</span>-<span class="number">10</span>-<span class="number">13</span> <span class="number">17</span>:<span class="number">30</span>:<span class="number">00</span>
-&gt; = df:parse <span class="string">'mar'</span>
+&gt; = df:<span class="function-name">parse</span> <span class="string">'mar'</span>
 <span class="number">2011</span>-<span class="number">03</span>-<span class="number">01</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = df:parse <span class="string">'3 March'</span>
+&gt; = df:<span class="function-name">parse</span> <span class="string">'3 March'</span>
 <span class="number">2011</span>-<span class="number">03</span>-<span class="number">03</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = df:parse <span class="string">'15 March'</span>
+&gt; = df:<span class="function-name">parse</span> <span class="string">'15 March'</span>
 <span class="number">2011</span>-<span class="number">03</span>-<span class="number">15</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = df:parse <span class="string">'15 March 2008'</span>
+&gt; = df:<span class="function-name">parse</span> <span class="string">'15 March 2008'</span>
 <span class="number">2008</span>-<span class="number">03</span>-<span class="number">15</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
-&gt; = df:parse <span class="string">'15 March 2008 1.30pm'</span>
+&gt; = df:<span class="function-name">parse</span> <span class="string">'15 March 2008 1.30pm'</span>
 <span class="number">2008</span>-<span class="number">03</span>-<span class="number">15</span> <span class="number">13</span>:<span class="number">30</span>:<span class="number">00</span>
-&gt; = df:parse <span class="string">'2008-10-03 15:30:23'</span>
+&gt; = df:<span class="function-name">parse</span> <span class="string">'2008-10-03 15:30:23'</span>
 <span class="number">2008</span>-<span class="number">10</span>-<span class="number">03</span> <span class="number">15</span>:<span class="number">30</span>:<span class="number">23</span>
 </pre>
 
@@ -243,7 +243,7 @@ <h3>Creating and Displaying Dates</h3>
 
 
 <pre>
-&gt; = df:parse <span class="string">'24/02/12'</span>
+&gt; = df:<span class="function-name">parse</span> <span class="string">'24/02/12'</span>
 <span class="number">2012</span>-<span class="number">02</span>-<span class="number">24</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
 </pre>
 
@@ -252,8 +252,8 @@ <h3>Creating and Displaying Dates</h3>
 
 
 <pre>
-&gt; df:US_order(<span class="keyword">true</span>)
-&gt; = df:parse <span class="string">'9/11/01'</span>
+&gt; df:<span class="function-name">US_order</span>(<span class="keyword">true</span>)
+&gt; = df:<span class="function-name">parse</span> <span class="string">'9/11/01'</span>
 <span class="number">2001</span>-<span class="number">11</span>-<span class="number">09</span> <span class="number">12</span>:<span class="number">00</span>:<span class="number">00</span>
 </pre>
 
@@ -262,7 +262,7 @@ <h3>Creating and Displaying Dates</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/manual/06-data.md.html b/docs/manual/06-data.md.html
index 585e23e8..62c775f4 100644
--- a/docs/manual/06-data.md.html
+++ b/docs/manual/06-data.md.html
@@ -151,9 +151,9 @@ <h3>Reading Data Files</h3>
 <pre>
 <span class="comment">-- property file parsing with Lua string patterns
 </span>props = []
-<span class="keyword">for</span> line <span class="keyword">in</span> <span class="global">io</span>.lines() <span class="keyword">do</span>
-    <span class="keyword">if</span> line:find(<span class="string">'#'</span>,<span class="number">1</span>,<span class="keyword">true</span>) ~= <span class="number">1</span> <span class="keyword">and</span> <span class="keyword">not</span> line:find(<span class="string">'^%s*$'</span>) <span class="keyword">then</span>
-        <span class="keyword">local</span> var,value = line:match(<span class="string">'([^=]+)=(.*)'</span>)
+<span class="keyword">for</span> line <span class="keyword">in</span> <span class="global">io</span>.<span class="function-name">lines</span>() <span class="keyword">do</span>
+    <span class="keyword">if</span> line:<span class="function-name">find</span>(<span class="string">'#'</span>,<span class="number">1</span>,<span class="keyword">true</span>) ~= <span class="number">1</span> <span class="keyword">and</span> <span class="keyword">not</span> line:<span class="function-name">find</span>(<span class="string">'^%s*$'</span>) <span class="keyword">then</span>
+        <span class="keyword">local</span> var,value = line:<span class="function-name">match</span>(<span class="string">'([^=]+)=(.*)'</span>)
         props[var] = value
     <span class="keyword">end</span>
 <span class="keyword">end</span>
@@ -170,11 +170,11 @@ <h3>Reading Data Files</h3>
 <pre>
 <span class="comment">-- property file parsing with extended string functions
 </span><span class="global">require</span> <span class="string">'pl'</span>
-stringx.import()
+stringx.<span class="function-name">import</span>()
 props = []
-<span class="keyword">for</span> line <span class="keyword">in</span> <span class="global">io</span>.lines() <span class="keyword">do</span>
-    <span class="keyword">if</span> <span class="keyword">not</span> line:startswith(<span class="string">'#'</span>) <span class="keyword">and</span> <span class="keyword">not</span> line:isspace() <span class="keyword">then</span>
-        <span class="keyword">local</span> var,value = line:splitv(<span class="string">'='</span>)
+<span class="keyword">for</span> line <span class="keyword">in</span> <span class="global">io</span>.<span class="function-name">lines</span>() <span class="keyword">do</span>
+    <span class="keyword">if</span> <span class="keyword">not</span> line:<span class="function-name">startswith</span>(<span class="string">'#'</span>) <span class="keyword">and</span> <span class="keyword">not</span> line:<span class="function-name">isspace</span>() <span class="keyword">then</span>
+        <span class="keyword">local</span> var,value = line:<span class="function-name">splitv</span>(<span class="string">'='</span>)
         props[var] = value
     <span class="keyword">end</span>
 <span class="keyword">end</span>
@@ -199,7 +199,7 @@ <h3>Reading Unstructured Text Data</h3>
 <span class="comment">-- countwords.lua
 </span><span class="global">require</span> <span class="string">'pl'</span>
 <span class="keyword">local</span> k = <span class="number">1</span>
-<span class="keyword">for</span> w <span class="keyword">in</span> input.words(<span class="global">io</span>.stdin) <span class="keyword">do</span>
+<span class="keyword">for</span> w <span class="keyword">in</span> input.<span class="function-name">words</span>(<span class="global">io</span>.stdin) <span class="keyword">do</span>
     k = k + <span class="number">1</span>
 <span class="keyword">end</span>
 <span class="global">print</span>(<span class="string">'count'</span>,k)
@@ -213,7 +213,7 @@ <h3>Reading Unstructured Text Data</h3>
 </span><span class="global">require</span> <span class="string">'pl'</span>
 <span class="keyword">local</span> k = <span class="number">1</span>
 <span class="keyword">local</span> sum = <span class="number">0</span>
-<span class="keyword">for</span> n <span class="keyword">in</span> input.numbers(<span class="global">io</span>.stdin) <span class="keyword">do</span>
+<span class="keyword">for</span> n <span class="keyword">in</span> input.<span class="function-name">numbers</span>(<span class="global">io</span>.stdin) <span class="keyword">do</span>
     sum = sum + n
     k = k + <span class="number">1</span>
 <span class="keyword">end</span>
@@ -228,7 +228,7 @@ <h3>Reading Unstructured Text Data</h3>
 <pre>
 <span class="comment">-- average2.lua
 </span><span class="global">require</span> <span class="string">'pl'</span>
-<span class="keyword">local</span> total,n = seq.sum(input.numbers())
+<span class="keyword">local</span> total,n = seq.<span class="function-name">sum</span>(input.<span class="function-name">numbers</span>())
 <span class="global">print</span>(<span class="string">'average'</span>,total/n)
 </pre>
 
@@ -240,7 +240,7 @@ <h3>Reading Unstructured Text Data</h3>
 <pre>
 <span class="comment">-- countwords2.lua
 </span><span class="global">require</span> <span class="string">'pl'</span>
-<span class="global">print</span>(<span class="string">'count'</span>,seq.count(input.words()))
+<span class="global">print</span>(<span class="string">'count'</span>,seq.<span class="function-name">count</span>(input.<span class="function-name">words</span>()))
 </pre>
 
 <p>A useful feature of a sequence generator like <code>numbers</code> is that it can read from
@@ -250,8 +250,8 @@ <h3>Reading Unstructured Text Data</h3>
 
 <pre>
 <span class="comment">-- sums.lua
-</span><span class="keyword">for</span> line <span class="keyword">in</span> <span class="global">io</span>.lines() <span class="keyword">do</span>
-    <span class="global">print</span>(seq.sum(input.numbers(line))
+</span><span class="keyword">for</span> line <span class="keyword">in</span> <span class="global">io</span>.<span class="function-name">lines</span>() <span class="keyword">do</span>
+    <span class="global">print</span>(seq.<span class="function-name">sum</span>(input.<span class="function-name">numbers</span>(line))
 <span class="keyword">end</span>
 </pre>
 
@@ -278,8 +278,8 @@ <h3>Reading Columnar Data</h3>
 <pre>
 <span class="comment">-- avg-x.lua
 </span><span class="global">require</span> <span class="string">'pl'</span>
-<span class="global">io</span>.read() <span class="comment">-- skip the header line
-</span><span class="keyword">local</span> sum,count = seq.sum(input.fields {<span class="number">3</span>})
+<span class="global">io</span>.<span class="function-name">read</span>() <span class="comment">-- skip the header line
+</span><span class="keyword">local</span> sum,count = seq.<span class="function-name">sum</span>(input.<span class="function-name">fields</span> {<span class="number">3</span>})
 <span class="global">print</span>(sum/count)
 </pre>
 
@@ -289,7 +289,7 @@ <h3>Reading Columnar Data</h3>
 
 
 <pre>
-<span class="keyword">for</span> id,mag,locX,locY,locZ <span class="keyword">in</span> input.fields (<span class="number">5</span>) <span class="keyword">do</span>
+<span class="keyword">for</span> id,mag,locX,locY,locZ <span class="keyword">in</span> input.<span class="function-name">fields</span> (<span class="number">5</span>) <span class="keyword">do</span>
 ....
 <span class="keyword">end</span>
 </pre>
@@ -308,7 +308,7 @@ <h3>Reading Columnar Data</h3>
 
 
 <pre>
-&gt; <span class="keyword">for</span> x,y <span class="keyword">in</span> input.fields(<span class="number">2</span>,<span class="string">' '</span>,<span class="string">'10 20\n30 40\n'</span>) <span class="keyword">do</span> <span class="global">print</span>(x,y) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> x,y <span class="keyword">in</span> input.<span class="function-name">fields</span>(<span class="number">2</span>,<span class="string">' '</span>,<span class="string">'10 20\n30 40\n'</span>) <span class="keyword">do</span> <span class="global">print</span>(x,y) <span class="keyword">end</span>
 <span class="number">10</span>      <span class="number">20</span>
 <span class="number">30</span>      <span class="number">40</span>
 </pre>
@@ -318,9 +318,9 @@ <h3>Reading Columnar Data</h3>
 
 
 <pre>
-&gt; <span class="keyword">for</span> x,y <span class="keyword">in</span> input.fields(<span class="number">2</span>,<span class="string">' '</span>,<span class="string">'10 20\n30 40x\n'</span>) <span class="keyword">do</span> <span class="global">print</span>(x,y) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> x,y <span class="keyword">in</span> input.<span class="function-name">fields</span>(<span class="number">2</span>,<span class="string">' '</span>,<span class="string">'10 20\n30 40x\n'</span>) <span class="keyword">do</span> <span class="global">print</span>(x,y) <span class="keyword">end</span>
 <span class="number">10</span>      <span class="number">20</span>
-line <span class="number">2</span>: cannot convert <span class="string">'40x'</span> to number
+line <span class="number">2</span>: cannot <span class="function-name">convert</span> <span class="string">'40x'</span> to number
 </pre>
 
 <p>This behaviour of <a href="../libraries/pl.input.html#fields">input.fields</a> is appropriate for a script which you want to
@@ -349,8 +349,8 @@ <h3>Reading Columnar Data</h3>
 
 
 <pre>
-&gt; t = data.read <span class="string">'test.txt'</span>
-&gt; pretty.dump(t)
+&gt; t = data.<span class="function-name">read</span> <span class="string">'test.txt'</span>
+&gt; pretty.<span class="function-name">dump</span>(t)
 {{<span class="number">10</span>,<span class="number">20</span>},{<span class="number">2</span>,<span class="number">5</span>},{<span class="number">40</span>,<span class="number">50</span>},fieldnames={<span class="string">'x'</span>,<span class="string">'y'</span>},delim=<span class="string">','</span>}
 </pre>
 
@@ -361,12 +361,12 @@ <h3>Reading Columnar Data</h3>
 <pre>
 <span class="comment">-- testdata.lua
 </span><span class="global">require</span> <span class="string">'pl'</span>
-d = data.read(<span class="string">'fev.txt'</span>)
+d = data.<span class="function-name">read</span>(<span class="string">'fev.txt'</span>)
 <span class="keyword">for</span> _,name <span class="keyword">in</span> <span class="global">ipairs</span>(d.fieldnames) <span class="keyword">do</span>
-    <span class="keyword">local</span> col = d:column_by_name(name)
+    <span class="keyword">local</span> col = d:<span class="function-name">column_by_name</span>(name)
     <span class="keyword">if</span> <span class="global">type</span>(col[<span class="number">1</span>]) == <span class="string">'number'</span> <span class="keyword">then</span>
-        <span class="keyword">local</span> total,n = seq.sum(col)
-        utils.printf(<span class="string">"Average for %s is %f\n"</span>,name,total/n)
+        <span class="keyword">local</span> total,n = seq.<span class="function-name">sum</span>(col)
+        utils.<span class="function-name">printf</span>(<span class="string">"Average for %s is %f\n"</span>,name,total/n)
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 </pre>
@@ -386,7 +386,7 @@ <h3>Reading Columnar Data</h3>
 <pre>
 <span class="comment">-- queries on tabular data
 </span><span class="global">require</span> <span class="string">'pl'</span>
-<span class="keyword">local</span> d = data.read(<span class="string">'xyz.txt'</span>)
+<span class="keyword">local</span> d = data.<span class="function-name">read</span>(<span class="string">'xyz.txt'</span>)
 <span class="keyword">local</span> q = d:<span class="global">select</span>(<span class="string">'x,y,z where x &gt; 3 and z &lt; 2 sort by y'</span>)
 <span class="keyword">for</span> x,y,z <span class="keyword">in</span> q <span class="keyword">do</span>
     <span class="global">print</span>(x,y,z)
@@ -438,14 +438,14 @@ <h3>Reading Columnar Data</h3>
 <pre>
 names = {[<span class="number">1501</span>]=<span class="string">'don'</span>,[<span class="number">1433</span>]=<span class="string">'dilbert'</span>}
 keepcols = {<span class="string">'Employee_ID'</span>,<span class="string">'Hours_Booked'</span>}
-t:write_row (outf,{<span class="string">'Employee'</span>,<span class="string">'Hours_Booked'</span>})
-q = t:select_row {
+t:<span class="function-name">write_row</span> (outf,{<span class="string">'Employee'</span>,<span class="string">'Hours_Booked'</span>})
+q = t:<span class="function-name">select_row</span> {
     fields=keepcols,
     where=<span class="keyword">function</span>(row) <span class="keyword">return</span> row[<span class="number">1</span>]==<span class="string">'engineering'</span> <span class="keyword">end</span>
 }
 <span class="keyword">for</span> row <span class="keyword">in</span> q <span class="keyword">do</span>
     row[<span class="number">1</span>] = names[row[<span class="number">1</span>]]
-    t:write_row(outf,row)
+    t:<span class="function-name">write_row</span>(outf,row)
 <span class="keyword">end</span>
 </pre>
 
@@ -477,11 +477,11 @@ <h3>Reading Columnar Data</h3>
 <pre>
 Date = <span class="global">require</span> <span class="string">'pl.Date'</span>
 
-<span class="keyword">function</span> date_convert (ds)
-    <span class="keyword">return</span> Date(<span class="global">tonumber</span>(ds))
+<span class="keyword">function</span> <span class="function-name">date_convert</span> (ds)
+    <span class="keyword">return</span> <span class="function-name">Date</span>(<span class="global">tonumber</span>(ds))
 <span class="keyword">end</span>
 
-d = data.read(f,{convert={[<span class="number">1</span>]=date_convert},last_field_collect=<span class="keyword">true</span>})
+d = data.<span class="function-name">read</span>(f,{convert={[<span class="number">1</span>]=date_convert},last_field_collect=<span class="keyword">true</span>})
 </pre>
 
 <p>This gives us a two-column dataset, where the first column contains <a href="../classes/pl.Date.html#">Date</a> objects
@@ -502,11 +502,11 @@ <h3>Reading Columnar Data</h3>
 
 <pre>
 <span class="global">require</span> <span class="string">'pl'</span>
-f = <span class="global">io</span>.popen <span class="string">'ps aux'</span>
-s = data.read (f,{last_field_collect=<span class="keyword">true</span>})
-f:close()
+f = <span class="global">io</span>.<span class="function-name">popen</span> <span class="string">'ps aux'</span>
+s = data.<span class="function-name">read</span> (f,{last_field_collect=<span class="keyword">true</span>})
+f:<span class="function-name">close</span>()
 <span class="global">print</span>(s.fieldnames)
-<span class="global">print</span>(s:column_by_name <span class="string">'USER'</span>)
+<span class="global">print</span>(s:<span class="function-name">column_by_name</span> <span class="string">'USER'</span>)
 qs = <span class="string">'COMMAND,_MEM where _MEM &gt; 5 and USER=="steve"'</span>
 <span class="keyword">for</span> name,mem <span class="keyword">in</span> s:<span class="global">select</span>(qs) <span class="keyword">do</span>
     <span class="global">print</span>(mem,name)
@@ -520,7 +520,7 @@ <h3>Reading Columnar Data</h3>
 <pre>
 <span class="comment">-- printxy.lua
 </span><span class="global">require</span> <span class="string">'pl'</span>
-data.filter <span class="string">'x,y where x &gt; 3'</span>
+data.<span class="function-name">filter</span> <span class="string">'x,y where x &gt; 3'</span>
 </pre>
 
 <p>It is common enough to have data files without headers of field names.
@@ -532,7 +532,7 @@ <h3>Reading Columnar Data</h3>
 
 <pre>
 #!/usr/bin/env lua
-<span class="global">require</span> <span class="string">'pl.data'</span>.filter(arg[<span class="number">1</span>])
+<span class="global">require</span> <span class="string">'pl.data'</span>.<span class="function-name">filter</span>(arg[<span class="number">1</span>])
 </pre>
 
 <p>And it can be used generally as a filter command to extract columns from data.
@@ -540,7 +540,7 @@ <h3>Reading Columnar Data</h3>
 
 
 <pre>
-$ lf <span class="string">'$1,$5/10'</span> &lt; test.dat
+$ <span class="function-name">lf</span> <span class="string">'$1,$5/10'</span> &lt; test.dat
 </pre>
 
 <p>(As with AWK, please note the single-quotes used in this command; this prevents
@@ -560,7 +560,7 @@ <h3>Reading Columnar Data</h3>
 
 
 <pre>
-v = data.read(<span class="string">'dat.txt'</span>):flatten()
+v = data.<span class="function-name">read</span>(<span class="string">'dat.txt'</span>):<span class="function-name">flatten</span>()
 </pre>
 
 <p>The data is also in exactly the right shape to be treated as matrices by
@@ -569,7 +569,7 @@ <h3>Reading Columnar Data</h3>
 
 <pre>
 &gt; matrix = <span class="global">require</span> <span class="string">'matrix'</span>
-&gt; m = matrix(data.read <span class="string">'mat.txt'</span>)
+&gt; m = <span class="function-name">matrix</span>(data.<span class="function-name">read</span> <span class="string">'mat.txt'</span>)
 &gt; = m
 <span class="number">1</span>       <span class="number">0.2</span>     <span class="number">0.3</span>
 <span class="number">0.2</span>     <span class="number">1</span>       <span class="number">0.1</span>
@@ -589,7 +589,7 @@ <h3>Reading Columnar Data</h3>
 
 
 <pre>
-&gt; lua -lpl -e <span class="string">"_DEBUG=true"</span> -e <span class="string">"data.filter 'x,y where x &gt; 4 sort by x'"</span> &lt; test.txt
+&gt; lua -lpl -<span class="function-name">e</span> <span class="string">"_DEBUG=true"</span> -<span class="function-name">e</span> <span class="string">"data.filter 'x,y where x &gt; 4 sort by x'"</span> &lt; test.txt
 <span class="keyword">return</span> <span class="keyword">function</span> (t)
         <span class="keyword">local</span> i = <span class="number">0</span>
         <span class="keyword">local</span> v
@@ -599,7 +599,7 @@ <h3>Reading Columnar Data</h3>
                     ls[#ls+<span class="number">1</span>] = v
             <span class="keyword">end</span>
         <span class="keyword">end</span>
-        <span class="global">table</span>.sort(ls,<span class="keyword">function</span>(v1,v2)
+        <span class="global">table</span>.<span class="function-name">sort</span>(ls,<span class="keyword">function</span>(v1,v2)
             <span class="keyword">return</span> v1[<span class="number">1</span>] &lt; v2[<span class="number">1</span>]
         <span class="keyword">end</span>)
         <span class="keyword">local</span> n = #ls
@@ -643,8 +643,8 @@ <h3>Reading Configuration Files</h3>
 </span><span class="keyword">local</span> config = <span class="global">require</span> <span class="string">'pl.config'</span>
 <span class="keyword">local</span> pretty= <span class="global">require</span> <span class="string">'pl.pretty'</span>
 
-<span class="keyword">local</span> t = config.read(arg[<span class="number">1</span>])
-<span class="global">print</span>(pretty.write(t))
+<span class="keyword">local</span> t = config.<span class="function-name">read</span>(arg[<span class="number">1</span>])
+<span class="global">print</span>(pretty.<span class="function-name">write</span>(t))
 </pre>
 
 <p>and the output of <code>lua readconfig.lua test.config</code> is:</p>
@@ -772,7 +772,7 @@ <h3>Reading Configuration Files</h3>
 
 
 <pre>
-t = config.read(<span class="string">'/etc/passwd'</span>,{list_delim=<span class="string">':'</span>})
+t = config.<span class="function-name">read</span>(<span class="string">'/etc/passwd'</span>,{list_delim=<span class="string">':'</span>})
 </pre>
 
 <p>This produces the following output on my system (only last two lines shown):</p>
@@ -807,7 +807,7 @@ <h3>Reading Configuration Files</h3>
 
 
 <pre>
-t = tablex.pairmap(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> v,v[<span class="number">1</span>] <span class="keyword">end</span>,t)
+t = tablex.<span class="function-name">pairmap</span>(<span class="keyword">function</span>(k,v) <span class="keyword">return</span> v,v[<span class="number">1</span>] <span class="keyword">end</span>,t)
 </pre>
 
 <p>and you get:</p>
@@ -838,20 +838,20 @@ <h3>Reading Configuration Files</h3>
 
 
 <pre>
-&gt; t = config.read(<span class="string">'/proc/meminfo'</span>,{keysep=<span class="string">':'</span>})
+&gt; t = config.<span class="function-name">read</span>(<span class="string">'/proc/meminfo'</span>,{keysep=<span class="string">':'</span>})
 &gt; = t.MemFree
 <span class="number">220140</span> kB
 </pre>
 
-<p>That result is a string, since <a href="https://www.lua.org/manual/5.1/manual.html#pdf-tonumber">tonumber</a> doesn't like it, but defining the
+<p>That result is a string, since <a href="https://www.lua.org/manual/5.4/manual.html#pdf-tonumber">tonumber</a> doesn't like it, but defining the
 <code>convert_numbers</code> option as `function(s) return tonumber((s:gsub(' kB$','')))
 end` will get the memory figures as actual numbers in the result. (The extra
-parentheses are necessary so that <a href="https://www.lua.org/manual/5.1/manual.html#pdf-tonumber">tonumber</a> only gets the first result from
+parentheses are necessary so that <a href="https://www.lua.org/manual/5.4/manual.html#pdf-tonumber">tonumber</a> only gets the first result from
 <code>gsub</code>). From `tests/test-config.lua':</p>
 
 
 <pre>
-testconfig(<span class="string">[[
+<span class="function-name">testconfig</span>(<span class="string">[[
 MemTotal:        1024748 kB
 MemFree:          220292 kB
 ]]</span>,
@@ -859,7 +859,7 @@ <h3>Reading Configuration Files</h3>
 {
  keysep = <span class="string">':'</span>,
  convert_numbers = <span class="keyword">function</span>(s)
-    s = s:gsub(<span class="string">' kB$'</span>,<span class="string">''</span>)
+    s = s:<span class="function-name">gsub</span>(<span class="string">' kB$'</span>,<span class="string">''</span>)
     <span class="keyword">return</span> <span class="global">tonumber</span>(s)
   <span class="keyword">end</span>
  }
@@ -888,21 +888,21 @@ <h3>Lexical Scanning</h3>
 
 <pre>
 &gt; lua -lpl
-Lua <span class="number">5.1</span>.<span class="number">4</span>  Copyright (C) <span class="number">1994</span>-<span class="number">2008</span> Lua.org, PUC-Rio
-&gt; tok = lexer.scan <span class="string">'alpha = sin(1.5)'</span>
-&gt; = tok()
+Lua <span class="number">5.1</span>.<span class="number">4</span>  <span class="function-name">Copyright</span> (C) <span class="number">1994</span>-<span class="number">2008</span> Lua.org, PUC-Rio
+&gt; tok = lexer.<span class="function-name">scan</span> <span class="string">'alpha = sin(1.5)'</span>
+&gt; = <span class="function-name">tok</span>()
 iden    alpha
-&gt; = tok()
+&gt; = <span class="function-name">tok</span>()
 =       =
-&gt; = tok()
+&gt; = <span class="function-name">tok</span>()
 iden    sin
-&gt; = tok()
+&gt; = <span class="function-name">tok</span>()
 (       (
-&gt; = tok()
+&gt; = <span class="function-name">tok</span>()
 number  <span class="number">1.5</span>
-&gt; = tok()
+&gt; = <span class="function-name">tok</span>()
 )       )
-&gt; = tok()
+&gt; = <span class="function-name">tok</span>()
 (<span class="keyword">nil</span>)
 </pre>
 
@@ -918,7 +918,7 @@ <h3>Lexical Scanning</h3>
 
 
 <pre>
-&gt; <span class="keyword">for</span> t,v <span class="keyword">in</span> lexer.lua <span class="string">'for i=1,n do'</span> <span class="keyword">do</span> <span class="global">print</span>(t,v) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> t,v <span class="keyword">in</span> lexer.<span class="function-name">lua</span> <span class="string">'for i=1,n do'</span> <span class="keyword">do</span> <span class="global">print</span>(t,v) <span class="keyword">end</span>
 keyword <span class="keyword">for</span>
 iden    i
 =       =
@@ -934,7 +934,7 @@ <h3>Lexical Scanning</h3>
 
 
 <pre>
-points
+<span class="function-name">points</span>
     (<span class="number">818344.1</span>,-<span class="number">20389.7</span>,-<span class="number">0.1</span>),(<span class="number">818337.9</span>,-<span class="number">20389.3</span>,-<span class="number">0.1</span>),(<span class="number">818332.5</span>,-<span class="number">20387.8</span>,-<span class="number">0.1</span>)
     ,(<span class="number">818327.4</span>,-<span class="number">20388</span>,-<span class="number">0.1</span>),(<span class="number">818322</span>,-<span class="number">20387.7</span>,-<span class="number">0.1</span>),(<span class="number">818316.3</span>,-<span class="number">20388.6</span>,-<span class="number">0.1</span>)
     ,(<span class="number">818309.7</span>,-<span class="number">20389.4</span>,-<span class="number">0.1</span>),(<span class="number">818303.5</span>,-<span class="number">20390.6</span>,-<span class="number">0.1</span>),(<span class="number">818295.8</span>,-<span class="number">20388.3</span>,-<span class="number">0.1</span>)
@@ -951,34 +951,34 @@ <h3>Lexical Scanning</h3>
 <span class="keyword">local</span> expecting = lexer.expecting
 <span class="keyword">local</span> append = <span class="global">table</span>.insert
 
-<span class="keyword">local</span> tok = lexer.scan(s)
+<span class="keyword">local</span> tok = lexer.<span class="function-name">scan</span>(s)
 
 <span class="keyword">local</span> points = {}
-<span class="keyword">local</span> t,v = tok() <span class="comment">-- should be 'iden','points'
+<span class="keyword">local</span> t,v = <span class="function-name">tok</span>() <span class="comment">-- should be 'iden','points'
 </span>
 <span class="keyword">while</span> t ~= <span class="string">';'</span> <span class="keyword">do</span>
     c = {}
-    expecting(tok,<span class="string">'('</span>)
-    c.x = expecting(tok,<span class="string">'number'</span>)
-    expecting(tok,<span class="string">','</span>)
-    c.y = expecting(tok,<span class="string">'number'</span>)
-    expecting(tok,<span class="string">','</span>)
-    c.z = expecting(tok,<span class="string">'number'</span>)
-    expecting(tok,<span class="string">')'</span>)
-    t,v = tok()  <span class="comment">-- either ',' or ';'
-</span>    append(points,c)
+    <span class="function-name">expecting</span>(tok,<span class="string">'('</span>)
+    c.x = <span class="function-name">expecting</span>(tok,<span class="string">'number'</span>)
+    <span class="function-name">expecting</span>(tok,<span class="string">','</span>)
+    c.y = <span class="function-name">expecting</span>(tok,<span class="string">'number'</span>)
+    <span class="function-name">expecting</span>(tok,<span class="string">','</span>)
+    c.z = <span class="function-name">expecting</span>(tok,<span class="string">'number'</span>)
+    <span class="function-name">expecting</span>(tok,<span class="string">')'</span>)
+    t,v = <span class="function-name">tok</span>()  <span class="comment">-- either ',' or ';'
+</span>    <span class="function-name">append</span>(points,c)
 <span class="keyword">end</span>
 </pre>
 
 <p>The <code>expecting</code> function grabs the next token and if the type doesn't match, it
 throws an error. (<a href="../libraries/pl.lexer.html#">pl.lexer</a>, unlike other PL libraries, raises errors if
-something goes wrong, so you should wrap your code in <a href="https://www.lua.org/manual/5.1/manual.html#pdf-pcall">pcall</a> to catch the error
+something goes wrong, so you should wrap your code in <a href="https://www.lua.org/manual/5.4/manual.html#pdf-pcall">pcall</a> to catch the error
 gracefully.)</p>
 
 <p>The scanners all have a second optional argument, which is a table which controls
 whether you want to exclude spaces and/or comments. The default for <a href="../libraries/pl.lexer.html#lua">lexer.lua</a>
 is <code>{space=true,comments=true}</code>.  There is a third optional argument which
-determines how string and number tokens are to be processsed.</p>
+determines how string and number tokens are to be processed.</p>
 
 <p>The ultimate highly-structured data is of course, program source. Here is a
 snippet from 'text-lexer.lua':</p>
@@ -997,12 +997,12 @@ <h3>Lexical Scanning</h3>
 end
 ]]</span>
 
-ls = List()
-<span class="keyword">for</span> tp,val <span class="keyword">in</span> lexer.lua(lines,{space=<span class="keyword">true</span>,comments=<span class="keyword">true</span>}) <span class="keyword">do</span>
+ls = <span class="function-name">List</span>()
+<span class="keyword">for</span> tp,val <span class="keyword">in</span> lexer.<span class="function-name">lua</span>(lines,{space=<span class="keyword">true</span>,comments=<span class="keyword">true</span>}) <span class="keyword">do</span>
     <span class="global">assert</span>(tp ~= <span class="string">'space'</span> <span class="keyword">and</span> tp ~= <span class="string">'comment'</span>)
-    <span class="keyword">if</span> tp == <span class="string">'keyword'</span> <span class="keyword">then</span> ls:append(val) <span class="keyword">end</span>
+    <span class="keyword">if</span> tp == <span class="string">'keyword'</span> <span class="keyword">then</span> ls:<span class="function-name">append</span>(val) <span class="keyword">end</span>
 <span class="keyword">end</span>
-test.asserteq(ls,List{<span class="string">'for'</span>,<span class="string">'in'</span>,<span class="string">'do'</span>,<span class="string">'if'</span>,<span class="string">'then'</span>,<span class="string">'else'</span>,<span class="string">'end'</span>,<span class="string">'end'</span>})
+test.<span class="function-name">asserteq</span>(ls,<span class="function-name">List</span>{<span class="string">'for'</span>,<span class="string">'in'</span>,<span class="string">'do'</span>,<span class="string">'if'</span>,<span class="string">'then'</span>,<span class="string">'else'</span>,<span class="string">'end'</span>,<span class="string">'end'</span>})
 </pre>
 
 <p>Here is a useful little utility that identifies all common global variables found
@@ -1013,16 +1013,16 @@ <h3>Lexical Scanning</h3>
 <span class="comment">-- testglobal.lua
 </span><span class="global">require</span> <span class="string">'pl'</span>
 
-<span class="keyword">local</span> txt,err = utils.readfile(arg[<span class="number">1</span>])
+<span class="keyword">local</span> txt,err = utils.<span class="function-name">readfile</span>(arg[<span class="number">1</span>])
 <span class="keyword">if</span> <span class="keyword">not</span> txt <span class="keyword">then</span> <span class="keyword">return</span> <span class="global">print</span>(err) <span class="keyword">end</span>
 
-<span class="keyword">local</span> globals = List()
-<span class="keyword">for</span> t,v <span class="keyword">in</span> lexer.lua(txt) <span class="keyword">do</span>
+<span class="keyword">local</span> globals = <span class="function-name">List</span>()
+<span class="keyword">for</span> t,v <span class="keyword">in</span> lexer.<span class="function-name">lua</span>(txt) <span class="keyword">do</span>
     <span class="keyword">if</span> t == <span class="string">'iden'</span> <span class="keyword">and</span> _G[v] <span class="keyword">then</span>
-        globals:append(v)
+        globals:<span class="function-name">append</span>(v)
     <span class="keyword">end</span>
 <span class="keyword">end</span>
-pretty.dump(seq.count_map(globals))
+pretty.<span class="function-name">dump</span>(seq.<span class="function-name">count_map</span>(globals))
 </pre>
 
 <p>Rather then dumping the whole list, with its duplicates, we pass it through
@@ -1072,10 +1072,10 @@ <h4>Parsing and Pretty-Printing</h4>
 
 
 <pre>
-&gt; d = xml.parse <span class="string">"&lt;nodes&gt;&lt;node id='1'&gt;alice&lt;/node&gt;&lt;/nodes&gt;"</span>
+&gt; d = xml.<span class="function-name">parse</span> <span class="string">"&lt;nodes&gt;&lt;node id='1'&gt;alice&lt;/node&gt;&lt;/nodes&gt;"</span>
 &gt; = d
 &lt;nodes&gt;&lt;node id=<span class="string">'1'</span>&gt;alice&lt;/node&gt;&lt;/nodes&gt;
-&gt; pretty.dump (d)
+&gt; pretty.<span class="function-name">dump</span> (d)
 {
   {
     <span class="string">"alice"</span>,
@@ -1128,7 +1128,7 @@ <h4>Parsing and Pretty-Printing</h4>
 
 
 <pre>
-&gt; a = xml.parse <span class="string">"&lt;frodo name='baggins' age='50' type='hobbit'/&gt;"</span>
+&gt; a = xml.<span class="function-name">parse</span> <span class="string">"&lt;frodo name='baggins' age='50' type='hobbit'/&gt;"</span>
 &gt; = xml.<span class="global">tostring</span>(a,<span class="string">''</span>,<span class="string">'  '</span>,<span class="string">'  '</span>)
 
 &lt;frodo
@@ -1155,14 +1155,14 @@ <h4>Parsing and Working with Configuration Files</h4>
     &lt;name&gt;bozo&lt;/name&gt;
 &lt;/config&gt;
 ]]</span>
-<span class="keyword">local</span> d,err = xml.parse(config)
+<span class="keyword">local</span> d,err = xml.<span class="function-name">parse</span>(config)
 
 <span class="keyword">local</span> t = {}
-<span class="keyword">for</span> item <span class="keyword">in</span> d:childtags() <span class="keyword">do</span>
+<span class="keyword">for</span> item <span class="keyword">in</span> d:<span class="function-name">childtags</span>() <span class="keyword">do</span>
     t[item.tag] = item[<span class="number">1</span>]
 <span class="keyword">end</span>
 
-pretty.dump(t)
+pretty.<span class="function-name">dump</span>(t)
 <span class="comment">---&gt;
 </span>{
   beta = <span class="string">"10"</span>,
@@ -1180,7 +1180,7 @@ <h4>Parsing and Working with Configuration Files</h4>
 
 
 <pre>
-d = xml.parse <span class="string">[[
+d = xml.<span class="function-name">parse</span> <span class="string">[[
 &lt;serviceproviders format="2.0"&gt;
 ...
 &lt;country code="za"&gt;
@@ -1240,15 +1240,15 @@ <h4>Parsing and Working with Configuration Files</h4>
 
 <pre>
 <span class="keyword">local</span> t = {}
-<span class="keyword">for</span> country <span class="keyword">in</span> d:childtags() <span class="keyword">do</span>
+<span class="keyword">for</span> country <span class="keyword">in</span> d:<span class="function-name">childtags</span>() <span class="keyword">do</span>
     <span class="keyword">local</span> providers = {}
     t[country.attr.code] = providers
-    <span class="keyword">for</span> provider <span class="keyword">in</span> country:childtags() <span class="keyword">do</span>
-        <span class="global">table</span>.insert(providers,provider:child_with_name(<span class="string">'name'</span>):get_text())
+    <span class="keyword">for</span> provider <span class="keyword">in</span> country:<span class="function-name">childtags</span>() <span class="keyword">do</span>
+        <span class="global">table</span>.<span class="function-name">insert</span>(providers,provider:<span class="function-name">child_with_name</span>(<span class="string">'name'</span>):<span class="function-name">get_text</span>())
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 
-pretty.dump(t)
+pretty.<span class="function-name">dump</span>(t)
 <span class="comment">--&gt;
 </span>{
   za = {
@@ -1270,10 +1270,10 @@ <h4>Generating XML with 'xmlification'</h4>
 
 
 <pre>
-&gt; nodes, node = xml.tags <span class="string">'nodes, node'</span>
-&gt; = node <span class="string">'alice'</span>
+&gt; nodes, node = xml.<span class="function-name">tags</span> <span class="string">'nodes, node'</span>
+&gt; = <span class="function-name">node</span> <span class="string">'alice'</span>
 &lt;node&gt;alice&lt;/node&gt;
-&gt; = nodes { node {id=<span class="string">'1'</span>,<span class="string">'alice'</span>}}
+&gt; = <span class="function-name">nodes</span> { <span class="function-name">node</span> {id=<span class="string">'1'</span>,<span class="string">'alice'</span>}}
 &lt;nodes&gt;&lt;node id=<span class="string">'1'</span>&gt;alice&lt;/node&gt;&lt;/nodes&gt;
 </pre>
 
@@ -1290,8 +1290,8 @@ <h4>Generating XML using Templates</h4>
 
 
 <pre>
-&gt; templ = xml.parse <span class="string">"&lt;node id='$id'&gt;$name&lt;/node&gt;"</span>
-&gt; = templ:subst {tag=<span class="string">'nodes'</span>, {id=<span class="number">1</span>,name=<span class="string">'alice'</span>},{id=<span class="number">2</span>,name=<span class="string">'john'</span>}}
+&gt; templ = xml.<span class="function-name">parse</span> <span class="string">"&lt;node id='$id'&gt;$name&lt;/node&gt;"</span>
+&gt; = templ:<span class="function-name">subst</span> {tag=<span class="string">'nodes'</span>, {id=<span class="number">1</span>,name=<span class="string">'alice'</span>},{id=<span class="number">2</span>,name=<span class="string">'john'</span>}}
 &lt;nodes&gt;&lt;node id=<span class="string">'1'</span>&gt;alice&lt;/node&gt;&lt;node id=<span class="string">'2'</span>&gt;john&lt;/node&gt;&lt;/nodes&gt;
 </pre>
 
@@ -1319,8 +1319,8 @@ <h4>Generating XML using Templates</h4>
 
 
 <pre>
-<span class="keyword">local</span> <span class="keyword">function</span> parse (str)
-    <span class="keyword">return</span> xml.parse(str,<span class="keyword">false</span>,<span class="keyword">true</span>)
+<span class="keyword">local</span> <span class="keyword">function</span> <span class="function-name">parse</span> (str)
+    <span class="keyword">return</span> xml.<span class="function-name">parse</span>(str,<span class="keyword">false</span>,<span class="keyword">true</span>)
 <span class="keyword">end</span>
 </pre>
 
@@ -1336,9 +1336,9 @@ <h4>Generating XML using Templates</h4>
 
 
 <pre>
-d = parse (T)
-c = d:filter(<span class="keyword">function</span>(s,kind,parent)
-    <span class="global">print</span>(stringx.strip(s),kind,parent <span class="keyword">and</span> parent.tag <span class="keyword">or</span> <span class="string">'?'</span>)
+d = <span class="function-name">parse</span> (T)
+c = d:<span class="function-name">filter</span>(<span class="keyword">function</span>(s,kind,parent)
+    <span class="global">print</span>(stringx.<span class="function-name">strip</span>(s),kind,parent <span class="keyword">and</span> parent.tag <span class="keyword">or</span> <span class="string">'?'</span>)
     <span class="keyword">if</span> kind == <span class="string">'*TEXT'</span> <span class="keyword">and</span> #parent &gt; <span class="number">1</span> <span class="keyword">then</span> <span class="keyword">return</span> <span class="keyword">nil</span> <span class="keyword">end</span>
     <span class="keyword">return</span> s
 <span class="keyword">end</span>)
@@ -1423,8 +1423,8 @@ <h4>Extracting Data using Templates</h4>
   &lt;/weather&gt;
 ]]</span>
 
-<span class="keyword">local</span> res, ret = google:match(t)
-pretty.dump(res)
+<span class="keyword">local</span> res, ret = google:<span class="function-name">match</span>(t)
+pretty.<span class="function-name">dump</span>(res)
 </pre>
 
 <p>And the output is:</p>
@@ -1600,14 +1600,14 @@ <h4>HTML Parsing</h4>
 
 
 <pre>
-doc = xml.parsehtml <span class="string">[[
+doc = xml.<span class="function-name">parsehtml</span> <span class="string">[[
 &lt;BODY&gt;
 Hello dolly&lt;br&gt;
 HTML is &lt;b&gt;slack&lt;/b&gt;&lt;br&gt;
 &lt;/BODY&gt;
 ]]</span>
 
-asserteq(xml.<span class="global">tostring</span>(doc),<span class="string">[[
+<span class="function-name">asserteq</span>(xml.<span class="global">tostring</span>(doc),<span class="string">[[
 &lt;body&gt;
 Hello dolly&lt;br/&gt;
 HTML is &lt;b&gt;slack&lt;/b&gt;&lt;br/&gt;&lt;/body&gt;]]</span>)
@@ -1626,7 +1626,7 @@ <h4>HTML Parsing</h4>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/manual/07-functional.md.html b/docs/manual/07-functional.md.html
index d4ca6555..d6d6eab6 100644
--- a/docs/manual/07-functional.md.html
+++ b/docs/manual/07-functional.md.html
@@ -131,10 +131,10 @@ <h3>Sequences</h3>
 <p>A Lua iterator (in its simplest form) is a function which can be repeatedly
 called to return a set of one or more values. The <code>for in</code> statement understands
 these iterators, and loops until the function returns <code>nil</code>. There are standard
-sequence adapters for tables in Lua (<a href="https://www.lua.org/manual/5.1/manual.html#pdf-ipairs">ipairs</a> and <a href="https://www.lua.org/manual/5.1/manual.html#pdf-pairs">pairs</a>), and <a href="https://www.lua.org/manual/5.1/manual.html#pdf-io.lines">io.lines</a>
+sequence adapters for tables in Lua (<a href="https://www.lua.org/manual/5.4/manual.html#pdf-ipairs">ipairs</a> and <a href="https://www.lua.org/manual/5.4/manual.html#pdf-pairs">pairs</a>), and <a href="https://www.lua.org/manual/5.4/manual.html#pdf-io.lines">io.lines</a>
 returns an iterator over all the lines in a file. In the Penlight libraries, such
 iterators are also called <em>sequences</em>.  A sequence of single values (say from
-<a href="https://www.lua.org/manual/5.1/manual.html#pdf-io.lines">io.lines</a>) is called <em>single-valued</em>, whereas the sequence defined by <a href="https://www.lua.org/manual/5.1/manual.html#pdf-pairs">pairs</a> is
+<a href="https://www.lua.org/manual/5.4/manual.html#pdf-io.lines">io.lines</a>) is called <em>single-valued</em>, whereas the sequence defined by <a href="https://www.lua.org/manual/5.4/manual.html#pdf-pairs">pairs</a> is
 <em>double-valued</em>.</p>
 
 <p><a href="../libraries/pl.seq.html#">pl.seq</a> provides a number of useful iterators, and some functions which operate
@@ -143,7 +143,7 @@ <h3>Sequences</h3>
 
 
 <pre>
-&gt; <span class="keyword">for</span> i <span class="keyword">in</span> seq.range(<span class="number">1</span>,<span class="number">4</span>) <span class="keyword">do</span> <span class="global">print</span>(i) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> i <span class="keyword">in</span> seq.<span class="function-name">range</span>(<span class="number">1</span>,<span class="number">4</span>) <span class="keyword">do</span> <span class="global">print</span>(i) <span class="keyword">end</span>
 <span class="number">1</span>
 <span class="number">2</span>
 <span class="number">3</span>
@@ -153,11 +153,11 @@ <h3>Sequences</h3>
 <p>But <a href="../libraries/pl.seq.html#range">range</a> is actually equivalent to Python's <code>xrange</code>, since it generates a
 sequence, not a list.  To get a list, use <code>seq.copy(seq.range(1,10))</code>, which
 takes any single-value sequence and makes a table from the result. <a href="../libraries/pl.seq.html#list">seq.list</a> is
-like <a href="https://www.lua.org/manual/5.1/manual.html#pdf-ipairs">ipairs</a> except that it does not give you the index, just the value.</p>
+like <a href="https://www.lua.org/manual/5.4/manual.html#pdf-ipairs">ipairs</a> except that it does not give you the index, just the value.</p>
 
 
 <pre>
-&gt; <span class="keyword">for</span> x <span class="keyword">in</span> seq.list {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>} <span class="keyword">do</span> <span class="global">print</span>(x) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> x <span class="keyword">in</span> seq.<span class="function-name">list</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>} <span class="keyword">do</span> <span class="global">print</span>(x) <span class="keyword">end</span>
 <span class="number">1</span>
 <span class="number">2</span>
 <span class="number">3</span>
@@ -165,22 +165,22 @@ <h3>Sequences</h3>
 
 <p><a href="../libraries/pl.seq.html#enum">enum</a> takes a sequence and turns it into a double-valued sequence consisting of
 a sequence number and the value, so <code>enum(list(ls))</code> is actually equivalent to
-<a href="https://www.lua.org/manual/5.1/manual.html#pdf-ipairs">ipairs</a>. A more interesting example prints out a file with line numbers:</p>
+<a href="https://www.lua.org/manual/5.4/manual.html#pdf-ipairs">ipairs</a>. A more interesting example prints out a file with line numbers:</p>
 
 
 <pre>
-<span class="keyword">for</span> i,v <span class="keyword">in</span> seq.enum(<span class="global">io</span>.lines(fname)) <span class="keyword">do</span> <span class="global">print</span>(i..<span class="string">' '</span>..v) <span class="keyword">end</span>
+<span class="keyword">for</span> i,v <span class="keyword">in</span> seq.<span class="function-name">enum</span>(<span class="global">io</span>.<span class="function-name">lines</span>(fname)) <span class="keyword">do</span> <span class="global">print</span>(i..<span class="string">' '</span>..v) <span class="keyword">end</span>
 </pre>
 
 <p>Sequences can be <em>combined</em>, either by 'zipping' them or by concatenating them.</p>
 
 
 <pre>
-&gt; <span class="keyword">for</span> x,y <span class="keyword">in</span> seq.zip(l1,l2) <span class="keyword">do</span> <span class="global">print</span>(x,y) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> x,y <span class="keyword">in</span> seq.<span class="function-name">zip</span>(l1,l2) <span class="keyword">do</span> <span class="global">print</span>(x,y) <span class="keyword">end</span>
 <span class="number">10</span>      <span class="number">1</span>
 <span class="number">20</span>      <span class="number">2</span>
 <span class="number">30</span>      <span class="number">3</span>
-&gt; <span class="keyword">for</span> x <span class="keyword">in</span> seq.splice(l1,l2) <span class="keyword">do</span> <span class="global">print</span>(x) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> x <span class="keyword">in</span> seq.<span class="function-name">splice</span>(l1,l2) <span class="keyword">do</span> <span class="global">print</span>(x) <span class="keyword">end</span>
 <span class="number">10</span>
 <span class="number">20</span>
 <span class="number">30</span>
@@ -190,14 +190,14 @@ <h3>Sequences</h3>
 </pre>
 
 <p><a href="../libraries/pl.seq.html#printall">seq.printall</a> is useful for printing out single-valued sequences, and provides
-some finer control over formating, such as a delimiter, the number of fields per
+some finer control over formatting, such as a delimiter, the number of fields per
 line, and a format string to use (@see string.format)</p>
 
 
 <pre>
-&gt; seq.printall(seq.random(<span class="number">10</span>))
+&gt; seq.<span class="function-name">printall</span>(seq.<span class="function-name">random</span>(<span class="number">10</span>))
 <span class="number">0.0012512588885159</span> <span class="number">0.56358531449324</span> <span class="number">0.19330423902097</span> ....
-&gt; seq.printall(seq.random(<span class="number">10</span>), <span class="string">','</span>, <span class="number">4</span>, <span class="string">'%4.2f'</span>)
+&gt; seq.<span class="function-name">printall</span>(seq.<span class="function-name">random</span>(<span class="number">10</span>), <span class="string">','</span>, <span class="number">4</span>, <span class="string">'%4.2f'</span>)
 <span class="number">0.17</span>,<span class="number">0.86</span>,<span class="number">0.71</span>,<span class="number">0.51</span>
 <span class="number">0.30</span>,<span class="number">0.01</span>,<span class="number">0.09</span>,<span class="number">0.36</span>
 <span class="number">0.15</span>,<span class="number">0.17</span>,
@@ -207,9 +207,9 @@ <h3>Sequences</h3>
 
 
 <pre>
-&gt; seq.printall(seq.map(<span class="global">string</span>.upper, {<span class="string">'one'</span>,<span class="string">'two'</span>}))
+&gt; seq.<span class="function-name">printall</span>(seq.<span class="function-name">map</span>(<span class="global">string</span>.upper, {<span class="string">'one'</span>,<span class="string">'two'</span>}))
 ONE TWO
-&gt; seq.printall(seq.map(<span class="string">'+'</span>, {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}, <span class="number">1</span>))
+&gt; seq.<span class="function-name">printall</span>(seq.<span class="function-name">map</span>(<span class="string">'+'</span>, {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}, <span class="number">1</span>))
 <span class="number">11</span> <span class="number">21</span> <span class="number">31</span>
 </pre>
 
@@ -219,7 +219,7 @@ <h3>Sequences</h3>
 
 
 <pre>
-<span class="keyword">for</span> l <span class="keyword">in</span> seq.filter(<span class="global">io</span>.lines(file), stringx.isdigit) <span class="keyword">do</span> <span class="global">print</span>(l) <span class="keyword">end</span>
+<span class="keyword">for</span> l <span class="keyword">in</span> seq.<span class="function-name">filter</span>(<span class="global">io</span>.<span class="function-name">lines</span>(file), stringx.isdigit) <span class="keyword">do</span> <span class="global">print</span>(l) <span class="keyword">end</span>
 </pre>
 
 <p>The following returns a table consisting of all the positive values in the
@@ -227,15 +227,15 @@ <h3>Sequences</h3>
 
 
 <pre>
-ls = seq.copy(seq.filter(ls, <span class="string">'&gt;'</span>, <span class="number">0</span>))
+ls = seq.<span class="function-name">copy</span>(seq.<span class="function-name">filter</span>(ls, <span class="string">'&gt;'</span>, <span class="number">0</span>))
 </pre>
 
-<p>We're already encounted <a href="../libraries/pl.seq.html#sum">seq.sum</a> when discussing <a href="../libraries/pl.input.html#numbers">input.numbers</a>. This can also
+<p>We're already encountered <a href="../libraries/pl.seq.html#sum">seq.sum</a> when discussing <a href="../libraries/pl.input.html#numbers">input.numbers</a>. This can also
 be expressed with <a href="../libraries/pl.seq.html#reduce">seq.reduce</a>:</p>
 
 
 <pre>
-&gt; seq.reduce(<span class="keyword">function</span>(x,y) <span class="keyword">return</span> x + y <span class="keyword">end</span>, seq.list{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+&gt; seq.<span class="function-name">reduce</span>(<span class="keyword">function</span>(x,y) <span class="keyword">return</span> x + y <span class="keyword">end</span>, seq.<span class="function-name">list</span>{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
 <span class="number">10</span>
 </pre>
 
@@ -243,7 +243,7 @@ <h3>Sequences</h3>
 
 
 <pre>
-reduce(op,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}) =&gt; op(<span class="number">1</span>,reduce(op,{<span class="number">2</span>,<span class="number">3</span>}) =&gt; op(<span class="number">1</span>,op(<span class="number">2</span>,<span class="number">3</span>))
+<span class="function-name">reduce</span>(op,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}) =&gt; <span class="function-name">op</span>(<span class="number">1</span>,<span class="function-name">reduce</span>(op,{<span class="number">2</span>,<span class="number">3</span>}) =&gt; <span class="function-name">op</span>(<span class="number">1</span>,<span class="function-name">op</span>(<span class="number">2</span>,<span class="number">3</span>))
 </pre>
 
 <p>it's now possible to easily generate other cumulative operations; the standard
@@ -253,7 +253,7 @@ <h3>Sequences</h3>
 <pre>
 &gt; ops = <span class="global">require</span> <span class="string">'pl.operator'</span>
 &gt; <span class="comment">-- can also say '*' instead of ops.mul
-</span>&gt; = seq.reduce(ops.mul,input.numbers <span class="string">'1 2 3 4'</span>)
+</span>&gt; = seq.<span class="function-name">reduce</span>(ops.mul,input.<span class="function-name">numbers</span> <span class="string">'1 2 3 4'</span>)
 <span class="number">24</span>
 </pre>
 
@@ -261,11 +261,11 @@ <h3>Sequences</h3>
 
 
 <pre>
-&gt; l1 = List {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
-&gt; l2 = List {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
-&gt; = seq.minmax(l1)
+&gt; l1 = <span class="function-name">List</span> {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
+&gt; l2 = <span class="function-name">List</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
+&gt; = seq.<span class="function-name">minmax</span>(l1)
 <span class="number">10</span>      <span class="number">30</span>
-&gt; = seq.sum(l1)
+&gt; = seq.<span class="function-name">sum</span>(l1)
 <span class="number">60</span>      <span class="number">3</span>
 </pre>
 
@@ -276,18 +276,18 @@ <h3>Sequences</h3>
 
 
 <pre>
-&gt; t = seq.count_map {<span class="string">'one'</span>,<span class="string">'fred'</span>,<span class="string">'two'</span>,<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'two'</span>}
-&gt; = t
+&gt; t = seq.<span class="function-name">count_map</span> {<span class="string">'one'</span>,<span class="string">'fred'</span>,<span class="string">'two'</span>,<span class="string">'one'</span>,<span class="string">'two'</span>,<span class="string">'two'</span>}
+&gt; = <span class="function-name">t</span>
 {one=<span class="number">2</span>,fred=<span class="number">1</span>,two=<span class="number">3</span>}
 </pre>
 
 <p>This will also work on numerical sequences, but you cannot expect the result to
-be a proper list, i.e. having no 'holes'. Instead, you always need to use <a href="https://www.lua.org/manual/5.1/manual.html#pdf-pairs">pairs</a>
+be a proper list, i.e. having no 'holes'. Instead, you always need to use <a href="https://www.lua.org/manual/5.4/manual.html#pdf-pairs">pairs</a>
 to iterate over the result - note that there is a hole at index 5:</p>
 
 
 <pre>
-&gt; t = seq.count_map {<span class="number">1</span>,<span class="number">2</span>,<span class="number">4</span>,<span class="number">2</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">2</span>,<span class="number">6</span>}
+&gt; t = seq.<span class="function-name">count_map</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">4</span>,<span class="number">2</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">2</span>,<span class="number">6</span>}
 &gt; <span class="keyword">for</span> k,v <span class="keyword">in</span> <span class="global">pairs</span>(t) <span class="keyword">do</span> <span class="global">print</span>(k,v) <span class="keyword">end</span>
 <span class="number">1</span>       <span class="number">1</span>
 <span class="number">2</span>       <span class="number">4</span>
@@ -304,7 +304,7 @@ <h3>Sequences</h3>
 
 
 <pre>
-&gt; <span class="keyword">for</span> current,last <span class="keyword">in</span> seq.last {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>} <span class="keyword">do</span> <span class="global">print</span> (current,last) <span class="keyword">end</span>
+&gt; <span class="keyword">for</span> current,last <span class="keyword">in</span> seq.<span class="function-name">last</span> {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>,<span class="number">40</span>} <span class="keyword">do</span> <span class="global">print</span> (current,last) <span class="keyword">end</span>
 <span class="number">20</span>      <span class="number">10</span>
 <span class="number">30</span>      <span class="number">20</span>
 <span class="number">40</span>      <span class="number">30</span>
@@ -319,7 +319,7 @@ <h3>Sequences</h3>
 
 <pre>
 &gt; ls = {<span class="number">10</span>,<span class="number">9</span>,<span class="number">10</span>,<span class="number">3</span>}
-&gt; = seq.copy(seq.filter(seq.last(s),<span class="string">'&lt;'</span>))
+&gt; = seq.<span class="function-name">copy</span>(seq.<span class="function-name">filter</span>(seq.<span class="function-name">last</span>(s),<span class="string">'&lt;'</span>))
 {<span class="number">9</span>,<span class="number">3</span>}
 </pre>
 
@@ -338,7 +338,7 @@ <h3>Sequence Wrappers</h3>
 
 
 <pre>
-seq(s):last():filter(<span class="string">'&lt;'</span>):copy()
+<span class="function-name">seq</span>(s):<span class="function-name">last</span>():<span class="function-name">filter</span>(<span class="string">'&lt;'</span>):<span class="function-name">copy</span>()
 </pre>
 
 <p>With this notation, the operation becomes a chain of method calls running from
@@ -355,19 +355,19 @@ <h3>Sequence Wrappers</h3>
 
 
 <pre>
-&gt; seq{<span class="string">'one'</span>,<span class="string">'tw'</span>,<span class="string">'t'</span>} :map <span class="string">'#'</span> :printall()
+&gt; <span class="function-name">seq</span>{<span class="string">'one'</span>,<span class="string">'tw'</span>,<span class="string">'t'</span>} :<span class="function-name">map</span> <span class="string">'#'</span> :<span class="function-name">printall</span>()
 <span class="number">3</span> <span class="number">2</span> <span class="number">1</span>
 </pre>
 
 <p>As a convenience, there is a function <a href="../libraries/pl.seq.html#lines">seq.lines</a> which behaves just like
-<a href="https://www.lua.org/manual/5.1/manual.html#pdf-io.lines">io.lines</a> except it wraps the result as an explicit sequence type. This takes
+<a href="https://www.lua.org/manual/5.4/manual.html#pdf-io.lines">io.lines</a> except it wraps the result as an explicit sequence type. This takes
 the first 10 lines from standard input, makes it uppercase, turns it into a
 sequence with a count and the value, glues these together with the concatenation
 operator, and finally prints out the sequence delimited by a newline.</p>
 
 
 <pre>
-seq.lines():take(<span class="number">10</span>):upper():enum():map(<span class="string">'..'</span>):printall <span class="string">'\n'</span>
+seq.<span class="function-name">lines</span>():<span class="function-name">take</span>(<span class="number">10</span>):<span class="function-name">upper</span>():<span class="function-name">enum</span>():<span class="function-name">map</span>(<span class="string">'..'</span>):<span class="function-name">printall</span> <span class="string">'\n'</span>
 </pre>
 
 <p>Note the method <code>upper</code>, which is not a <a href="../libraries/pl.seq.html#">seq</a> function. if an unknown method is
@@ -384,18 +384,18 @@ <h3>Sequence Wrappers</h3>
 <span class="comment">-- random.lua
 </span><span class="keyword">local</span> seq = <span class="global">require</span> <span class="string">'pl.seq'</span>
 
-<span class="keyword">function</span> dev_random()
-    <span class="keyword">local</span> f = <span class="global">io</span>.open(<span class="string">'/dev/random'</span>)
+<span class="keyword">function</span> <span class="function-name">dev_random</span>()
+    <span class="keyword">local</span> f = <span class="global">io</span>.<span class="function-name">open</span>(<span class="string">'/dev/random'</span>)
     <span class="keyword">local</span> byte = <span class="global">string</span>.byte
-    <span class="keyword">return</span> seq(<span class="keyword">function</span>()
+    <span class="keyword">return</span> <span class="function-name">seq</span>(<span class="keyword">function</span>()
         <span class="comment">-- read two bytes into a string and convert into a 16-bit number
-</span>        <span class="keyword">local</span> s = f:read(<span class="number">2</span>)
-        <span class="keyword">return</span> byte(s,<span class="number">1</span>) + <span class="number">256</span>*byte(s,<span class="number">2</span>)
+</span>        <span class="keyword">local</span> s = f:<span class="function-name">read</span>(<span class="number">2</span>)
+        <span class="keyword">return</span> <span class="function-name">byte</span>(s,<span class="number">1</span>) + <span class="number">256</span>*<span class="function-name">byte</span>(s,<span class="number">2</span>)
     <span class="keyword">end</span>)
 <span class="keyword">end</span>
 
 <span class="comment">-- print 10 random numbers from 0 to 1 !
-</span>dev_random():take(<span class="number">10</span>):map(<span class="string">'%'</span>,<span class="number">100</span>):map(<span class="string">'/'</span>,<span class="number">100</span>):printall <span class="string">','</span>
+</span><span class="function-name">dev_random</span>():<span class="function-name">take</span>(<span class="number">10</span>):<span class="function-name">map</span>(<span class="string">'%'</span>,<span class="number">100</span>):<span class="function-name">map</span>(<span class="string">'/'</span>,<span class="number">100</span>):<span class="function-name">printall</span> <span class="string">','</span>
 </pre>
 
 <p>Another Linux one-liner depends on the <code>/proc</code> filesystem and makes a list of all
@@ -403,7 +403,7 @@ <h3>Sequence Wrappers</h3>
 
 
 <pre>
-pids = seq(lfs.dir <span class="string">'/proc'</span>):filter(stringx.isdigit):map(<span class="global">tonumber</span>):copy()
+pids = <span class="function-name">seq</span>(lfs.<span class="function-name">dir</span> <span class="string">'/proc'</span>):<span class="function-name">filter</span>(stringx.isdigit):<span class="function-name">map</span>(<span class="global">tonumber</span>):<span class="function-name">copy</span>()
 </pre>
 
 <p>This version of Penlight has an experimental feature which relies on the fact
@@ -412,8 +412,8 @@ <h3>Sequence Wrappers</h3>
 
 
 <pre>
-&gt; seq.import()
-&gt; seq.random(<span class="number">5</span>):printall(<span class="string">','</span>,<span class="number">5</span>,<span class="string">'%4.1f'</span>)
+&gt; seq.<span class="function-name">import</span>()
+&gt; seq.<span class="function-name">random</span>(<span class="number">5</span>):<span class="function-name">printall</span>(<span class="string">','</span>,<span class="number">5</span>,<span class="string">'%4.1f'</span>)
  <span class="number">0.0</span>, <span class="number">0.1</span>, <span class="number">0.4</span>, <span class="number">0.1</span>, <span class="number">0.2</span>
 </pre>
 
@@ -422,7 +422,7 @@ <h3>Sequence Wrappers</h3>
 
 
 <pre>
-&gt; (<span class="string">'one two three'</span>):gfind(<span class="string">'%a+'</span>):printall(<span class="string">','</span>)
+&gt; (<span class="string">'one two three'</span>):<span class="function-name">gfind</span>(<span class="string">'%a+'</span>):<span class="function-name">printall</span>(<span class="string">','</span>)
 one,two,three,
 </pre>
 
@@ -434,10 +434,10 @@ <h3>Sequence Wrappers</h3>
 
 
 <pre>
-&gt; <span class="global">math</span>.sin:printall()
-..seq.lua:<span class="number">287</span>: bad argument #<span class="number">1</span> to <span class="string">'(for generator)'</span> (number expected, got <span class="keyword">nil</span>)
+&gt; <span class="global">math</span>.sin:<span class="function-name">printall</span>()
+..seq.lua:<span class="number">287</span>: bad argument #<span class="number">1</span> <span class="function-name">to</span> <span class="string">'(for generator)'</span> (number expected, got <span class="keyword">nil</span>)
 &gt; a = <span class="global">tostring</span>
-&gt; = a:find(<span class="string">' '</span>)
+&gt; = a:<span class="function-name">find</span>(<span class="string">' '</span>)
 <span class="keyword">function</span>: <span class="number">0042</span>C920
 </pre>
 
@@ -456,15 +456,15 @@ <h3>List Comprehensions</h3>
 
 
 <pre>
-ls = [x <span class="keyword">for</span> x <span class="keyword">in</span> range(<span class="number">5</span>)]  # == [<span class="number">0</span>,<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>]
+ls = [x <span class="keyword">for</span> x <span class="keyword">in</span> <span class="function-name">range</span>(<span class="number">5</span>)]  # == [<span class="number">0</span>,<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>]
 </pre>
 
 <p>In Lua, using <a href="../libraries/pl.comprehension.html#">pl.comprehension</a>:</p>
 
 
 <pre>
-&gt; C = <span class="global">require</span>(<span class="string">'pl.comprehension'</span>).new()
-&gt; = C (<span class="string">'x for x=1,10'</span>) ()
+&gt; C = <span class="global">require</span>(<span class="string">'pl.comprehension'</span>).<span class="function-name">new</span>()
+&gt; = <span class="function-name">C</span> (<span class="string">'x for x=1,10'</span>) ()
 {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>,<span class="number">6</span>,<span class="number">7</span>,<span class="number">8</span>,<span class="number">9</span>,<span class="number">10</span>}
 </pre>
 
@@ -474,9 +474,9 @@ <h3>List Comprehensions</h3>
 
 
 <pre>
-&gt; = C <span class="string">'x^2 for x=1,4'</span> ()
+&gt; = <span class="function-name">C</span> <span class="string">'x^2 for x=1,4'</span> ()
 {<span class="number">1</span>,<span class="number">4</span>,<span class="number">9</span>,<span class="number">16</span>}
-&gt; = C <span class="string">'{x,x^2} for x=1,4'</span> ()
+&gt; = <span class="function-name">C</span> <span class="string">'{x,x^2} for x=1,4'</span> ()
 {{<span class="number">1</span>,<span class="number">1</span>},{<span class="number">2</span>,<span class="number">4</span>},{<span class="number">3</span>,<span class="number">9</span>},{<span class="number">4</span>,<span class="number">16</span>}}
 </pre>
 
@@ -489,32 +489,32 @@ <h3>List Comprehensions</h3>
 
 
 <pre>
-&gt; = C <span class="string">'2*x for x'</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
+&gt; = <span class="function-name">C</span> <span class="string">'2*x for x'</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}
 {<span class="number">2</span>,<span class="number">4</span>,<span class="number">6</span>}
-&gt; dbl = C <span class="string">'2*x for x'</span>
-&gt; = dbl {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
+&gt; dbl = <span class="function-name">C</span> <span class="string">'2*x for x'</span>
+&gt; = <span class="function-name">dbl</span> {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
 {<span class="number">20</span>,<span class="number">40</span>,<span class="number">60</span>}
 </pre>
 
 <p>Here is a somewhat more explicit way of saying the same thing; <code>_1</code> is a
-<em>placeholder</em> refering to the <em>first</em> argument passed to the comprehension.</p>
+<em>placeholder</em> referring to the <em>first</em> argument passed to the comprehension.</p>
 
 
 <pre>
-&gt; = C <span class="string">'2*x for _,x in pairs(_1)'</span> {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
+&gt; = <span class="function-name">C</span> <span class="string">'2*x for _,x in pairs(_1)'</span> {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>}
 {<span class="number">20</span>,<span class="number">40</span>,<span class="number">60</span>}
-&gt; = C <span class="string">'_1(x) for x'</span>(<span class="global">tostring</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+&gt; = <span class="function-name">C</span> <span class="string">'_1(x) for x'</span>(<span class="global">tostring</span>,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
 {<span class="string">'1'</span>,<span class="string">'2'</span>,<span class="string">'3'</span>,<span class="string">'4'</span>}
 </pre>
 
 <p>This extended syntax is useful when you wish to collect the result of some
-iterator, such as <a href="https://www.lua.org/manual/5.1/manual.html#pdf-io.lines">io.lines</a>. This comprehension creates a function which creates
+iterator, such as <a href="https://www.lua.org/manual/5.4/manual.html#pdf-io.lines">io.lines</a>. This comprehension creates a function which creates
 a table of all the lines in a file:</p>
 
 
 <pre>
-&gt; f = <span class="global">io</span>.open(<span class="string">'array.lua'</span>)
-&gt; lines = C <span class="string">'line for line in _1:lines()'</span> (f)
+&gt; f = <span class="global">io</span>.<span class="function-name">open</span>(<span class="string">'array.lua'</span>)
+&gt; lines = <span class="function-name">C</span> <span class="string">'line for line in _1:lines()'</span> (f)
 &gt; = #lines
 <span class="number">118</span>
 </pre>
@@ -524,11 +524,11 @@ <h3>List Comprehensions</h3>
 
 
 <pre>
-&gt; = C <span class="string">'min(x for x)'</span> {<span class="number">1</span>,<span class="number">44</span>,<span class="number">0</span>}
+&gt; = <span class="function-name">C</span> <span class="string">'min(x for x)'</span> {<span class="number">1</span>,<span class="number">44</span>,<span class="number">0</span>}
 <span class="number">0</span>
-&gt; = C <span class="string">'max(x for x)'</span> {<span class="number">1</span>,<span class="number">44</span>,<span class="number">0</span>}
+&gt; = <span class="function-name">C</span> <span class="string">'max(x for x)'</span> {<span class="number">1</span>,<span class="number">44</span>,<span class="number">0</span>}
 <span class="number">44</span>
-&gt; = C <span class="string">'sum(x for x)'</span> {<span class="number">1</span>,<span class="number">44</span>,<span class="number">0</span>}
+&gt; = <span class="function-name">C</span> <span class="string">'sum(x for x)'</span> {<span class="number">1</span>,<span class="number">44</span>,<span class="number">0</span>}
 <span class="number">45</span>
 </pre>
 
@@ -539,7 +539,7 @@ <h3>List Comprehensions</h3>
 
 
 <pre>
-&gt; = C <span class="string">'x for x if x % 2 == 0'</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>}
+&gt; = <span class="function-name">C</span> <span class="string">'x for x if x % 2 == 0'</span> {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>}
 {<span class="number">2</span>,<span class="number">4</span>}
 </pre>
 
@@ -547,9 +547,9 @@ <h3>List Comprehensions</h3>
 
 
 <pre>
-&gt; = C <span class="string">'{x,y} for x = 1,2 for y = 1,2'</span> ()
+&gt; = <span class="function-name">C</span> <span class="string">'{x,y} for x = 1,2 for y = 1,2'</span> ()
 {{<span class="number">1</span>,<span class="number">1</span>},{<span class="number">1</span>,<span class="number">2</span>},{<span class="number">2</span>,<span class="number">1</span>},{<span class="number">2</span>,<span class="number">2</span>}}
-&gt; = C <span class="string">'{x,y} for x for y'</span> ({<span class="number">1</span>,<span class="number">2</span>},{<span class="number">10</span>,<span class="number">20</span>})
+&gt; = <span class="function-name">C</span> <span class="string">'{x,y} for x for y'</span> ({<span class="number">1</span>,<span class="number">2</span>},{<span class="number">10</span>,<span class="number">20</span>})
 {{<span class="number">1</span>,<span class="number">10</span>},{<span class="number">1</span>,<span class="number">20</span>},{<span class="number">2</span>,<span class="number">10</span>},{<span class="number">2</span>,<span class="number">20</span>}}
 </pre>
 
@@ -569,8 +569,8 @@ <h3>Creating Functions from Functions</h3>
 
 <pre>
 &gt; func = <span class="global">require</span> <span class="string">'pl.func'</span>
-&gt; printf = func.compose(<span class="global">io</span>.write,<span class="global">string</span>.format)
-&gt; printf(<span class="string">"hello %s\n"</span>,<span class="string">'world'</span>)
+&gt; printf = func.<span class="function-name">compose</span>(<span class="global">io</span>.write,<span class="global">string</span>.format)
+&gt; <span class="function-name">printf</span>(<span class="string">"hello %s\n"</span>,<span class="string">'world'</span>)
 hello world
 <span class="keyword">true</span>
 </pre>
@@ -585,27 +585,27 @@ <h3>Creating Functions from Functions</h3>
 
 
 <pre>
-&gt; p2 = func.bind1(<span class="global">print</span>,<span class="string">'start&gt;'</span>)
-&gt; p2(<span class="string">'hello'</span>,<span class="number">2</span>)
+&gt; p2 = func.<span class="function-name">bind1</span>(<span class="global">print</span>,<span class="string">'start&gt;'</span>)
+&gt; <span class="function-name">p2</span>(<span class="string">'hello'</span>,<span class="number">2</span>)
 start&gt;  hello   <span class="number">2</span>
 &gt; ops = <span class="global">require</span> <span class="string">'pl.operator'</span>
-&gt; = tablex.filter({<span class="number">1</span>,-<span class="number">2</span>,<span class="number">10</span>,-<span class="number">1</span>,<span class="number">2</span>},bind1(ops.gt,<span class="number">0</span>))
+&gt; = tablex.<span class="function-name">filter</span>({<span class="number">1</span>,-<span class="number">2</span>,<span class="number">10</span>,-<span class="number">1</span>,<span class="number">2</span>},<span class="function-name">bind1</span>(ops.gt,<span class="number">0</span>))
 {-<span class="number">2</span>,-<span class="number">1</span>}
-&gt; tablex.filter({<span class="number">1</span>,-<span class="number">2</span>,<span class="number">10</span>,-<span class="number">1</span>,<span class="number">2</span>},bind1(ops.le,<span class="number">0</span>))
+&gt; tablex.<span class="function-name">filter</span>({<span class="number">1</span>,-<span class="number">2</span>,<span class="number">10</span>,-<span class="number">1</span>,<span class="number">2</span>},<span class="function-name">bind1</span>(ops.le,<span class="number">0</span>))
 {<span class="number">1</span>,<span class="number">10</span>,<span class="number">2</span>}
 </pre>
 
-<p>The last example unfortunately reads backwards, because <a href="../libraries/pl.func.html#bind1">bind1</a> alway binds the
+<p>The last example unfortunately reads backwards, because <a href="../libraries/pl.func.html#bind1">bind1</a> always binds the
 first argument!  Also unfortunately, in my youth I confused 'currying' with
 'partial application', so the old name for <a href="../libraries/pl.func.html#bind1">bind1</a> is <code>curry</code> - this alias still exists.</p>
 
 <p>This is a specialized form of function argument binding. Here is another way
-to say the <a href="https://www.lua.org/manual/5.1/manual.html#pdf-print">print</a> example:</p>
+to say the <a href="https://www.lua.org/manual/5.4/manual.html#pdf-print">print</a> example:</p>
 
 
 <pre>
-&gt; p2 = func.bind(<span class="global">print</span>,<span class="string">'start&gt;'</span>,func._1,func._2)
-&gt; p2(<span class="string">'hello'</span>,<span class="number">2</span>)
+&gt; p2 = func.<span class="function-name">bind</span>(<span class="global">print</span>,<span class="string">'start&gt;'</span>,func._1,func._2)
+&gt; <span class="function-name">p2</span>(<span class="string">'hello'</span>,<span class="number">2</span>)
 start&gt;  hello   <span class="number">2</span>
 </pre>
 
@@ -618,8 +618,8 @@ <h3>Creating Functions from Functions</h3>
 
 
 <pre>
-&gt; utils.import <span class="string">'pl.func'</span>
-&gt; tablex.filter({<span class="number">1</span>,-<span class="number">2</span>,<span class="number">10</span>,-<span class="number">1</span>,<span class="number">2</span>},bind(ops.gt, _1, <span class="number">0</span>))
+&gt; utils.<span class="function-name">import</span> <span class="string">'pl.func'</span>
+&gt; tablex.<span class="function-name">filter</span>({<span class="number">1</span>,-<span class="number">2</span>,<span class="number">10</span>,-<span class="number">1</span>,<span class="number">2</span>},<span class="function-name">bind</span>(ops.gt, _1, <span class="number">0</span>))
 {<span class="number">1</span>,<span class="number">10</span>,<span class="number">2</span>}
 </pre>
 
@@ -630,27 +630,27 @@ <h3>Creating Functions from Functions</h3>
 <pre>
 &gt; S1 = {john=<span class="number">27</span>, jane=<span class="number">31</span>, mary=<span class="number">24</span>}
 &gt; S2 = {jane=<span class="number">31</span>, jones=<span class="number">50</span>}
-&gt; intersection = bind(tablex.merge, _1, _2, <span class="keyword">false</span>)
-&gt; union = bind(tablex.merge, _1, _2, <span class="keyword">true</span>)
-&gt; = intersection(S1,S2)
+&gt; intersection = <span class="function-name">bind</span>(tablex.merge, _1, _2, <span class="keyword">false</span>)
+&gt; union = <span class="function-name">bind</span>(tablex.merge, _1, _2, <span class="keyword">true</span>)
+&gt; = <span class="function-name">intersection</span>(S1,S2)
 {jane=<span class="number">31</span>}
-&gt; = union(S1,S2)
+&gt; = <span class="function-name">union</span>(S1,S2)
 {mary=<span class="number">24</span>,jane=<span class="number">31</span>,john=<span class="number">27</span>,jones=<span class="number">50</span>}
 </pre>
 
-<p>When using <a href="../libraries/pl.func.html#bind">bind</a> with <a href="https://www.lua.org/manual/5.1/manual.html#pdf-print">print</a>, we got a function of precisely two arguments,
-whereas we really want our function to use varargs like <a href="https://www.lua.org/manual/5.1/manual.html#pdf-print">print</a>. This is the role
+<p>When using <a href="../libraries/pl.func.html#bind">bind</a> with <a href="https://www.lua.org/manual/5.4/manual.html#pdf-print">print</a>, we got a function of precisely two arguments,
+whereas we really want our function to use varargs like <a href="https://www.lua.org/manual/5.4/manual.html#pdf-print">print</a>. This is the role
 of <code>_0</code>:</p>
 
 
 <pre>
 &gt; _DEBUG = <span class="keyword">true</span>
-&gt; p = bind(<span class="global">print</span>,<span class="string">'start&gt;'</span>, _0)
+&gt; p = <span class="function-name">bind</span>(<span class="global">print</span>,<span class="string">'start&gt;'</span>, _0)
 <span class="keyword">return</span> <span class="keyword">function</span> (fn,_v1)
-    <span class="keyword">return</span> <span class="keyword">function</span>(...) <span class="keyword">return</span> fn(_v1,...) <span class="keyword">end</span>
+    <span class="keyword">return</span> <span class="keyword">function</span>(...) <span class="keyword">return</span> <span class="function-name">fn</span>(_v1,...) <span class="keyword">end</span>
 <span class="keyword">end</span>
 
-&gt; p(<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>)
+&gt; <span class="function-name">p</span>(<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>,<span class="number">5</span>)
 start&gt;  <span class="number">1</span>       <span class="number">2</span>       <span class="number">3</span>       <span class="number">4</span>       <span class="number">5</span>
 </pre>
 
@@ -667,7 +667,7 @@ <h3>Placeholder Expressions</h3>
 
 
 <pre>
-&gt; = tablex.map(<span class="keyword">function</span>(x) <span class="keyword">return</span> x*x <span class="keyword">end</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+&gt; = tablex.<span class="function-name">map</span>(<span class="keyword">function</span>(x) <span class="keyword">return</span> x*x <span class="keyword">end</span>, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
 {<span class="number">1</span>,<span class="number">4</span>,<span class="number">9</span>,<span class="number">16</span>}
 </pre>
 
@@ -679,8 +679,8 @@ <h3>Placeholder Expressions</h3>
 
 
 <pre>
-&gt; utils.import <span class="string">'pl.func'</span>
-&gt; = tablex.map(_1*_1, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+&gt; utils.<span class="function-name">import</span> <span class="string">'pl.func'</span>
+&gt; = tablex.<span class="function-name">map</span>(_1*_1, {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
 {<span class="number">1</span>,<span class="number">4</span>,<span class="number">9</span>,<span class="number">16</span>}
 </pre>
 
@@ -688,21 +688,21 @@ <h3>Placeholder Expressions</h3>
 
 
 <pre>
-&gt; = tablex.map2(_1+_2,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}, {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>})
+&gt; = tablex.<span class="function-name">map2</span>(_1+_2,{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>}, {<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>})
 {<span class="number">11</span>,<span class="number">22</span>,<span class="number">33</span>}
 </pre>
 
-<p>These expressions can use arbitrary functions, altho they must first be
+<p>These expressions can use arbitrary functions, although they must first be
 registered with the functional library. <a href="../libraries/pl.func.html#register">func.register</a> brings in a single
-function, and <a href="../libraries/pl.func.html#import">func.import</a> brings in a whole table of functions, such as <a href="https://www.lua.org/manual/5.1/manual.html#5.6">math</a>.</p>
+function, and <a href="../libraries/pl.func.html#import">func.import</a> brings in a whole table of functions, such as <a href="https://www.lua.org/manual/5.4/manual.html#6.7">math</a>.</p>
 
 
 <pre>
-&gt; sin = register(<span class="global">math</span>.sin)
-&gt; = tablex.map(sin(_1), {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+&gt; sin = <span class="function-name">register</span>(<span class="global">math</span>.sin)
+&gt; = tablex.<span class="function-name">map</span>(<span class="function-name">sin</span>(_1), {<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
 {<span class="number">0.8414709848079</span>,<span class="number">0.90929742682568</span>,<span class="number">0.14112000805987</span>,-<span class="number">0.75680249530793</span>}
-&gt; import <span class="string">'math'</span>
-&gt; = tablex.map(cos(<span class="number">2</span>*_1),{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
+&gt; <span class="function-name">import</span> <span class="string">'math'</span>
+&gt; = tablex.<span class="function-name">map</span>(<span class="function-name">cos</span>(<span class="number">2</span>*_1),{<span class="number">1</span>,<span class="number">2</span>,<span class="number">3</span>,<span class="number">4</span>})
 {-<span class="number">0.41614683654714</span>,-<span class="number">0.65364362086361</span>,<span class="number">0.96017028665037</span>,-<span class="number">0.14550003380861</span>}
 </pre>
 
@@ -710,17 +710,17 @@ <h3>Placeholder Expressions</h3>
 
 
 <pre>
-&gt; = tablex.map(_1:sub(<span class="number">1</span>,<span class="number">1</span>), {<span class="string">'one'</span>,<span class="string">'four'</span>,<span class="string">'x'</span>})
+&gt; = tablex.<span class="function-name">map</span>(_1:<span class="function-name">sub</span>(<span class="number">1</span>,<span class="number">1</span>), {<span class="string">'one'</span>,<span class="string">'four'</span>,<span class="string">'x'</span>})
 {<span class="string">'o'</span>,<span class="string">'f'</span>,<span class="string">'x'</span>}
 </pre>
 
 <p>There are some restrictions on what operators can be used in PEs. For instance,
-because the <code>__len</code> metamethod cannot be overriden by plain Lua tables, we need
+because the <code>__len</code> metamethod cannot be overridden by plain Lua tables, we need
 to define a special function to express `#_1':</p>
 
 
 <pre>
-&gt; = tablex.map(Len(_1), {<span class="string">'one'</span>,<span class="string">'four'</span>,<span class="string">'x'</span>})
+&gt; = tablex.<span class="function-name">map</span>(<span class="function-name">Len</span>(_1), {<span class="string">'one'</span>,<span class="string">'four'</span>,<span class="string">'x'</span>})
 {<span class="number">3</span>,<span class="number">4</span>,<span class="number">1</span>}
 </pre>
 
@@ -729,7 +729,7 @@ <h3>Placeholder Expressions</h3>
 
 
 <pre>
-&gt; = tablex.filter(Gt(_1,<span class="number">0</span>), {<span class="number">1</span>,-<span class="number">1</span>,<span class="number">2</span>,<span class="number">4</span>,-<span class="number">3</span>})
+&gt; = tablex.<span class="function-name">filter</span>(<span class="function-name">Gt</span>(_1,<span class="number">0</span>), {<span class="number">1</span>,-<span class="number">1</span>,<span class="number">2</span>,<span class="number">4</span>,-<span class="number">3</span>})
 {<span class="number">1</span>,<span class="number">2</span>,<span class="number">4</span>}
 </pre>
 
@@ -739,7 +739,7 @@ <h3>Placeholder Expressions</h3>
 
 
 <pre>
-&gt; = pairmap(Args(_2,_1:upper()),{fred=<span class="number">1</span>,alice=<span class="number">2</span>})
+&gt; = <span class="function-name">pairmap</span>(<span class="function-name">Args</span>(_2,_1:<span class="function-name">upper</span>()),{fred=<span class="number">1</span>,alice=<span class="number">2</span>})
 {ALICE=<span class="number">2</span>,FRED=<span class="number">1</span>}
 </pre>
 
@@ -754,7 +754,7 @@ <h3>Placeholder Expressions</h3>
 
 
 <pre>
-&gt; = tablex.map(_1(<span class="number">10</span>),{I(<span class="number">2</span>*_1),I(_1*_1),I(_1+<span class="number">2</span>)})
+&gt; = tablex.<span class="function-name">map</span>(<span class="function-name">_1</span>(<span class="number">10</span>),{<span class="function-name">I</span>(<span class="number">2</span>*_1),<span class="function-name">I</span>(_1*_1),<span class="function-name">I</span>(_1+<span class="number">2</span>)})
 {<span class="number">20</span>,<span class="number">100</span>,<span class="number">12</span>}
 </pre>
 
@@ -782,7 +782,7 @@ <h3>Placeholder Expressions</h3>
 
 
 <pre>
-<span class="keyword">for</span> line <span class="keyword">in</span> I(_(f):read()) <span class="keyword">do</span> <span class="global">print</span>(line) <span class="keyword">end</span>
+<span class="keyword">for</span> line <span class="keyword">in</span> <span class="function-name">I</span>(<span class="function-name">_</span>(f):<span class="function-name">read</span>()) <span class="keyword">do</span> <span class="global">print</span>(line) <span class="keyword">end</span>
 </pre>
 
 <p>Now this will work for <em>any</em> 'file-like' object which which has a <code>read</code> method
@@ -800,7 +800,7 @@ <h3>Placeholder Expressions</h3>
 
 <pre>
 &gt; str = <span class="string">'for i=1,10 do for j = 1,10 do print(i,j) end end'</span>
-&gt; = seq(lexer.lua(str)):filter(<span class="string">'=='</span>,<span class="string">'iden'</span>):map(_2):unique():copy()
+&gt; = <span class="function-name">seq</span>(lexer.<span class="function-name">lua</span>(str)):<span class="function-name">filter</span>(<span class="string">'=='</span>,<span class="string">'iden'</span>):<span class="function-name">map</span>(_2):<span class="function-name">unique</span>():<span class="function-name">copy</span>()
 {i,<span class="global">print</span>,j}
 </pre>
 
@@ -816,9 +816,9 @@ <h3>Placeholder Expressions</h3>
 
 
 <pre>
-<span class="keyword">local</span> fn = I(_1:f() + _2:g())
+<span class="keyword">local</span> fn = <span class="function-name">I</span>(_1:<span class="function-name">f</span>() + _2:<span class="function-name">g</span>())
 <span class="keyword">for</span> i = <span class="number">1</span>,n <span class="keyword">do</span>
-    res[i] = tablex.map2(fn,first[i],second[i])
+    res[i] = tablex.<span class="function-name">map2</span>(fn,first[i],second[i])
 <span class="keyword">end</span>
 </pre>
 
@@ -827,7 +827,7 @@ <h3>Placeholder Expressions</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/manual/08-additional.md.html b/docs/manual/08-additional.md.html
index d13ac6e3..3f96f05c 100644
--- a/docs/manual/08-additional.md.html
+++ b/docs/manual/08-additional.md.html
@@ -142,33 +142,33 @@ <h3>Simple Input Patterns</h3>
 </span>months={Jan=<span class="number">1</span>,Feb=<span class="number">2</span>,Mar=<span class="number">3</span>,Apr=<span class="number">4</span>,May=<span class="number">5</span>,Jun=<span class="number">6</span>,
 Jul=<span class="number">7</span>,Aug=<span class="number">8</span>,Sep=<span class="number">9</span>,Oct=<span class="number">10</span>,Nov=<span class="number">11</span>,Dec=<span class="number">12</span>}
 
-<span class="keyword">function</span> check_and_process(d,m,y)
+<span class="keyword">function</span> <span class="function-name">check_and_process</span>(d,m,y)
     d = <span class="global">tonumber</span>(d)
     m = <span class="global">tonumber</span>(m)
     y = <span class="global">tonumber</span>(y)
     ....
 <span class="keyword">end</span>
 
-<span class="keyword">for</span> line <span class="keyword">in</span> f:lines() <span class="keyword">do</span>
+<span class="keyword">for</span> line <span class="keyword">in</span> f:<span class="function-name">lines</span>() <span class="keyword">do</span>
     <span class="comment">-- ordinary (English) date format
-</span>    <span class="keyword">local</span> d,m,y = line:match(<span class="string">'(%d+)/(%d+)/(%d+)'</span>)
+</span>    <span class="keyword">local</span> d,m,y = line:<span class="function-name">match</span>(<span class="string">'(%d+)/(%d+)/(%d+)'</span>)
     <span class="keyword">if</span> d <span class="keyword">then</span>
-        check_and_process(d,m,y)
+        <span class="function-name">check_and_process</span>(d,m,y)
     <span class="keyword">else</span> <span class="comment">-- ISO date??
-</span>        y,m,d = line:match(<span class="string">'(%d+)%-(%d+)%-(%d+)'</span>)
+</span>        y,m,d = line:<span class="function-name">match</span>(<span class="string">'(%d+)%-(%d+)%-(%d+)'</span>)
         <span class="keyword">if</span> y <span class="keyword">then</span>
-            check_and_process(d,m,y)
+            <span class="function-name">check_and_process</span>(d,m,y)
         <span class="keyword">else</span> <span class="comment">-- &lt;day&gt; &lt;month-name&gt; &lt;year&gt;?
-</span>            d,mm,y = line:match(<span class="string">'%(d+)%s+(%a+)%s+(%d+)'</span>)
+</span>            d,mm,y = line:<span class="function-name">match</span>(<span class="string">'%(d+)%s+(%a+)%s+(%d+)'</span>)
             m = months[mm]
-            check_and_process(d,m,y)
+            <span class="function-name">check_and_process</span>(d,m,y)
         <span class="keyword">end</span>
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 </pre>
 
 <p>These aren't particularly difficult patterns, but already typical issues are
-appearing, such as having to escape '-'. Also, <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.match">string.match</a> returns its
+appearing, such as having to escape '-'. Also, <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.match">string.match</a> returns its
 captures, so that we're forced to use a slightly awkward nested if-statement.</p>
 
 <p>Verification issues will further cloud the picture, since regular expression
@@ -184,15 +184,15 @@ <h3>Simple Input Patterns</h3>
 &gt; sip = <span class="global">require</span> <span class="string">'pl.sip'</span>
 &gt; dump = <span class="global">require</span>(<span class="string">'pl.pretty'</span>).dump
 &gt; res = {}
-&gt; c = sip.compile <span class="string">'ref=$S{file}:$d{line}'</span>
-&gt; = c(<span class="string">'ref=hello.c:10'</span>,res)
+&gt; c = sip.<span class="function-name">compile</span> <span class="string">'ref=$S{file}:$d{line}'</span>
+&gt; = <span class="function-name">c</span>(<span class="string">'ref=hello.c:10'</span>,res)
 <span class="keyword">true</span>
-&gt; dump(res)
+&gt; <span class="function-name">dump</span>(res)
 {
   line = <span class="number">10</span>,
   file = <span class="string">"hello.c"</span>
 }
-&gt; = c(<span class="string">'ref=long name, no line'</span>,res)
+&gt; = <span class="function-name">c</span>(<span class="string">'ref=long name, no line'</span>,res)
 <span class="keyword">false</span>
 </pre>
 
@@ -205,23 +205,23 @@ <h3>Simple Input Patterns</h3>
 
 <pre>
 <span class="comment">-- using SIP patterns
-</span><span class="keyword">function</span> check(t)
-    check_and_process(t.day,t.month,t.year)
+</span><span class="keyword">function</span> <span class="function-name">check</span>(t)
+    <span class="function-name">check_and_process</span>(t.day,t.month,t.year)
 <span class="keyword">end</span>
 
-shortdate = sip.compile(<span class="string">'$d{day}/$d{month}/$d{year}'</span>)
-longdate = sip.compile(<span class="string">'$d{day} $v{mon} $d{year}'</span>)
-isodate = sip.compile(<span class="string">'$d{year}-$d{month}-$d{day}'</span>)
+shortdate = sip.<span class="function-name">compile</span>(<span class="string">'$d{day}/$d{month}/$d{year}'</span>)
+longdate = sip.<span class="function-name">compile</span>(<span class="string">'$d{day} $v{mon} $d{year}'</span>)
+isodate = sip.<span class="function-name">compile</span>(<span class="string">'$d{year}-$d{month}-$d{day}'</span>)
 
-<span class="keyword">for</span> line <span class="keyword">in</span> f:lines() <span class="keyword">do</span>
+<span class="keyword">for</span> line <span class="keyword">in</span> f:<span class="function-name">lines</span>() <span class="keyword">do</span>
     <span class="keyword">local</span> res = {}
-    <span class="keyword">if</span> shortdate(str,res) <span class="keyword">then</span>
-        check(res)
-    <span class="keyword">elseif</span> isodate(str,res) <span class="keyword">then</span>
-        check(res)
-    <span class="keyword">elseif</span> longdate(str,res) <span class="keyword">then</span>
+    <span class="keyword">if</span> <span class="function-name">shortdate</span>(str,res) <span class="keyword">then</span>
+        <span class="function-name">check</span>(res)
+    <span class="keyword">elseif</span> <span class="function-name">isodate</span>(str,res) <span class="keyword">then</span>
+        <span class="function-name">check</span>(res)
+    <span class="keyword">elseif</span> <span class="function-name">longdate</span>(str,res) <span class="keyword">then</span>
         res.month = months[res.mon]
-        check(res)
+        <span class="function-name">check</span>(res)
     <span class="keyword">end</span>
 <span class="keyword">end</span>
 </pre>
@@ -236,10 +236,10 @@ <h3>Simple Input Patterns</h3>
 i         possibly signed integer
 f         floating-point number
 r         rest of line
-q         quoted <span class="global">string</span> (quoted using either ' <span class="keyword">or</span> ")
-p         a path name
+q         quoted <span class="global">string</span> (quoted using <span class="function-name">either</span> ' <span class="keyword">or</span> ")
+p         a path <span class="function-name">name</span>
 (         anything inside balanced parentheses
-[         anything inside balanced brackets
+[         anything inside balanced <span class="function-name">brackets</span>
 {         anything inside balanced curly brackets
 &lt;         anything inside balanced angle brackets
 </pre>
@@ -261,18 +261,18 @@ <h3>Simple Input Patterns</h3>
 
 
 <pre>
-&gt; sip.match(<span class="string">'($q{first},$q{second})'</span>,<span class="string">'("john","smith")'</span>,res)
+&gt; sip.<span class="function-name">match</span>(<span class="string">'($q{first},$q{second})'</span>,<span class="string">'("john","smith")'</span>,res)
 <span class="keyword">true</span>
-&gt; res
+&gt; <span class="function-name">res</span>
 {second=<span class="string">'smith'</span>,first=<span class="string">'john'</span>}
 &gt; res = {}
-&gt; sip.match(<span class="string">'($q,$q)'</span>,<span class="string">'("jan","smit")'</span>,res)  <span class="comment">-- unnamed captures
+&gt; sip.<span class="function-name">match</span>(<span class="string">'($q,$q)'</span>,<span class="string">'("jan","smit")'</span>,res)  <span class="comment">-- unnamed captures
 </span><span class="keyword">true</span>
-&gt; res
+&gt; <span class="function-name">res</span>
 {<span class="string">'jan'</span>,<span class="string">'smit'</span>}
-&gt; sip.match(<span class="string">'($q,$q)'</span>,<span class="string">'("jan", "smit")'</span>,res)
+&gt; sip.<span class="function-name">match</span>(<span class="string">'($q,$q)'</span>,<span class="string">'("jan", "smit")'</span>,res)
 <span class="keyword">false</span>   <span class="comment">---&gt; oops! Can't handle extra space!
-</span>&gt; sip.match(<span class="string">'( $q , $q )'</span>,<span class="string">'("jan", "smit")'</span>,res)
+</span>&gt; sip.<span class="function-name">match</span>(<span class="string">'( $q , $q )'</span>,<span class="string">'("jan", "smit")'</span>,res)
 <span class="keyword">true</span>
 </pre>
 
@@ -284,14 +284,14 @@ <h3>Simple Input Patterns</h3>
 
 
 <pre>
-&gt; sip.match(<span class="string">'( $q , $q ) $'</span>,<span class="string">'("jan", "smit") and a string'</span>,res)
+&gt; sip.<span class="function-name">match</span>(<span class="string">'( $q , $q ) $'</span>,<span class="string">'("jan", "smit") and a string'</span>,res)
 <span class="keyword">true</span>
-&gt; res
+&gt; <span class="function-name">res</span>
 {<span class="string">'jan'</span>,<span class="string">'smit'</span>,<span class="string">'and a string'</span>}
 &gt; res = {}
-&gt; sip.match(<span class="string">'( $q{first} , $q{last} ) $'</span>,<span class="string">'("jan", "smit") and a string'</span>,res)
+&gt; sip.<span class="function-name">match</span>(<span class="string">'( $q{first} , $q{last} ) $'</span>,<span class="string">'("jan", "smit") and a string'</span>,res)
 <span class="keyword">true</span>
-&gt; res
+&gt; <span class="function-name">res</span>
 {first=<span class="string">'jan'</span>,rest=<span class="string">'and a string'</span>,last=<span class="string">'smit'</span>}
 </pre>
 
@@ -325,7 +325,7 @@ <h3>Command-line Programs with Lapp</h3>
 <pre>
 <span class="comment">-- scale.lua
 </span>  lapp = <span class="global">require</span> <span class="string">'pl.lapp'</span>
-  <span class="keyword">local</span> args = lapp <span class="string">[[
+  <span class="keyword">local</span> args = <span class="function-name">lapp</span> <span class="string">[[
   Does some calculations
     -o,--offset (default 0.0)  Offset to add to scaled number
     -s,--scale  (number)  Scaling factor
@@ -379,12 +379,12 @@ <h3>Command-line Programs with Lapp</h3>
 
 <pre>
 <span class="keyword">local</span> lapp = <span class="global">require</span> <span class="string">'pl.lapp'</span>
-<span class="keyword">local</span> args = lapp <span class="string">[[
+<span class="keyword">local</span> args = <span class="function-name">lapp</span> <span class="string">[[
    --cmd (optional string) Command to run.
 ]]</span>
 
 <span class="keyword">if</span> args.cmd <span class="keyword">then</span>
-  <span class="global">os</span>.execute(args.cmd)
+  <span class="global">os</span>.<span class="function-name">execute</span>(args.cmd)
 <span class="keyword">end</span>
 </pre>
 
@@ -425,7 +425,7 @@ <h3>Command-line Programs with Lapp</h3>
 <pre>
 $ simple -o test -q simple.lua
 p       <span class="keyword">false</span>
-input   file (<span class="number">781</span>C1BD8)
+input   <span class="function-name">file</span> (<span class="number">781</span>C1BD8)
 quiet   <span class="keyword">true</span>
 o       test
 input_name      simple.lua
@@ -435,7 +435,7 @@ <h3>Command-line Programs with Lapp</h3>
 <span class="number">3</span>       three
 p       <span class="keyword">false</span>
 quiet   <span class="keyword">false</span>
-input   file (<span class="number">781</span>C1BD8)
+input   <span class="function-name">file</span> (<span class="number">781</span>C1BD8)
 o       test
 input_name      simple.lua
 </pre>
@@ -460,7 +460,7 @@ <h4>Enforcing a Range and Enumerations</h4>
 
 <pre>
 <span class="keyword">local</span> lapp = <span class="global">require</span> <span class="string">'pl.lapp'</span>
-<span class="keyword">local</span> args = lapp <span class="string">[[
+<span class="keyword">local</span> args = <span class="function-name">lapp</span> <span class="string">[[
     Setting ranges
     &lt;x&gt; (1..10)  A number from 1 to 10
     &lt;y&gt; (-5..1e6) Bigger range
@@ -483,13 +483,13 @@ <h4>Custom Types</h4>
 <pre>
 lapp = <span class="global">require</span> (<span class="string">'pl.lapp'</span>)
 
-lapp.add_type(<span class="string">'integer'</span>,<span class="string">'number'</span>,
+lapp.<span class="function-name">add_type</span>(<span class="string">'integer'</span>,<span class="string">'number'</span>,
     <span class="keyword">function</span>(x)
-        lapp.<span class="global">assert</span>(<span class="global">math</span>.ceil(x) == x, <span class="string">'not an integer!'</span>)
+        lapp.<span class="global">assert</span>(<span class="global">math</span>.<span class="function-name">ceil</span>(x) == x, <span class="string">'not an integer!'</span>)
     <span class="keyword">end</span>
 )
 
-<span class="keyword">local</span> args =  lapp <span class="string">[[
+<span class="keyword">local</span> args =  <span class="function-name">lapp</span> <span class="string">[[
     &lt;ival&gt; (integer) Process PID
 ]]</span>
 
@@ -506,11 +506,11 @@ <h4>Custom Types</h4>
 
 
 <pre>
-<span class="keyword">local</span> df = Date.Format()
+<span class="keyword">local</span> df = Date.<span class="function-name">Format</span>()
 
-lapp.add_type(<span class="string">'date'</span>,
+lapp.<span class="function-name">add_type</span>(<span class="string">'date'</span>,
     <span class="keyword">function</span>(s)
-        <span class="keyword">local</span> d,e = df:parse(s)
+        <span class="keyword">local</span> d,e = df:<span class="function-name">parse</span>(s)
         lapp.<span class="global">assert</span>(d,e)
         <span class="keyword">return</span> d
     <span class="keyword">end</span>
@@ -522,7 +522,7 @@ <h4>'varargs' Parameter Arrays</h4>
 
 <pre>
 lapp = <span class="global">require</span> <span class="string">'pl.lapp'</span>
-<span class="keyword">local</span> args = lapp <span class="string">[[
+<span class="keyword">local</span> args = <span class="function-name">lapp</span> <span class="string">[[
 Summing numbers
     &lt;numbers...&gt; (number) A list of numbers to be summed
 ]]</span>
@@ -547,7 +547,7 @@ <h4>'varargs' Parameter Arrays</h4>
 </span>
 lapp = <span class="global">require</span> (<span class="string">'pl.lapp'</span>)
 
-<span class="keyword">local</span> args = lapp <span class="string">[[
+<span class="keyword">local</span> args = <span class="function-name">lapp</span> <span class="string">[[
 Print the first few lines of specified files
    -n         (default 10)    Number of lines to print
    &lt;files...&gt; (default stdin) Files to print
@@ -565,7 +565,7 @@ <h4>'varargs' Parameter Arrays</h4>
         <span class="global">print</span>(<span class="string">'==&gt; '</span>..args.files_name[i]..<span class="string">' &lt;=='</span>)
     <span class="keyword">end</span>
     <span class="keyword">local</span> n = <span class="number">0</span>
-    <span class="keyword">for</span> line <span class="keyword">in</span> file:lines() <span class="keyword">do</span>
+    <span class="keyword">for</span> line <span class="keyword">in</span> file:<span class="function-name">lines</span>() <span class="keyword">do</span>
         <span class="global">print</span>(line)
         n = n + <span class="number">1</span>
         <span class="keyword">if</span> n == nline <span class="keyword">then</span> <span class="keyword">break</span> <span class="keyword">end</span>
@@ -597,14 +597,14 @@ <h4>'varargs' Parameter Arrays</h4>
 <span class="global">print</span>(vlevel)
 </pre>
 
-<p>The vlevel assigment is a bit of Lua voodoo, so consider the cases:</p>
+<p>The vlevel assignment is a bit of Lua voodoo, so consider the cases:</p>
 
 
 <pre>
-* No -v flag, v is just { <span class="keyword">false</span> }
-* One -v flags, v is { <span class="keyword">true</span> }
-* Two -v flags, v is { <span class="keyword">true</span>, <span class="keyword">true</span> }
-* Three -v flags, v is { <span class="keyword">true</span>, <span class="keyword">true</span>, <span class="keyword">true</span> }
+* No -v flag, v is <span class="function-name">just</span> { <span class="keyword">false</span> }
+* One -v flags, v <span class="function-name">is</span> { <span class="keyword">true</span> }
+* Two -v flags, v <span class="function-name">is</span> { <span class="keyword">true</span>, <span class="keyword">true</span> }
+* Three -v flags, v <span class="function-name">is</span> { <span class="keyword">true</span>, <span class="keyword">true</span>, <span class="keyword">true</span> }
 </pre>
 
 <h4>Defining a Parameter Callback</h4>
@@ -618,11 +618,11 @@ <h4>Defining a Parameter Callback</h4>
 <pre>
 lapp = <span class="global">require</span> (<span class="string">'pl.lapp'</span>)
 
-<span class="keyword">function</span> lapp.callback(parm,arg,args)
+<span class="keyword">function</span> lapp.<span class="function-name">callback</span>(parm,arg,args)
     <span class="global">print</span>(<span class="string">'+'</span>,parm,arg)
 <span class="keyword">end</span>
 
-<span class="keyword">local</span> args = lapp <span class="string">[[
+<span class="keyword">local</span> args = <span class="function-name">lapp</span> <span class="string">[[
 Testing parameter handling
     -p               Plain flag (defaults to false)
     -q,--quiet       Plain flag with GNU-style optional long name
@@ -653,9 +653,9 @@ <h4>Defining a Parameter Callback</h4>
 s       <span class="number">1</span>
 input_name      args.lua
 quiet   <span class="keyword">false</span>
-output  file (<span class="number">781</span>C1B98)
+output  <span class="function-name">file</span> (<span class="number">781</span>C1B98)
 start   <span class="number">10</span>
-input   file (<span class="number">781</span>C1BD8)
+input   <span class="function-name">file</span> (<span class="number">781</span>C1BD8)
 o       name
 n       <span class="number">2</span>
 </pre>
@@ -679,7 +679,7 @@ <h4>Slack Mode</h4>
 </span><span class="keyword">local</span> lapp = <span class="global">require</span> <span class="string">'pl.lapp'</span>
 <span class="keyword">local</span> pretty = <span class="global">require</span> <span class="string">'pl.pretty'</span>
 lapp.slack = <span class="keyword">true</span>
-<span class="keyword">local</span> args = lapp <span class="string">[[
+<span class="keyword">local</span> args = <span class="function-name">lapp</span> <span class="string">[[
 Does some calculations
    -v, --video              (string)             Specify input video
    -w, --width              (default 256)        Width of the video
@@ -692,7 +692,7 @@ <h4>Slack Mode</h4>
    -f4,--flag4              (default true)       A true flag
 ]]</span>
 
-pretty.dump(args)
+pretty.<span class="function-name">dump</span>(args)
 </pre>
 
 <p>And here we can see the output of <code>test.lua</code>:</p>
@@ -728,7 +728,7 @@ <h3>Simple Test Framework</h3>
 <pre>
 <span class="keyword">local</span> test = <span class="global">require</span> <span class="string">'pl.test'</span>
 
-test.asserteq({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30.1</span>})
+test.<span class="function-name">asserteq</span>({<span class="number">10</span>,<span class="number">20</span>,<span class="number">30</span>},{<span class="number">10</span>,<span class="number">20</span>,<span class="number">30.1</span>})
 
 <span class="comment">--~ test-test.lua:3: assertion failed
 </span><span class="comment">--~ got:    {
@@ -744,21 +744,21 @@ <h3>Simple Test Framework</h3>
 </span><span class="comment">--~ these values were not equal</span>
 </pre>
 
-<p>This covers most cases but it's also useful to compare strings using <a href="https://www.lua.org/manual/5.1/manual.html#pdf-string.match">string.match</a></p>
+<p>This covers most cases but it's also useful to compare strings using <a href="https://www.lua.org/manual/5.4/manual.html#pdf-string.match">string.match</a></p>
 
 
 <pre>
 <span class="comment">-- must start with bonzo the dog
-</span>test.assertmatch (<span class="string">'bonzo the dog is here'</span>,<span class="string">'^bonzo the dog'</span>)
+</span>test.<span class="function-name">assertmatch</span> (<span class="string">'bonzo the dog is here'</span>,<span class="string">'^bonzo the dog'</span>)
 <span class="comment">-- must end with an integer
-</span>test.assertmatch (<span class="string">'hello 42'</span>,<span class="string">'%d+$'</span>)
+</span>test.<span class="function-name">assertmatch</span> (<span class="string">'hello 42'</span>,<span class="string">'%d+$'</span>)
 </pre>
 
 <p>Since Lua errors are usually strings, this matching strategy is used to test 'exceptions':</p>
 
 
 <pre>
-test.assertraise(<span class="keyword">function</span>()
+test.<span class="function-name">assertraise</span>(<span class="keyword">function</span>()
     <span class="keyword">local</span> t = <span class="keyword">nil</span>
     <span class="global">print</span>(t.bonzo)
 <span class="keyword">end</span>,<span class="string">'nil value'</span>)
@@ -775,12 +775,12 @@ <h3>Simple Test Framework</h3>
 
 
 <pre>
-<span class="keyword">function</span> is_iden(str)
-    test.assertmatch(str,<span class="string">'^[%a_][%w_]*$'</span>,<span class="number">1</span>)
+<span class="keyword">function</span> <span class="function-name">is_iden</span>(str)
+    test.<span class="function-name">assertmatch</span>(str,<span class="string">'^[%a_][%w_]*$'</span>,<span class="number">1</span>)
 <span class="keyword">end</span>
 
-is_iden <span class="string">'alpha_dog'</span>
-is_iden <span class="string">'$dollars'</span>
+<span class="function-name">is_iden</span> <span class="string">'alpha_dog'</span>
+<span class="function-name">is_iden</span> <span class="string">'$dollars'</span>
 
 <span class="comment">--~ test-test.lua:33: assertion failed
 </span><span class="comment">--~ got:    "$dollars"
@@ -796,11 +796,11 @@ <h3>Simple Test Framework</h3>
 T = test.tuple
 
 <span class="comment">--- common error pattern
-</span><span class="keyword">function</span> failing()
+</span><span class="keyword">function</span> <span class="function-name">failing</span>()
     <span class="keyword">return</span> <span class="keyword">nil</span>,<span class="string">'failed'</span>
 <span class="keyword">end</span>
 
-test.asserteq(T(failing()),T(<span class="keyword">nil</span>,<span class="string">'failed'</span>))
+test.<span class="function-name">asserteq</span>(<span class="function-name">T</span>(<span class="function-name">failing</span>()),<span class="function-name">T</span>(<span class="keyword">nil</span>,<span class="string">'failed'</span>))
 </pre>
 
 
@@ -808,7 +808,7 @@ <h3>Simple Test Framework</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>
diff --git a/docs/manual/09-discussion.md.html b/docs/manual/09-discussion.md.html
index 4e7dd690..ad19e961 100644
--- a/docs/manual/09-discussion.md.html
+++ b/docs/manual/09-discussion.md.html
@@ -139,7 +139,7 @@ <h3>Modularity and Granularity</h3>
 
 <p>This is the style that I follow in Penlight itself, so that modules don't mess
 with the global environment; also, <code>stringx.import()</code> is not used because it will
-update the global <a href="https://www.lua.org/manual/5.1/manual.html#5.4">string</a> table.</p>
+update the global <a href="https://www.lua.org/manual/5.4/manual.html#6.4">string</a> table.</p>
 
 <p>But <code>require &apos;pl&apos;</code> is more convenient in scripts; the question is how to ensure
 that one doesn't load the whole kitchen sink as the price of convenience. The
@@ -226,7 +226,7 @@ <h3>Defining what is Callable</h3>
 </div> <!-- id="content" -->
 </div> <!-- id="main" -->
 <div id="about">
-<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
+<i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.5.0</a></i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>