Removed dot for page

fadado · Dec 2, 2018 · 40da1b4 · 40da1b4
1 parent 31f7695
commit 40da1b4
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 44 deletions.
diff --git a/bin/jqt b/bin/jqt
@@ -269,24 +269,25 @@ function convert
     echo '# vim:tabstop=2:syntax=jq'
 
     # jq modules
-    for module in ${!INCLUDES[@]}; do
-        echo "include \"${INCLUDES[$module]}\";"
-    done
     for module in ${!IMPORTS[@]}; do
         # remove .json suffix if present
         local basename="${IMPORTS[$module]}"
         basename=${basename%.json}
         echo "import \"${basename}\" as \$${module};"
     done
-
-    # $jqt as a global reference to '.'
-    echo '. as $jqt |'
+    for module in ${!INCLUDES[@]}; do
+        echo "include \"${INCLUDES[$module]}\";"
+    done
 
     # define helper functions for JSON modules
     for module in ${!IMPORTS[@]}; do
         [[ ${IMPORTS[$module]} == *.json ]] || continue
         echo "def ${module}: \$${module}::${module}[0];"
     done
+
+    # $jqt as a global reference to '.'
+    echo '. as $jqt |'
+
     # convert template to script
     sed -e '
 :RAW

diff --git a/docs/Sakefile b/docs/Sakefile
@@ -36,7 +36,7 @@ ifdef __build
 #JQTFLAGS += ...
 
 # Add some Pandoc options
-JQTFLAGS += -5 --toc-depth=4
+JQTFLAGS += -5 --toc-depth=4 #-S
 
 ########################################################################
 # experimental

diff --git a/docs/blocks/content/markup.html b/docs/blocks/content/markup.html
@@ -2,7 +2,7 @@
  # Content
  ######################################################################>&
 <article class="$content">
-  {{._content}}
+  {{$jqt._content}}
 </article>
 <#
 vim:ts=2:sw=2:ai:et:fileencoding=utf8:syntax=html

diff --git a/docs/blocks/filters.jq b/docs/blocks/filters.jq
@@ -2,23 +2,13 @@
 # Extra filters for this site
 #
 
-#import "pages-by-id" as $pages;
-#import "phase1_site" as $site;
-
 # Remove XML tags
 def striptags:
     # warning: algorithm too simplistic
     gsub("<[^>]*>"; "")
 ;
 
-#def site: $site::site[0];
-#def pages: $pages::pages[0];
-
-#def pages($section):
-#  [$pages::pages[0][] | select(.Section=="blog")]
-#;
-
-def sections($pages):
+def sections:
     # . as $pages
     map(.section)
     | unique

diff --git a/docs/blocks/menu-bar/markup.html b/docs/blocks/menu-bar/markup.html
@@ -3,9 +3,9 @@
  ######################################################################>&
 <ol class="menu-bar">
 {% site.menu[] %}
-  <li class='menu-bar__item {{if .==$jqt.page.Id then "menu-bar__item_current" else "" end}}'>
-    {% (. as $id | pages[] | select($id == .Id)) as $page %}
-    <a href="{{$jqt.page.Base}}{{$page.URL}}">{{$page.name}}</a>
+  <li class='menu-bar__item {{if .==page.Id then "menu-bar__item_current" else "" end}}'>
+    {% (. as $id | pages[] | select($id == .Id)) as $p %}
+    <a href="{{page.Base}}{{$p.URL}}">{{$p.name}}</a>
     {% end %}
   </li>
 {% end %}

diff --git a/docs/blocks/repository/markup.html b/docs/blocks/repository/markup.html
@@ -6,6 +6,7 @@
   <li class="repository__section"><a href="https://github.com/fadado/jqt/issues">issues</a></li>
   <li class="repository__section"><a href="https://github.com/fadado/jqt/wiki">wiki</a></li>
   <li class="repository__section"><a href="https://github.com/fadado/jqt/releases">releases</a></li>
+  <li class="repository__section"><a href="#">top</a></li>
 </ol>
 <#
 vim:ts=2:sw=2:ai:et:fileencoding=utf8:syntax=html

diff --git a/docs/blocks/toc/markup.html b/docs/blocks/toc/markup.html
@@ -3,7 +3,7 @@
  ######################################################################>&
 <nav class="#panel -side-right toc">
   <p class="toc__title">{{.snippets."toc-title"}}</p>
-  {{._toc}}
+  {{$jqt._toc}}
 </nav>
 <#
 vim:ts=2:sw=2:ai:et:fileencoding=utf8:syntax=html

diff --git a/docs/content/EXAMPLE.txt b/docs/content/EXAMPLE.txt
@@ -3,21 +3,21 @@
  #>&
 
 ```
-<html lang='{{.page.lang//.site.lang}}'>
+<html lang='{{page.lang//site.lang}}'>
 <head>
-    <title>{{.page.title | gsub("<[^>]*>"; "")}}</title>
+    <title>{{page.title | gsub("<[^>]*>"; "")}}</title>
     {# include files in preprocessing stage: #}
     <%include "head.html">
-    <meta name="generator" content="jqt v{{.site.version}}"/>
+    <meta name="generator" content="jqt v{{site.version}}"/>
     {# optional line: #}
-    <meta name='dcterms.modified' content='{{.page.updated//empty}}' />
+    <meta name='dcterms.modified' content='{{page.updated//empty}}' />
     {# implicit loop for all authors: #}
-    {% .page.author | sort[] %}<meta name='author' content='{{.}}' />
+    {% page.author | sort[] %}<meta name='author' content='{{.}}' />
 </head>
 <body>
-    <h1>{{.page.title}}</h1>
+    <h1>{{page.title}}</h1>
     <div id="CONTENT">
-        {{.page._content}}
+        {{page._content}}
     </div>
     {# macro calls: #}
     <%partial analytics 'UA-82432866-1'>

diff --git a/docs/content/opt/j.txt b/docs/content/opt/j.txt
@@ -1,5 +1,6 @@
--j MODULE:NAME
-:   Imports the jq *MODULE* in the render stage.
+-j NAME:MODULE
+:   Imports the jq *MODULE* in the render stage and define helper function
+named *NAME* if *MODULE* has the suffix `.json`.
 <#
 vim:ts=4:sw=4:ai:et:fileencoding=utf8:syntax=markdown
 #>
diff --git a/docs/content/structure.md b/docs/content/structure.md
@@ -109,7 +109,7 @@ you can put this conditional macro call to define a default title block:
 
 ```
 <%ifndef HEAD_TITLE>
-    <title>{{.page.title}}</title> {# default block #}
+    <title>{{page.title}}</title> {# default block #}
 <%else><%call HEAD_TITLE><%endif>
 ```
 
@@ -118,7 +118,7 @@ before include the base template:
 
 ```
 <%define HEAD_TITLE
-  <title>{{.page.title}} – {{.site.title}}</title>
+  <title>{{page.title}} – {{site.title}}</title>
 >
 <%include default.html>
 ```

diff --git a/docs/layouts/default.html b/docs/layouts/default.html
@@ -1,25 +1,25 @@
 <# Top-level page markup #>&
 <!DOCTYPE html>
 <!-- this document uses polyglot markup (well formed XHTML5)  -->
-<html id="{{.page.Id}}" xmlns="http://www.w3.org/1999/xhtml" lang="{{.page.lang//site.lang}}" xml:lang="{{.page.lang//site.lang}}">
+<html id="{{page.Id}}" xmlns="http://www.w3.org/1999/xhtml" lang="{{page.lang//site.lang}}" xml:lang="{{page.lang//site.lang}}">
   <head>
 <#
  #  Meta elements
  #>
     <meta charset="utf-8" />
 <# Document title and related metadata #>
-    <title>jqt · {{.page.title}}</title>
-    <meta name='description' content='{{.page.description//empty}}' />
-    <meta name='keywords' content='{{.page.keywords//empty}}' />
-    <meta name='author' content='{{[(.page.author//site.author)[].name] | sort[]}}' />
+    <title>jqt · {{page.title}}</title>
+    <meta name='description' content='{{page.description//empty}}' />
+    <meta name='keywords' content='{{page.keywords//empty}}' />
+    <meta name='author' content='{{[(page.author//site.author)[].name] | sort[]}}' />
 <# More metadata #>
     <meta name="generator" content="jqt v{{site.version}}" />
-    <meta name='dcterms.date' content='{{.page.updated//empty}}' />
+    <meta name='dcterms.date' content='{{page.updated//empty}}' />
 <# Presentation #>
-    <link rel="shortcut icon" href="{{.page.Base}}favicon.ico"/>
+    <link rel="shortcut icon" href="{{page.Base}}favicon.ico"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
-    <link rel="stylesheet" type="text/css" href="{{.page.Base}}styles.css"/>
-    {{._highlight}}
+    <link rel="stylesheet" type="text/css" href="{{page.Base}}styles.css"/>
+    {{$jqt._highlight}}
   </head>
 <#
  #  Document body

diff --git a/share/sake.d/phase3.jq b/share/sake.d/phase3.jq
@@ -35,7 +35,7 @@ def flags:
 ;
 
 def page:
-    " -mpage:\($Meta)/pages/\(.Id).json"
+    " -jpage:pages/\(.Id).json"
 ;
 
 # %.html: _site/%.html ;