jekyll-geolexica 1.9.0 → 1.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bf9198ece6031ea2db54e9a6f4f8d236dbcf253aba824e92db8a103a4f650f8
-  data.tar.gz: 7d03d364470f0a219cb98ca1832d7fb046dbe170808588861dc090d4af927c71
+  metadata.gz: e9bd91cb309055026c71c87645e7196ff3d4b3116de988a8499ef49805b6f72b
+  data.tar.gz: 6c2a5bebd531945f9d75f9e7c64e515b6292fd488b81a157421aa4852e62cb15
 SHA512:
-  metadata.gz: a3c019c8c9be5691fa0e836352d4973efdbb3ad0f8570fac50ff748562382042b645fd54f1ea6a0f77617d445464f2aed32a1f2cf4e4f111883a31b751144866
-  data.tar.gz: e0c1764ad91b3d49ed30fa235e1714af75571e1578f1d32872320d864bb92bb64e12a413752a96822eae21c428283f3a31605bac32520d36da7a7efc4f5461ba
+  metadata.gz: e90fb75be8eb7f4b77ea2cd5801da1e3678c43837686130ddecce1917a7a8b23596574d973f5d8795a899562e3eab91407c520fda05492d39288fd3d60d2c480
+  data.tar.gz: 55b7408414a081804d8c2f6b988f79a21f7ced484a8acc4fb57d29cb762b1e043459a25545a10bbb4e2f90b2250a7312fa677ff9baf0e3cd799b4597f522d54d

data/_includes/concept-api-links.html

@@ -2,7 +2,7 @@
 {%- if json_url %}
 <section class="field json">
   <p class="field-name">JSON</p>
-  <p class="field-value"><a href="{{ json_url }}">{{ json_url }}</a></p>
+  <p class="field-value"><a href="{{ json_url | relative_url }}">{{ json_url | relative_url }}</a></p>
 </section>
 {% endif -%}
 
@@ -10,7 +10,7 @@
 {%- if yaml_url %}
 <section class="field yaml">
   <p class="field-name">YAML</p>
-  <p class="field-value"><a href="{{ yaml_url }}">{{ yaml_url }}</a></p>
+  <p class="field-value"><a href="{{ yaml_url | relative_url }}">{{ yaml_url | relative_url }}</a></p>
 </section>
 {% endif -%}
 
@@ -18,7 +18,7 @@
 {%- if json_url %}
 <section class="field json">
   <p class="field-name">SKOS in JSON-LD</p>
-  <p class="field-value"><a href="{{ json_url }}">{{ json_url }}</a></p>
+  <p class="field-value"><a href="{{ json_url | relative_url }}">{{ json_url | relative_url }}</a></p>
 </section>
 {% endif -%}
 
@@ -26,7 +26,7 @@
 {%- if ttl_url %}
 <section class="field ttl">
   <p class="field-name">SKOS in RDF</p>
-  <p class="field-value"><a href="{{ ttl_url }}">{{ ttl_url }}</a></p>
+  <p class="field-value"><a href="{{ ttl_url | relative_url }}">{{ ttl_url | relative_url }}</a></p>
 </section>
 {% endif -%}
 
@@ -34,6 +34,6 @@
 {%- if tbx_url %}
 <section class="field tbx">
   <p class="field-name">TBX-ISO-TML</p>
-  <p class="field-value"><a href="{{ tbx_url }}">{{ tbx_url }}</a></p>
+  <p class="field-value"><a href="{{ tbx_url | relative_url }}">{{ tbx_url | relative_url }}</a></p>
 </section>
 {% endif -%}

data/_includes/head.html

@@ -9,15 +9,15 @@
 
   <title>{% include title.html %}</title>
 
-  <link rel="icon" type="image/png" href="/images/favicon-32x32.png" sizes="32x32" />
-  <link rel="icon" type="image/png" href="/images/android-chrome-192x192.png" sizes="192x192" />
-  <link rel="icon" type="image/png" href="/images/favicon-96x96.png" sizes="96x96" />
-  <link rel="icon" type="image/png" href="/images/favicon-16x16.png" sizes="16x16" />
-  <link rel="shortcut icon" href="/favicon.ico" />
+  <link rel="icon" type="image/png" href="{{ '/images/favicon-32x32.png' | relative_url }}" sizes="32x32" />
+  <link rel="icon" type="image/png" href="{{ '/images/android-chrome-192x192.png' | relative_url }}" sizes="192x192" />
+  <link rel="icon" type="image/png" href="{{ '/images/favicon-96x96.png' | relative_url }}" sizes="96x96" />
+  <link rel="icon" type="image/png" href="{{ '/images/favicon-16x16.png' | relative_url }}" sizes="16x16" />
+  <link rel="shortcut icon" href="{{ '/favicon.ico' | relative_url }}" />
 
   <meta name="msapplication-TileColor" content="#ffffff" />
-  <meta name="msapplication-TileImage" content="/images/mstile-144x144.png" />
-  <meta name="msapplication-config" content="/browserconfig.xml" />
+  <meta name="msapplication-TileImage" content="{{ '/images/mstile-144x144.png' | relative_url }}" />
+  <meta name="msapplication-config" content="{{ '/browserconfig.xml' | relative_url }}" />
   <meta name="theme-color" content="#ffffff" />
 
   <link rel="canonical" href="{{ page.url | replace: 'index.html', '' | relative_url }}" />
@@ -26,7 +26,7 @@
   {% if extra_stylesheets %}
     {% for ss in extra_stylesheets %}
       <link rel="stylesheet"
-        href="{{ ss.href }}"
+        href="{{ ss.href | relative_url }}"
         {% if ss.integrity %}integrity="{{ ss.integrity }}"{% endif %}
         {% if ss.crossorigin %}crossorigin="{{ ss.crossorigin }}"{% endif %}>
     {% endfor %}

data/_includes/script.html

@@ -13,7 +13,22 @@
     };
 
     var replace_math_symb = function(s){
-      return s.replace(/(`[^`]+`)/g, '<<math_symbol>>');
+        // replace mathjax
+        mathjax_containers = s.querySelectorAll('math, mjx-container');
+
+        if(mathjax_containers.length > 0) {
+            s = s.cloneNode(true);
+            s.querySelectorAll('math, mjx-container').forEach(container => {
+                container.replaceWith('<<math_symbol>>');
+            });
+        }
+
+        text = s.innerText;
+
+        // replace asciimath
+        text = text.replace(/(`[^`]+`)/g, '<<math_symbol>>');
+
+        return text;
     };
 
     var copyBtn = d.getElementById('engTermCopy');
@@ -43,7 +58,7 @@
         for (var _elm of elmsToCopy) {
             if (_elm.innerText.trim().length > 0) {
                 // textToCopy = textToCopy + _elm.innerText + '\r\n\r\n';
-                textToCopy = textToCopy + replace_math_symb(_elm.innerText) + '\r\n\r\n';
+                textToCopy = textToCopy + replace_math_symb(_elm) + '\r\n\r\n';
             };
         };
 

data/_layouts/custom-home.html

@@ -17,7 +17,7 @@ extra_scripts:
 
 <section class="browse-concepts">
   <h2 class="section-title">Concepts</h2>
-  <a href="/concepts/" class="browse-concepts">Browse concepts</a>
+  <a href="{{ '/concepts/' | relative_url }}" class="browse-concepts">Browse concepts</a>
 </section>
 
 {{ content }}

data/_layouts/default.html

@@ -9,7 +9,7 @@
     <header class="{% if site.has_brand_name %}brand{% endif %}">
       <div class="site-headline">
         <div class="parent-org-reference">
-          <a href="/" class="logo-link">
+          <a href="{{ '/' | relative_url }}" class="logo-link">
             <img src="{{ site.committee.main_logo.path | relative_url }}" alt="{{ site.committee.main_logo.alt_text }}">
           </a>
         </div>
@@ -124,7 +124,7 @@
     {% if extra_scripts %}
       {% for sc in extra_scripts %}
         <script
-          src="{{ sc.src }}"
+          src="{{ sc.src | relative_url }}"
           {% if sc.integrity %}integrity="{{ sc.integrity }}"{% endif %}
           {% if sc.crossorigin %}crossorigin="{{ sc.crossorigin }}"{% endif %}></script>
       {% endfor %}

data/_pages/concept-search-index.jbuilder

@@ -8,7 +8,7 @@ permalink: "/api/concept-search-index.json"
 json.array! site["concepts"].each_with_index.to_a do |(concept, idx)|
   json.termid concept.termid
   json.term concept.data.dig("eng", "terms", 0, "designation")
-  json.term_url concept.url
+  json.term_url "#{site["baseurl"]}#{concept.url}"
 
   json.sort_order do
     json.natural idx + 1 # loop index, indexing from 1
@@ -26,7 +26,7 @@ json.array! site["concepts"].each_with_index.to_a do |(concept, idx)|
 
       json.term localized.dig("terms", 0, "designation")
       json.id localized["id"]
-      json.term_url "#{concept.url}#entry-lang-#{lang}"
+      json.term_url "#{site["baseurl"]}#{concept.url}#entry-lang-#{lang}"
       json.entry_status concept["status"]
       json.language_code localized["language_code"]
       json.review_decision english["review_decision"]

data/_pages/concepts-index.jbuilder

@@ -12,8 +12,11 @@ for concept_page in site["concepts"]
   json.set! concept_page.termid.to_s do
     json.term concept_page.data["term"]
     json.termid concept_page.termid
-    json.set! "uri-html", concept_page.url
-    json.set! "uri-json", concept_json_page&.url
+    json.set! "uri-html", "#{site["baseurl"]}#{concept_page.url}"
+
+    if concept_json_page&.url
+      json.set! "uri-json", "#{site["baseurl"]}#{concept_json_page.url}"
+    end
   end
 end
 

data/assets/js/concept-search-worker.js

@@ -1,8 +1,8 @@
 ---
 ---
-importScripts('/assets/js/babel-polyfill.js');
+importScripts("{{ '/assets/js/babel-polyfill.js' | relative_url }}");
 
-const CONCEPTS_URL = '/api/concept-search-index.json';
+const CONCEPTS_URL = "{{ '/api/concept-search-index.json' | relative_url }}";
 
 /** For example:
  *    const LANGUAGES = [ 'eng', 'deu' ];

data/assets/js/concept-search.js

@@ -2,7 +2,7 @@
 ---
 (function () {
 
-  const searchWorker = new Worker('/assets/js/concept-search-worker.js');
+  const searchWorker = new Worker("{{ '/assets/js/concept-search-worker.js' | relative_url }}");
 
   /** For example:
    *    const LANGUAGES = [ 'eng', 'deu' ];
@@ -231,7 +231,7 @@
         );
       }
       headerEls.push(el('span', { key: 'title' }, 'Find a concept'));
-      headerEls.push(el('a', { key: 'link', href: '/concepts' }, '(browse all)'));
+      headerEls.push(el('a', { key: 'link', href: "{{ '/concepts' | relative_url }}" }, '(browse all)'));
 
       var els = [
         el('h2', { key: 'section-title', className: 'section-title' }, headerEls),

data/jekyll-geolexica.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "glossarist", "~> 2.0"
+  spec.add_runtime_dependency "glossarist", "~> 2.0.7"
   # Jekyll 4.1.0 adds some breaking changes which are reverted in 4.1.1.
   # I doubt we should be worried, but there is no good reason to allow them
   # either.
@@ -47,6 +47,8 @@ Gem::Specification.new do |spec|
   # Pin logger to <= 1.5.3 due to incompatibility of logger 1.6.0 with Jekyll 4.3.2
   spec.add_runtime_dependency "logger", "<= 1.5.3"
   spec.add_runtime_dependency "relaton"
+  spec.add_runtime_dependency "unitsml"
+  spec.add_runtime_dependency "plurimath"
 
   # Zeitwerk::Loader#push_dir supports :namespace argument from v. 2.4.
   spec.add_runtime_dependency "zeitwerk", "~> 2.4"

data/lib/jekyll/geolexica/glossary.rb

@@ -25,6 +25,7 @@ module Jekyll
             "id" => managed_concept.uuid,
             "term" => managed_concept.default_designation,
             "termid" => managed_concept.id,
+            "status" => managed_concept.status,
           }.merge(managed_concept.to_h)
 
           managed_concept.localizations.each do |lang, localization|

data/lib/jekyll/geolexica/hooks.rb

@@ -11,6 +11,7 @@ module Jekyll
         hook :post_read, :site, :load_glossary
         hook :pre_render, :documents, :expose_glossary
         hook :pre_render, :pages, :expose_glossary
+        hook :post_render, :pages, :convert_math
       end
 
       # Adds Jekyll::Site#glossary method, and initializes an empty glossary.
@@ -28,6 +29,26 @@ module Jekyll
         liquid_drop["glossary"] = page_or_document.site.glossary
       end
 
+      def convert_math(page)
+        page.output.gsub!(/stem:\[([^\]]*?)\]/) do
+          ascii_equation = CGI.unescapeHTML(Regexp.last_match[1])
+
+          mathml_equation = ::Plurimath::Math
+                              .parse(ascii_equation, :asciimath)
+                              .to_mathml
+
+          # temporary hack to use display inline for math equations because
+          # currently there is no option to use display inline in plurimath
+          mathml_equation.gsub!("display=\"block\"", "display=\"inline\"")
+
+          # Removing newlines(\n) and escaping double quotes(")
+          # because they will cause parsing issues in json
+          mathml_equation.gsub!("\n", "").gsub!("\"", "\\\"") unless page.html?
+
+          mathml_equation
+        end
+      end
+
       def hook event, target, action
         Jekyll::Hooks.register target, event, &method(action)
       end

data/lib/jekyll/geolexica/version.rb

@@ -3,6 +3,6 @@
 
 module Jekyll
   module Geolexica
-    VERSION = "1.9.0".freeze
+    VERSION = "1.9.2".freeze
   end
 end

data/lib/jekyll/geolexica.rb

@@ -3,6 +3,7 @@
 
 require "jekyll"
 require "glossarist"
+require "plurimath"
 
 module Jekyll
   module Geolexica

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-geolexica
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-06 00:00:00.000000000 Z
+date: 2024-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: glossarist
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +106,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: unitsml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: plurimath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement