Add data url

nntrn · Oct 1, 2024 · 60ba5ec · 60ba5ec
1 parent 807274f
commit 60ba5ec
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/_includes/breadcrumb.html b/_includes/breadcrumb.html
@@ -1,7 +1,7 @@
 {%- assign crumbs = page.url | split: '/'  -%}
 {%- for crumb in crumbs -%}
   {%- if forloop.last -%}
-  <span>&#47;{{crumb}}</strong>
+  <span>&#47;{{crumb|replace:".html",""}}</strong>
   {% elsif forloop.first %}
   <a href="{{ '/' | relative_url}}">home</a>
   {%- else -%}

diff --git a/_includes/docs.css b/_includes/docs.css
@@ -28,6 +28,7 @@ a:hover{color:#222}
 .mark q{background:var(--bs-highlight-bg)}
 .muted{color:#656d76}
 .gray{color:#aaa}
+.accent{color:rgba(var(--bs-primary-rgb),.5)}
 .sans-serif{font-family:var(--bs-font-sans-serif)}
 .serif{font-family:var(--bs-font-serif)}
 .pre{white-space:pre}

diff --git a/_layouts/book.html b/_layouts/book.html
@@ -15,6 +15,8 @@ <h3 class="h5">{{page.author}}</h3>
     <span>{{annotations.size}} annotation{% if annotations.size > 1 %}s{%- endif -%}</span>
     <span class="accent">&bull;</span>
     <span><span title="Created">{{pagecreated}}</span>{%- if pagemodified != pagecreated -%}&nbsp;&ndash;&nbsp;<span title="Modified">{{pagemodified}}</span>{%- endif %}</span>
+    <span class="accent">&bull;</span>
+    <a class="muted" href="{{site.baseurl}}/api/{{page.assetid}}.json">data</a>
   </div>
   <hr>
   <section class="d-flex gap-sm-3 gap-lg-5">

diff --git a/_layouts/default.html b/_layouts/default.html
@@ -30,8 +30,8 @@
 </head>
 <body data-layout="{{site.font_family}}">
 <div class="container">
-  <header class="my-2 d-flex flex-column gap-2">
-    <div class="d-flex justify-content-between align-items-baseline">
+  <header class="mt-2 d-flex flex-column gap-2 mb-3">
+    <div class="d-flex justify-content-between align-items-baseline flex-wrap">
       <h1 class="h1 site-title"><a href="{{ '/' | relative_url }}">{{site.title}}</a></h1>
       <div class="d-flex gap-2 smaller">
       {%- for link in site.links %}

diff --git a/_layouts/genre.html b/_layouts/genre.html
@@ -7,11 +7,11 @@
 <h2>{{page.tag|replace: "-"," "}}</h2>
   <ul style="width:90%" class="d-flex flex-column gap-3">
     {%- for book in booklist %}
-    <li class="small">
+    <li class="small text-mute">
       <h3 class="h6"><a href="{{book.slug}}">{{book.title}}</a> by {{book.author|split: ","|first}}</h3>
-      <span class="text-muted">last read on <time>{{book.modified|date: '%b %e %Y'}}</time></span>
-      <span class="red">&nbsp;/&nbsp;</span>
-      <span>{{book.count}} annotation{% if book.count > 1 %}s{%- endif -%}</span>
+      <span>last read on <time>{{book.modified|date: '%b %e %Y'}}</time></span>
+      <span>&nbsp;/&nbsp;</span>
+      <span class="accent">{{book.count}} annotation{% if book.count > 1 %}s{%- endif -%}</span>
     </li>
     {%- endfor %}
   </ul>

diff --git a/scripts/books.jq b/scripts/books.jq
@@ -83,24 +83,25 @@ def identify_subsection:
 
 def getnum($str): $str
   | gsub("(?<w>[^0-9])(?<n>[0-9]+)";.w + " " + .n)
-  | [match("(\\b[0-9]+)";"g").string|tonumber]|last|tostring;
+  | [match("(\\b[0-9]+)";"g").string|tonumber]|first|tostring;
 
 def format_chapter:
   ([.]|flatten|unique) as $input
   | ($input | join(" ")
-  | gsub("x?[0-9]{8,}"; .n; "x")) as $str
+  | gsub("x?[0-9 ]{8,}"; ""; "x")) as $str
   | $str | 
-  if test("[cC][chapter]{1,}") or test("^[cC].*([0-9]+)") then  "Chapter " + getnum($str) 
+  if test("[cC][chapter]{1,}";"i") then  "Chapter " + getnum($input|map(select("^[cChapter]{2,}"))|first)
   elif test("toc_marker") then getnum($str)
   else 
     $str 
     | gsub("(epub|EPUB|[[:punct:]]?xhtml|html|ji[0-9]+|sup[0-9]+|nav_|div[0-9]+)"; "")
     | gsub("^[^a-zA-Z0-9]+";"")
+    # | if ($input[0]| test("^[cC][chapter]{1,}")) then  "Chapter " + getnum($str) 
   end
   ;
 
 def format_location:
   [match("\\[([^\\]]+)\\]+";"g").captures[].string] as $raw 
   | ($raw|join(" ")|identify_subsection) as $sec
-  | (if $sec then $sec  else ($raw|format_chapter) end)
+  | (if $sec then $sec  else ($raw|first|format_chapter) end)
   ;