jekyll-theme-paperwiki 0.1.16 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1896b6de7d51495d6bdf12f3cc9aac56bb2573fcf80ce429725fee3593762b91
-  data.tar.gz: 18e1e6d0a06dffaff1f3ab69f29464186573086d0ade1df15cea4b45085cf568
+  metadata.gz: b16cb2fa02d1728ccf3bd09ecb7638fa42c0a0243e93a84c91ab4a383416f4c0
+  data.tar.gz: b5dde0f6bbb1021bba6b9644a47a3d8a55f2a92e2b18a72c3a6f78ea6036c6af
 SHA512:
-  metadata.gz: 894e88cf0db6b281bd2ab322009df722df6859da06b9e6471c8088ebb80e4e500ef58b6ea6bc78e8a0d3d5eac35c92a5f22147de733c255e00fb9e17f42b1947
-  data.tar.gz: daa223a3bea9974c308e1fa6c726fee01e64d494586f827ef30d58c7d964ce8c24c0a523acb4969bc4cb5e1054d0eb397c2f8970ed2f1ef9ede4b63e910672de
+  metadata.gz: f4688f18aeb4133788850b20ae6c6a63f9d46694cc7f6ed74b5ca36d179fa4fc8017088118048971f16d4fa71434d3621c08fee169a187895672c18523728bcb
+  data.tar.gz: 5ac735c63413c3a22606e40dfd46d58286c25a61109a0193dd84c4dc09c9dae1420bba6959b1879059d02c3456fb06be7a9a5ae6567a4a87bff2847fe5b36570

data/README.md

@@ -1,38 +1,21 @@
 # jekyll-theme-paperwiki
 
-![](/assets/images/homepage.png)
+![A screenshot of the PaperWiki homepage.](/assets/images/homepage.png)
 
 For storing your worldbuilding notes! The intent of this theme is to get all the code out of the way and to allow you to write Markdown articles; the best way to do that is to install the theme as a gem. However, if you want to tinker with the code, just download this repository.
 
 For the easiest starting point, I have uploaded a [sample site](https://github.com/pomeloshark/paperwiki-example) that you can download with everything preconfigured, so if you're unfamiliar with Jekyll you can bypass all the setup and get right to it. See that repo for instructions.
 
-I've tried to adhere to accessible and easy to read design principles while retaining the look and layout of a classic wiki that we're all familiar with - I've aped some elements of Wikipedia's organizational system and layout while trying to make it as clean and user friendly as possible.
-
-This theme is not mobile friendly, as I personally do absolutely no work on mobile and thus my development skills are lacking. I stuck in a couple CSS breakpoints, so it'll be mostly legible on a medium-sized tablet, but don't expect great results on a phone. There is also no dark mode or other alternate colour scheme, but please feel free to fork this project and add whatever functionality you're looking for.
-
 This theme is not really intended for blogging, but you could add in the functionality easily enough by creating a `_posts` collection and setting a default post layout in the config file, as there is a dedicated `post` layout, as well as a `blog.md` which will list all of your blog posts on one page. If you have no need for it you can delete this file.
 
 
 
-## Usage
-
-In case you're unfamiliar with it, a basic Jekyll site includes the following:
-+ The `_includes` folder contains snippets of HTML that are frequently reused on pages throughout the website. This saves us from having to copy and paste the HTML on multiple pages, and we only have to edit it in one file in order to change every instance of it.
-+ The `_layouts` folder contains the formatting for different types of pages, meaning that instead of formatting each page individually we can just specify which layout template to use.
-+ The `_sass` folder contains all the styling for the site, written in SCSS.
-+ The `_site` folder contains everything that Jekyll outputs when it builds the site. Don't edit anything in this folder, as it will be rewritten the next time you serve the site.
-+ The `assets` folder contains things like fonts, images, and Javascript files. It also contains a `.scss` file importing all of your SCSS so that Jekyll can convert it to regular CSS.
-
-This theme comes with all of these prepackaged, so most of what you have to do is edit the `_config.yaml` file. The theme has some default config set already, but you can override these in your own config file if you wish. You can also add any of the above folders to your own project with includes, layouts, or SCSS to override the theme's files. For example, you will want to add your own `assets` folder to store your own images, including one titled `favicon.png` in order to override the placeholder one i've included.
-
-
-
 ## Installation
 
 [Install Jekyll](https://jekyllrb.com/docs/). If you're using the example site linked above, you can skip ahead to the [using the wiki](#using-the-wiki) section. Otherwise, create a new site by running the following in your terminal:
 
 ```
-$ jekyll new MYSITENAME
+jekyll new SITE_NAME_HERE
 ```
 
 This will give you a very bare bones Jekyll site, with an index page, a folder for blog posts, a config file, and a Gemfile. You'll have to do a little setup to make it usable with this theme. Here's what the directory should look like:
@@ -90,26 +73,7 @@ Navigate to your localhost and...you will see an empty page. This is because the
 layout: launchpad
 ```
 
-This will show you the default wiki homepage. The three links - explore, contents, and random page - link to pages that are included with the theme, and consist of pregenerated content based on the wiki articles you've written. Now you can start adding articles in your `_wiki` folder.
-
-
-
-### Using the wiki
-
-All of your wiki pages should be written in Markdown, and you must begin each `.md` file like so:
-
-```
----
----
-```
-
-Between these two lines is where you include *front matter*, such as specifying the layout or the permalink to the page. However, you can leave the front matter blank - wiki pages have layouts and permalinks set by default in the theme's config file, and you only need to specify them if you want to override the defaults. You also do not need to specify a title for the page, as it is automatically taken from the filename. All you absolutely need is the two triple-dashed lines, as Jekyll needs it to know that the front matter is there in order to output the page.
-
-Caveats:
-- If the site won't build due to an error with the random page, make sure you have more than one wiki article for it to draw from
-- You may need to specify a permalink and a title if you want to use certain characters that are not allowed in filenames -- say, some IPA characters. Otherwise just title your articles "Article title.md", with spaces, not underscores or hyphens, and the default settings will take care of the rest.
-
-If you're unfamiliar with Markdown, see [here](https://www.markdownguide.org/).
+This will show you the default wiki homepage. The three links - explore, contents, and random page - link to pages that are included with the theme, and consist of pregenerated content based on the wiki articles you've written. Now you can start adding articles in your `_wiki` folder. See my [guide](https://pomeloshark.github.io/jekyll) for further details.
 
 
 

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/grammar.html

@@ -0,0 +1,25 @@
+---
+   layout: entry
+---
+
+<article class="entry entry_grammar">
+
+   <h1>
+      {{ page.name | remove: ".md" }}
+   </h1>
+
+   {% if site.entry_tags_top %}
+      <section class="entry-tags entry-tags_top">
+         {% include entry_tags.html %}
+      </section>
+   {% endif %}
+
+   {{ content }}
+
+   {% if site.entry_tags_top == false %}
+      <section class="entry-tags entry-tags_bottom">
+         {% include entry_tags.html %}
+      </section>
+   {% endif %}
+
+</article>

data/_layouts/random.html

@@ -5,39 +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 -%}
-
-   <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/_layouts/work.html

@@ -0,0 +1,27 @@
+---
+   layout: entry
+---
+
+<article class="entry entry_work">
+
+   <h1>
+      {{ page.name | remove: ".md" }}
+   </h1>
+
+   {% if site.entry_tags_top %}
+      <section class="entry-tags entry-tags_top">
+         {% include entry_tags.html %}
+      </section>
+   {% endif %}
+
+   {{ content }}
+
+   {% if site.entry_tags_top == false %}
+      <section class="entry-tags entry-tags_bottom">
+         {% include entry_tags.html %}
+      </section>
+   {% endif %}
+
+</article>
+
+{% include wiki_sidebar.html %}

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/_sass/partials/_search.scss

@@ -14,7 +14,10 @@
    margin-left: 0;
 }
 
-.search_result {}
+.search_result {
+   text-decoration: none;
+   font-weight: bold;
+}
 
 .search_result-details {
    margin-bottom: 0;
@@ -26,3 +29,10 @@
 .search_result-preview {
    margin-bottom: 1.75rem;
 }
+
+.search_result-highlight {
+   padding: 0.2em 0.3em;
+
+   background-color: $color-peach;
+   border-radius: $border_radius-inline;
+}

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,17 +1,26 @@
-// Yoinked in its entirety from https://davidwalsh.name/adding-search-to-your-site-with-javascript
+// 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 lunr = require("lunr")
+//require("lunr.unicodeNormalizer")(lunr)
+
+// Build the search index
 var searchIndex = lunr(function() {
-   // define searchable fields for each page
+//   this.use("lunr.unicodeNormalizer")
+   // Define searchable fields for each page
    this.ref("id");
-   this.field("title", { boost: 10 });
-   this.field("content");
-   this.field("portal");
-   this.field("categories");
-   for (var key in window.pages) {
+   this.field("title", { boost: 100 }); // Boost the importance of the title field, prioritizing title matches
+   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
       });
    }
 });
@@ -30,21 +39,44 @@ function getQueryVariable(variable) {
 }
 
 var searchTerm = getQueryVariable("q");
-// creation of searchIndex from earlier example
-var results = searchIndex.search(searchTerm);
+// Create index of search term matches
+var results = searchIndex.search(searchTerm + "*"); // Wildcard by default
 var resultPages = results.map(function (match) {
    return pages[match.ref];
 });
 
 
 
+// Text highlighting
+function formatContent(content, searchTerm) {
+    var termIdx = content.toLowerCase().indexOf(searchTerm.toLowerCase());
+    if (termIdx >= 0) {
+        var startIdx = Math.max(0, termIdx - 140);
+        var endIdx = Math.min(content.length, termIdx + searchTerm.length + 140);
+        var trimmedContent = (startIdx === 0) ? "" : "…";
+        trimmedContent += content.substring(startIdx, endIdx);
+        trimmedContent += (endIdx >= content.length) ? "" : "…"
+
+        var highlightedContent = trimmedContent.replace(new RegExp(searchTerm, "ig"), function matcher(match) {
+            return "<mark class='search_result-highlight'>" + match + "</mark>";
+        });
+
+        return highlightedContent;
+    }
+    else {
+        var emptyTrimmedString = content.substr(0, 280);
+        emptyTrimmedString += (content.length < 280) ? "" : "&hellip;";
+        return emptyTrimmedString;
+    }
+}
+
+
 
-// resultPages from previous example
 resultsString = "";
-resultPages.forEach(function (r) {
+resultPages.forEach(function (r) { // Format the output on the search results page
    resultsString += "<dt class='search_result'>";
-   resultsString += "<a href='" + r.url + "'>" + r.title + "</a>";
+   resultsString += "<a class='search_result' href='" + r.url + "'>" + r.title + "</a>";
    resultsString += "<span class='search_result-details'>" + r.portal + " ⋅ " + r.categories + "</span></dt>"
-   resultsString += "<dd class='search_result-preview'>" + r.content.substring(0, 200) + "..." + "</dd>";
+   resultsString += "<dd class='search_result-preview'>" + formatContent(r.content, searchTerm) + "" + "</dd>";
 });
 document.querySelector("#search-results").innerHTML = resultsString;

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-paperwiki
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.18
 platform: ruby
 authors:
 - pomeloshark
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-04 00:00:00.000000000 Z
+date: 2023-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '0'
 description:
 email:
 executables: []
@@ -39,20 +39,25 @@ 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
 - _layouts/default.html
 - _layouts/entry.html
+- _layouts/grammar.html
 - _layouts/launchpad.html
 - _layouts/page.html
 - _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
 - _sass/partials/_base.scss
 - _sass/partials/_blog.scss
 - _sass/partials/_collections.scss
@@ -68,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
@@ -100,7 +104,6 @@ files:
 - assets/fonts/RemixIcon/remixicon.css
 - assets/fonts/RemixIcon/remixicon.eot
 - assets/fonts/RemixIcon/remixicon.glyph.json
-- assets/fonts/RemixIcon/remixicon.less
 - assets/fonts/RemixIcon/remixicon.svg
 - assets/fonts/RemixIcon/remixicon.symbol.svg
 - assets/fonts/RemixIcon/remixicon.ttf
@@ -2380,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
@@ -2404,5 +2408,5 @@ requirements: []
 rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
-summary: A theme meant for use as a personal wiki.
+summary: A Jekyll theme meant for use as a personal wiki.
 test_files: []