jekyll-theme-paperwiki 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccafbae2594b3e26ca40574057a535540860cdfab82ad62d47cbeed13ccc3427
-  data.tar.gz: ef2323e18fe4d2f3819459bcfb0866ed38366c1d92da8cd010f48e2fbd266180
+  metadata.gz: b16cb2fa02d1728ccf3bd09ecb7638fa42c0a0243e93a84c91ab4a383416f4c0
+  data.tar.gz: b5dde0f6bbb1021bba6b9644a47a3d8a55f2a92e2b18a72c3a6f78ea6036c6af
 SHA512:
-  metadata.gz: c31c58b6e6a115360b9561cec521815ba98036eeb37d0fcf0873808f29b8e6563ebfa9ef4d56e171c67c377d89b7d195612eb03088c3bde1d8eb77584f4735bc
-  data.tar.gz: 8b540673b1a01905b6259c47c73677737cb76373f3e20526896b724a8c2c858a66777b5239ecd3576deb85df2113cb33ce94b06c85e62ead2904cf0a88fecfc8
+  metadata.gz: f4688f18aeb4133788850b20ae6c6a63f9d46694cc7f6ed74b5ca36d179fa4fc8017088118048971f16d4fa71434d3621c08fee169a187895672c18523728bcb
+  data.tar.gz: 5ac735c63413c3a22606e40dfd46d58286c25a61109a0193dd84c4dc09c9dae1420bba6959b1879059d02c3456fb06be7a9a5ae6567a4a87bff2847fe5b36570

data/_includes/random_redirect.html

@@ -0,0 +1,25 @@
+<script type="text/javascript">
+
+   var urls=[];
+
+   {% for doc in docs -%}
+      urls.push("{{ doc.url | absolute_url }}");
+   {% endfor -%}
+
+   var url = urls[Math.floor(Math.random()*urls.length)];
+
+   var link = document.createElement('link');
+   link.setAttribute('rel', 'canonical');
+   link.setAttribute('href', url);
+   document.head.appendChild(link);
+
+   if (typeof IE_fix != "undefined") {
+      document.write("Redirecting...");
+      var referLink = document.createElement("a");
+      referLink.href = url;
+      document.body.appendChild(referLink);
+      referLink.click();
+   } else {
+      window.location.replace(url);
+   }
+</script>

data/_layouts/random.html

@@ -5,41 +5,10 @@
    layout: page
 ---
 
-{%- assign docs = site.posts -%}
+{%- assign docs = site.documents -%}
 
-{%- if site.random_redirect.pages == true -%}
-  {%- assign pages = site.documents | where_exp:"page","page.url != '/random/'" -%}
-  {%- assign docs = docs | concat: pages -%}
+{%- if site.random_redirect.posts == true -%}
+  {%- assign docs = docs | concat: site.posts -%}
 {%- endif -%}
 
-{%- if site.random_redirect.documents == true -%}
-  {%- assign docs = docs | concat: site.documents | uniq -%}
-{%- endif -%}
-
-<!---Fix this so the collections random links are scoped to only that collection--->
-
-   <script type="text/javascript">
-
-      var urls=[];
-
-      {% for doc in docs -%}
-         urls.push("{{ doc.url | absolute_url }}");
-      {% endfor -%}
-
-      var url = urls[Math.floor(Math.random()*urls.length)];
-
-      var link = document.createElement('link');
-      link.setAttribute('rel', 'canonical');
-      link.setAttribute('href', url);
-      document.head.appendChild(link);
-
-      if (typeof IE_fix != "undefined") {
-         document.write("Redirecting...");
-         var referLink = document.createElement("a");
-         referLink.href = url;
-         document.body.appendChild(referLink);
-         referLink.click();
-      } else {
-         window.location.replace(url);
-      }
-   </script>
+{% include random_redirect.html %}

data/_layouts/random_collection.html

@@ -0,0 +1,12 @@
+---
+   # Jekyll page that redirects to a random page, post or document
+   # https://github.com/jekylltools/jekyll-random-redirect
+   # v1.6
+   layout: page
+---
+
+{% assign project = page.project %}
+
+{%- assign docs = site.documents | where_exp: "page","page.collection == project" -%}
+
+{% include random_redirect.html %}

data/_layouts/search_collection.html

@@ -0,0 +1,16 @@
+---
+   layout: search
+---
+
+{% assign project = page.project %}
+
+{%- assign docs = site.documents | where_exp: "page","page.collection == project" -%}
+
+<script>
+   window.pages = {
+      {% for page in docs %}
+         {% include search_results.html %}
+      {% unless forloop.last %},{% endunless %}
+      {% endfor %}
+   };
+</script>

data/_sass/partials/_glossing.scss

@@ -5,14 +5,23 @@
 
 .interlinear_gloss {
    border-collapse: collapse;
+   border: 0;
    margin-left: 3%;
    margin-top: 0;
    margin-bottom: 1.75rem;
+   tr {
+      border: 0;
+   }
+   tr:nth-child(even) {
+      background-color: transparent;
+   }
    td {
-      padding: 0 0 0 1em;
+      padding: 0.5em;
+      border: 0;
    }
    td:first-child {
-      border-left: 4px solid $color-pistachio;
+      border-left: 0.5em solid $color-pistachio;
+      padding-left: 1em;
    }
 }
 

data/assets/js/lunr.unicodeNormalizer.ts

@@ -0,0 +1,162 @@
+import * as lunr from "lunr";
+
+/*!
+ * lunr.unicodeNormalizer
+ * by Chris Van <cvan>, 2014
+ * Extension for lunr.js <http://lunrjs.com/>
+ * Includes code from https://github.com/dodo/node-slug/blob/master/slug.js
+ */
+
+const charmap: {[inchar: string]: string} = {
+  // Latin & IPA
+  'À': 'A', 'Á': 'A', 'Â': 'A', 'Ã': 'A', 'Ā': 'A', 'Ȧ': 'A', 'Ä': 'A',
+  'Å': 'A', 'Ǎ': 'A', 'Ą': 'A', 'Ạ': 'A', 'Æ': 'AE', 'Ḃ': 'B', 'Ḅ': 'B',
+  'Ç': 'C', 'Ć': 'C', 'Ĉ': 'C', 'Č': 'C', 'Ċ': 'C', 'Ḋ': 'D', 'Ḍ': 'D',
+  'Ḏ': 'D', 'Ď': 'D', 'Ð': 'D', 'È': 'E', 'É': 'E', 'Ê': 'E', 'Ẽ': 'E',
+  'Ē': 'E', 'Ė': 'E', 'Ë': 'E', 'Ě': 'E', 'Ẹ': 'E', 'Ę': 'E', 'Ǵ': 'G',
+  'Ĝ': 'G', 'Ġ': 'G', 'Ǧ': 'G', 'Ĥ': 'H', 'Ȟ': 'H', 'Ḥ': 'H', 'Ì': 'I',
+  'Í': 'I', 'Î': 'I', 'Ĩ': 'I', 'Ī': 'I', 'İ': 'I', 'Ï': 'I', 'Ǐ': 'I',
+  'Ị': 'I', 'Į': 'I', 'Ḱ': 'K', 'Ǩ': 'K', 'Ḵ': 'K', 'Ḳ': 'K', 'Ĺ': 'L',
+  'Ḻ': 'L', 'Ḷ': 'L', 'Ḿ': 'M', 'Ṁ': 'M', 'Ṃ': 'M', 'Ǹ': 'N', 'Ń': 'N',
+  'Ñ': 'N', 'Ṅ': 'N', 'Ň': 'N', 'Ŋ': 'N', 'Ɲ': 'N', 'Ṇ': 'N', 'Ò': 'O',
+  'Ó': 'O', 'Ô': 'O', 'Õ': 'O', 'Ō': 'O', 'Ȯ': 'O', 'Ö': 'O', 'Ő': 'O',
+  'Ǫ': 'O', 'Ọ': 'O', 'Ɔ': 'O', 'Ø': 'O', 'Ŕ': 'R', 'Ṙ': 'R', 'Ř': 'R',
+  'Ṛ': 'R', 'Ś': 'S', 'Ŝ': 'S', 'Ṡ': 'S', 'Ṣ': 'S', 'Ș': 'S', 'Ş': 'S',
+  'Ṭ': 'T', 'Ț': 'T', 'Ţ': 'T', 'Ù': 'U', 'Ú': 'U', 'Û': 'U', 'Ũ': 'U',
+  'Ū': 'U', 'Ü': 'U', 'Ű': 'U', 'Ǔ': 'U', 'Ụ': 'U', 'Ṳ': 'U', 'Ų': 'U',
+  'Ẁ': 'W', 'Ẃ': 'W', 'Ŵ': 'W', 'Ẉ': 'W', 'Ỳ': 'Y', 'Ý': 'Y', 'Ŷ': 'Y',
+  'Ỹ': 'Y', 'Ȳ': 'Y', 'Ẏ': 'Y', 'Ÿ': 'Y', 'Ź': 'Z', 'Ẑ': 'Z', 'Ż': 'Z',
+  'Ž': 'Z', 'Ẓ': 'Z', 'Ẕ': 'Z', 'Þ': 'TH', 'ß': 'ss',
+  'à': 'a', 'á': 'a', 'â': 'a', 'ã': 'a', 'ā': 'a', 'ȧ': 'a', 'ä': 'a',
+  'å': 'a', 'ǎ': 'a', 'ą': 'a', 'ạ': 'a', 'ɑ': 'a', 'ɐ': 'a', 'ɒ': 'a',
+  'æ': 'ae',
+  'ç': 'c', 'è': 'e', 'é': 'e', 'ê': 'e', 'ë': 'e', 'ì': 'i', 'í': 'i',
+  'î': 'i', 'ï': 'i', 'ð': 'd', 'ñ': 'n', 'ò': 'o', 'ó': 'o', 'ô': 'o',
+  'õ': 'o', 'ö': 'o', 'ő': 'o', 'ø': 'o', 'ù': 'u', 'ú': 'u', 'û': 'u',
+  'ü': 'u', 'ű': 'u', 'ý': 'y', 'þ': 'th', 'ÿ': 'y', 'ẞ': 'SS',
+
+  // Greek
+  'Α': 'A', 'Β': 'B', 'Γ': 'G', 'Δ': 'D', 'Ε': 'E', 'Ζ': 'Z', 'Η': 'H',
+  'Θ': '8', 'Ι': 'I', 'Κ': 'K', 'Λ': 'L', 'Μ': 'M', 'Ν': 'N', 'Ξ': '3',
+  'Ο': 'O', 'Π': 'P', 'Ρ': 'R', 'Σ': 'S', 'Τ': 'T', 'Υ': 'Y', 'Φ': 'F',
+  'Χ': 'X', 'Ψ': 'PS', 'Ω': 'W',
+  'Ά': 'A', 'Έ': 'E', 'Ί': 'I', 'Ό': 'O', 'Ύ': 'Y', 'Ή': 'H', 'Ώ': 'W',
+  'Ϊ': 'I', 'Ϋ': 'Y',
+  'α': 'a', 'β': 'b', 'γ': 'g', 'δ': 'd', 'ε': 'e', 'ζ': 'z', 'η': 'h',
+  'θ': '8', 'ι': 'i', 'κ': 'k', 'λ': 'l', 'μ': 'm', 'ν': 'n', 'ξ': '3',
+  'ο': 'o', 'π': 'p', 'ρ': 'r', 'σ': 's', 'τ': 't', 'υ': 'y', 'φ': 'f',
+  'χ': 'x', 'ψ': 'ps', 'ω': 'w',
+  'ά': 'a', 'έ': 'e', 'ί': 'i', 'ό': 'o', 'ύ': 'y', 'ή': 'h', 'ώ': 'w',
+  'ς': 's', 'ϊ': 'i', 'ΰ': 'y', 'ϋ': 'y', 'ΐ': 'i',
+
+  // Turkish
+  'Ş': 'S', 'İ': 'I', 'Ğ': 'G',
+  'ş': 's', 'ı': 'i', 'ğ': 'g',
+
+  // Russian
+  'А': 'A', 'Б': 'B', 'В': 'V', 'Г': 'G', 'Д': 'D', 'Е': 'E', 'Ё': 'Yo',
+  'Ж': 'Zh', 'З': 'Z', 'И': 'I', 'Й': 'J', 'К': 'K', 'Л': 'L', 'М': 'M',
+  'Н': 'N', 'О': 'O', 'П': 'P', 'Р': 'R', 'С': 'S', 'Т': 'T', 'У': 'U',
+  'Ф': 'F', 'Х': 'H', 'Ц': 'C', 'Ч': 'Ch', 'Ш': 'Sh', 'Щ': 'Sh', 'Ъ': 'U',
+  'Ы': 'Y', 'Ь': '', 'Э': 'E', 'Ю': 'Yu', 'Я': 'Ya',
+  'а': 'a', 'б': 'b', 'в': 'v', 'г': 'g', 'д': 'd', 'е': 'e', 'ё': 'yo',
+  'ж': 'zh', 'з': 'z', 'и': 'i', 'й': 'j', 'к': 'k', 'л': 'l', 'м': 'm',
+  'н': 'n', 'о': 'o', 'п': 'p', 'р': 'r', 'с': 's', 'т': 't', 'у': 'u',
+  'ф': 'f', 'х': 'h', 'ц': 'c', 'ч': 'ch', 'ш': 'sh', 'щ': 'sh', 'ъ': 'u',
+  'ы': 'y', 'ь': '', 'э': 'e', 'ю': 'yu', 'я': 'ya',
+
+  // Ukranian
+  'Є': 'Ye', 'І': 'I', 'Ї': 'Yi', 'Ґ': 'G',
+  'є': 'ye', 'і': 'i', 'ї': 'yi', 'ґ': 'g',
+
+  // Czech
+  'Č': 'C', 'Ď': 'D', 'Ě': 'E', 'Ň': 'N', 'Ř': 'R', 'Š': 'S', 'Ť': 'T',
+  'Ů': 'U', 'Ž': 'Z',
+  'č': 'c', 'ď': 'd', 'ě': 'e', 'ň': 'n', 'ř': 'r', 'š': 's', 'ť': 't',
+  'ů': 'u', 'ž': 'z',
+
+  // Polish
+  'Ą': 'A', 'Ć': 'C', 'Ę': 'e', 'Ł': 'L', 'Ń': 'N', 'Ś': 'S', 'Ź': 'Z',
+  'Ż': 'Z',
+  'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ś': 's', 'ź': 'z',
+  'ż': 'z',
+
+  // Latvian
+  'Ā': 'A', 'Ē': 'E', 'Ģ': 'G', 'Ī': 'i', 'Ķ': 'k', 'Ļ': 'L', 'Ņ': 'N',
+  'Ū': 'u',
+  'ā': 'a', 'ē': 'e', 'ģ': 'g', 'ī': 'i', 'ķ': 'k', 'ļ': 'l', 'ņ': 'n',
+  'ū': 'u',
+
+  // Currency
+  '€': 'euro', '₢': 'cruzeiro', '₣': 'french franc', '£': 'pound',
+  '₤': 'lira', '₥': 'mill', '₦': 'naira', '₧': 'peseta', '₨': 'rupee',
+  '₩': 'won', '₪': 'new shequel', '₫': 'dong', '₭': 'kip', '₮': 'tugrik',
+  '₯': 'drachma', '₰': 'penny', '₱': 'peso', '₲': 'guarani',
+  '₳': 'austral', '₴': 'hryvnia', '₵': 'cedi', '¢': 'cent', '¥': 'yen',
+  '元': 'yuan', '円': 'yen', '﷼': 'rial', '₠': 'ecu', '¤': 'currency',
+  '฿': 'baht', "$": 'dollar', '₹': 'indian rupee',
+
+  // Symbols
+  '©': '(c)', 'œ': 'oe', 'Œ': 'OE', '∑': 'sum', '®': '(r)', '†': '+',
+  '“': '"', '”': '"', '‘': "'", '’': "'", '∂': 'd', 'ƒ': 'f', '™': 'tm',
+  '℠': 'sm', '…': '...', '˚': 'o', 'º': 'o', 'ª': 'a', '•': '*',
+  '∆': 'delta', '∞': 'infinity', '♥': 'love', '&': 'and', '|': 'or',
+  '<': 'less', '>': 'greater'
+};
+const charmapPattern = Object.keys(charmap).map(function(char) {
+  // Update this with every normalized character that is also a unicode
+  // operator.
+  return char.replace(/[\|\$]/g, '\\$&');  // `$&` -> returns matched text
+}).join('|');
+const charmapRegExp = new RegExp('(' + charmapPattern + ')', 'g');
+
+function unicodeFolder(str: string) {
+  return str.replace(charmapRegExp, function(char: string) {
+    return charmap[char];
+  });
+}
+
+export default function patchLunr(lunrmod: any) {
+  var tokenizer = function(obj: any, metadata: any) {
+    if (!arguments.length || obj === null || obj === undefined) return [];
+    if (Array.isArray(obj)) {
+      return obj.map(function(t) {
+        return new lunrmod.Token(
+          unicodeFolder(lunrmod.utils.asString(t)).toLowerCase(),
+          lunrmod.utils.clone(metadata))
+      });
+    }
+    var str = obj.toString(), len = str.length, tokens = []
+
+    for (var sliceEnd = 0, sliceStart = 0; sliceEnd <= len; sliceEnd++) {
+      var char = str.charAt(sliceEnd),
+      sliceLength = sliceEnd - sliceStart
+
+      if ((char.match(lunrmod.tokenizer.separator) || sliceEnd == len)) {
+
+        if (sliceLength > 0) {
+          var tokenMetadata = lunrmod.utils.clone(metadata) || {}
+          tokenMetadata["position"] = [sliceStart, sliceLength]
+          tokenMetadata["index"] = tokens.length
+
+          tokens.push(
+            new lunrmod.Token (
+              unicodeFolder(str.slice(sliceStart, sliceEnd)).toLowerCase(),
+              tokenMetadata
+            )
+          )
+        }
+
+        sliceStart = sliceEnd + 1
+      }
+    }
+
+    return tokens
+  }
+
+  for (const attr in lunrmod.tokenizer){
+    // @ts-ignore
+    tokenizer[attr] = lunrmod.tokenizer[attr];
+  }
+  lunrmod.tokenizer = tokenizer;
+}

data/assets/js/search.js

@@ -1,20 +1,26 @@
 // Yoinked in its entirety from https://davidwalsh.name/adding-search-to-your-site-with-javascript and https://trackjs.com/blog/site-search-with-javascript-part-2/
 
-// var lunrFolding = require("lunr-folding")(lunr);
+//var lunr = require("lunr")
+//require("lunr.unicodeNormalizer")(lunr)
 
 // Build the search index
 var searchIndex = lunr(function() {
+//   this.use("lunr.unicodeNormalizer")
    // Define searchable fields for each page
    this.ref("id");
    this.field("title", { boost: 100 }); // Boost the importance of the title field, prioritizing title matches
-   this.field("content", { boost: 10 });
-   this.field("portal");
-   this.field("categories");
+   this.field("content", { boost: 50 });
+   this.field("portal", { boost: 10 });
+   this.field("categories", { boost: 10 });
+   this.field("tags", { boost: 10 });
    for (var key in window.pages) { // Loop through all pages to add their data to the search index
       this.add({
          "id": key,
          "title": pages[key].title,
-         "content": pages[key].content
+         "content": pages[key].content,
+         "portal": pages[key].portal,
+         "categories": pages[key].categories,
+         "tags": pages[key].tags
       });
    }
 });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-paperwiki
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - pomeloshark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-11 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -39,6 +39,7 @@ files:
 - _includes/global_footer.html
 - _includes/global_head.html
 - _includes/global_header.html
+- _includes/random_redirect.html
 - _includes/search_results.html
 - _includes/wiki_sidebar.html
 - _layouts/collections.html
@@ -50,8 +51,10 @@ files:
 - _layouts/portal.html
 - _layouts/post.html
 - _layouts/random.html
+- _layouts/random_collection.html
 - _layouts/reference_desk.html
 - _layouts/search.html
+- _layouts/search_collection.html
 - _layouts/search_global.html
 - _layouts/wiki.html
 - _layouts/work.html
@@ -70,7 +73,6 @@ files:
 - _sass/variables/_fonts.scss
 - _sass/variables/_media-queries.scss
 - _sass/variables/_misc.scss
-- assets/.DS_Store
 - assets/css/css.scss
 - assets/fonts/Inter/.DS_Store
 - assets/fonts/Inter/Inter-Bold.otf
@@ -2381,6 +2383,7 @@ files:
 - assets/images/favicon.png
 - assets/images/homepage.png
 - assets/js/lunr.js
+- assets/js/lunr.unicodeNormalizer.ts
 - assets/js/search.js
 - assets/js/toc.js
 homepage: https://github.com/pomeloshark/jekyll-theme-paperwiki