j1-template 2022.2.3 → 2022.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55d0ab45d3bb29ab56fb1a6d992608c8dcd7eac68799c528705a29ffbd56b522
-  data.tar.gz: ca61d4f901d9dbbdc11d47e16803428d964fc846ecd94218d3bcd23705f5d1fe
+  metadata.gz: 82f5e2dc4a146967bfdd30880b23b9dc68a10ab9066ef4f6422316b1a629ca81
+  data.tar.gz: b7f527c39bd3af9dc47b85b6fa66b48e4d07b5256302443fe513c0e3617b008d
 SHA512:
-  metadata.gz: d1399a6e01781a73bf57c1b9b9729941b65e2152e98e1ff59a21357e1e6e837dd552964ebbc52ca68297c922b6220fa6f75850f8908b82595fd1c8a35960e173
-  data.tar.gz: f6a5601d7169d09cb1b382144e483b6c886fc9174e3ed8064e956c6a51d52eff58d48117471e0d8aa1817e711653e19ed70cd630af046fe7a934e58629ba4358
+  metadata.gz: 0c91bffcd8335d97b5fd6c56bc5c258350d986200116e7f28ef5acb871b00049a454e47abf76c46a39c9fbc2de453a4748c21230c3e8b9a602df8f9f276c9a99
+  data.tar.gz: fc26b6afd986fa6f804636f0e19959865bcbf81948800b93eaaefb8c48a6461600face260960109a81aeb1ff6e738838be2f217546caaa4db18048bc5ca7cbaf

data/assets/themes/j1/adapter/js/analytics.js

@@ -85,19 +85,19 @@ j1.adapter.analytics = (function (j1, window) {
 
 {% comment %} Set global variables
 -------------------------------------------------------------------------------- {% endcomment %}
-var url             = new liteURL(window.location.href);
-var hostname        = url.hostname;
-var environment     = '{{environment}}';
-var gaScript        = document.createElement('script');
-var providerID      = '{{analytics_options.google.trackingID}}';
-var skipAllHosts    = '{{analytics_options.google.skipAllHosts}}';
-var validProviderID = (providerID.includes('your')) ? false : true;
-var optInOut        = {{analytics_options.google.optInOut}};
-var anonymizeIP     = {{analytics_options.google.anonymizeIP}};
-var cookie_names    = j1.getCookieNames();
-var date            = new Date();
-var timestamp_now   = date.toISOString();
-var skipHost        = false;
+var url               = new liteURL(window.location.href);
+var hostname          = url.hostname;
+var environment       = '{{environment}}';
+var gaScript          = document.createElement('script');
+var providerID        = '{{analytics_options.google.trackingID}}';
+var skipAllHosts      = '{{analytics_options.google.skipAllHosts}}';
+var validProviderID   = (providerID.includes('your')) ? false : true;
+var optInOut          = {{analytics_options.google.optInOut}};
+var anonymizeIP       = {{analytics_options.google.anonymizeIP}};
+var cookie_names      = j1.getCookieNames();
+var date              = new Date();
+var timestamp_now     = date.toISOString();
+var skipHost          = false;
 var skipHosts;
 var gaCookies;
 var user_consent;

data/assets/themes/j1/adapter/js/nbinteract.js

@@ -192,6 +192,7 @@ j1.adapter.nbinteract = (function (j1, window) {
           target  = document.getElementById('content');
           spinner = new Spinner(spinnerOpts).spin(target);
         }
+
       });
 
       // -----------------------------------------------------------------------
@@ -219,32 +220,128 @@ j1.adapter.nbinteract = (function (j1, window) {
       var scriptMathjax       = document.createElement('script');
       var scriptMathjaxConfig = document.createElement('script');
 
+      // Loading MathJax from a CDN
+      //
       scriptMathjax.setAttribute('src','//cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js?config=TeX-AMS_HTML');
 
+      // create/load MathJax configuration settings
+      //
       scriptMathjaxConfig.setAttribute('type','text/x-mathjax-config');
       scriptMathjaxConfig.innerHTML = `
         MathJax.Hub.Config({
             tex2jax: {
-                inlineMath: [ ['$','$'], ["\\(","\\)"] ],
-                displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
-                processEscapes: true,
-                processEnvironments: true,
-                processClass: "mathjax",
-                ignoreClass: "nomathjax"
+              // inlineMath, displayMath
+              // ---------------------------------------------------------------
+              // TeX 'delimiters'. By default, the tex2jax preprocessor
+              // definesthe LaTeX math delimiters, which are \(...\) for
+              // 'in-line' math, and \[...\] for 'displayed' equations.
+              // It also defines the TeX delimiters $$...$$ for displayed
+              // equations, but it does not define $...$ as in-line math
+              // delimiters. That is because dollar signs appear too often
+              // in non-mathematical settings, which could cause some text
+              // to be treated as mathematics unexpectedly. For example,
+              // with single-dollar delimiters, 'the cost is $2.50' for the
+              // first one, and '$2.00' for each additional one would cause
+              // the phrase '2.50 for the first one' to be treated as
+              // mathematics since it falls between dollar signs. For this
+              // reason, if you want to use single-dollars for in-line math
+              // mode, you must enable that explicitly.
+              //
+              inlineMath: [ ['$','$'], ["\\(","\\)  "] ],
+              displayMath: [ ['$$','$$'], ["\\[","\\]"] ],
+
+              // processEscapes
+              // ---------------------------------------------------------------
+              // When 'processEscapes' set to true, you may use \$ to
+              // representa literal dollar sign, rather than using it as
+              // a math delimiter. When false, \$ will not be altered,
+              // and the dollar sign may be considered part of a math
+              // delimiter. Typically this is set to 'true' if you enable
+              // the $ ... $ in-line delimiters, so you can type \$ and
+              // tex2jax will convert it to a regular dollar sign in the
+              // rendered document.
+              //
+              processEscapes: true,
+
+              // processEnvironments
+              // ---------------------------------------------------------------
+              // When 'processEnvironments' true, tex2jax looks not only
+              // for the in-line and display math delimiters, but also for
+              // LaTeX environments (\begin{something}...\end{something})
+              // and marks them forprocessing by MathJax. When false, LaTeX
+              // environments will not be processed outside of math mode.
+              //
+              processEnvironments: false,
+
+              // skipTags
+              // ---------------------------------------------------------------
+              // The array 'skipTags' lists the names of the tags whose
+              // contents should NOT be processed by tex2jax.
+              //
+              skipTags: ["script","noscript","style","textarea","pre","code"],
+
+              // processClass, ignoreClass
+              // ---------------------------------------------------------------
+              // These are the (CSS) classes name used to mark elements whose
+              // contents should or should NOT be processed by tex2jax.
+              //
+              processClass: "mathjax",
+              ignoreClass: "nomathjax"
             },
-            // jadams, 2022-04-22, NOTE: 'MathJax_Display' overloaded by
-            // THEME CSS. Unclear how to configure 'HTML-CSS' correctly.
+
+            // displayAlign
+            // -----------------------------------------------------------------
+            // Align (displayMath) equations left-sided in code and all
+            // markdown cells.
             //
-            // Center justify equations in code and markdown cells. Elsewhere
-            // we use CSS to left justify single line equations in code cells.
-            displayAlign: 'center',
-            "HTML-CSS": {
-                styles: {'.MathJax_Display': {
-                  "margin": 0,
-                }},
-                linebreaks: { automatic: true }
-            }
+            displayAlign: 'left',
+
+            // preview
+            // -----------------------------------------------------------------
+            // Controls whether tex2jax inserts 'MathJax_Preview' spans to
+            // make a preview available, and what preview to use, when it
+            // locates in-line or display mathematics in the page. The default
+            // is 'TeX', which means use the TeX code as the preview (which
+            // will be visible until it is processed by MathJax). Set to
+            // 'none' to prevent previews from being inserted.
+            //
+            preview: "TeX",
+
+            // CommonHTML, HTML-CSS, and SVG output processors
+            // -----------------------------------------------------------------
+            // The CommonHTML, HTML-CSS, and SVG output processors implement
+            // most of the MathML3 automatic line-breaking specification.
+            // Since line-breaking takes extra processing and so can slow
+            // down the mathematical output, it is off by default
+            //
+            CommonHTML: { linebreaks: { automatic: false } },
+            "HTML-CSS": { linebreaks: { automatic: false } },
+                   SVG: { linebreaks: { automatic: false } }
+        });
+
+        // Use Jax renderer 'CommonHTML' for default
+        //
+        MathJax.Hub.Register.StartupHook("End Jax",function () {
+          var BROWSER = MathJax.Hub.Browser;
+          var jax = "CommonHTML";
+          if (BROWSER.hasMathPlayer) jax = "NativeMML";
+          return MathJax.Hub.setRenderer(jax);
         });
+
+        // Register a message MessageHook
+        // ---------------------------------------------------------------------
+        // MathJax.Hub.Register.MessageHook("New Math", function (message) {
+        //   var script = MathJax.Hub.getJaxFor(message[1]).SourceElement();
+        //   var j1_message = {};
+        //   j1_message.type    = 'command';
+        //   j1_message.action  = 'mathjax';
+        //   j1_message.text    = message[1];
+        //   this.j1.sendMessage('MathJax.Hub.MessageHook', 'j1.adapter.nbinteract', j1_message);
+        //   // console.error('nbinteract, Hub - New Math: ' + message[1]);
+        // });
+
+        // ---------------------------------------------------------------------
+        // END config
       `;
 
       // add Mathjax resources
@@ -277,6 +374,7 @@ j1.adapter.nbinteract = (function (j1, window) {
               xhr_data:           textbook.xhr_data,
               xhr_data_path:      textbook.xhr_data_path,
               use_mathjax:        textbook.use_mathjax,
+              translate_mathjax:  textbook.translate_mathjax,
               altair_cleanups:    textbook.altair_cleanups,
               buttonStyles:       settings.button_styles,
             });
@@ -393,11 +491,16 @@ j1.adapter.nbinteract = (function (j1, window) {
     // (e.g. <div>) specified by xhr_container_id, xhr_data_path
     // -------------------------------------------------------------------------
     loadTextbookHTML: function (options) {
-      var html_data_path    = options.xhr_data_path + '/' + options.xhr_data;
-      var id                = options.xhr_container_id;
-      var mathjaxEnabled    = options.use_mathjax;
-      var cleanupAltair     = options.altair_cleanups;
-      var $selector         = $('#' + id);
+      var html_data_path      = options.xhr_data_path + '/' + options.xhr_data;
+      var id                  = options.xhr_container_id;
+      var mathjaxEnabled      = options.use_mathjax ? options.use_mathjax : false;
+      var mathjaxTranslate    = options.translate_mathjax ? options.translate_mathjax : false;
+      var cleanupAltair       = options.altair_cleanups ? options.altair_cleanups : false;
+      var isPageRendered      = false;
+      var $selector           = $('#' + id);
+      var allID;
+      var allMathJaxSpan;
+      var allMathJaxElement;
       var logText;
 
       var cb_load_closure = function(id, mathjaxFlag) {
@@ -446,7 +549,6 @@ j1.adapter.nbinteract = (function (j1, window) {
             //
             if (cleanupAltair) {
 
-
               var reUnderscores = new RegExp(/_/, 'g');
               var reMultipleSpaces = new RegExp(/\s+/, 'g');
               var reMultipleSpacesStart = new RegExp(/^\s+/, 'g');
@@ -457,16 +559,15 @@ j1.adapter.nbinteract = (function (j1, window) {
               var newContent;
               var newContentWritten = false;
               var isWidget;
-              var isPageRendered = false;
               var outputDiv;
               var childNodes;
               var clientHeight;
               var lastWidget = false;
-              var allID = document.querySelectorAll('*[id^="altair-viz"]');
 
-              // check/wait for ALL widgets in the page are rendered (by JS)
+              // check/wait for ALL Altair widgets in the page are rendered (by JS)
               // if rendering finished, flag 'isPageRendered' is set to 'true'
               //
+              allID = document.querySelectorAll('*[id^="altair-viz"]');
               for (var l = 0; l < allID.length; l++) {
                 outputDiv = document.getElementById(allID[l].id);
                 var dependencies_met_page_rendered = setInterval(function() {
@@ -505,7 +606,7 @@ j1.adapter.nbinteract = (function (j1, window) {
                   clearInterval(dependencies_met_widgets_updated);
                 }
               }, 25);  // END interval
-            } // END if cleanupAltair
+            } // END if cleanup Altair
 
             // disable MathJax for all HTML 'output_wrapper' elements
             //
@@ -514,29 +615,56 @@ j1.adapter.nbinteract = (function (j1, window) {
                 x.className += ' nomathjax';
               }
             });
+
             // make all 'image' elements responsive (BS@4)
             //
             var images = document.getElementsByTagName('img');;
             [...images].forEach(function(x) {
               if (!x.className.includes('img-fluid')) {
-                x.className += 'img-fluid';
+                x.className += ' img-fluid';
               }
             });
 
-            // NOTE: DISABLED. Doesn't work that way. The class 'nbinteract-hide_in'
-            // is used in combination with hidden code cells as well!
+            // disable for now
             //
-            // Remove all childs in a element having the class 'nbinteract-hide_in'
-            // document.querySelectorAll('.nbinteract-hide_in').forEach(el => el.remove());
+            mathjaxTranslate = true
+
+            // disable translation on MathJax containers
+            // -----------------------------------------------------------------
+            if (mathjaxEnabled && !mathjaxTranslate) {
+
+              var dependencies_met_mathjax_available = setInterval(function() {
+                // document.getElementsByClassName('MJXc-display');
+                // document.querySelectorAll('*[id^="MathJax-Element"]');
+                // allMathJaxSpan = document.querySelectorAll('*[id^="MathJax-Element"]');
+                // allMathJaxSpan = document.querySelectorAll('*[id^="MathJax-Element-"]');
+                // allMathJaxSpan = document.getElementsByClassName('mjx-chtml');
+                allMathJaxSpan = document.querySelectorAll('*[id$="-Frame"]');
+
+                if (allMathJaxSpan.length) {
+                  // var lastElm = document.getElementById(allMathJaxSpan[allMathJaxSpan.length-1].id);
+                  var dependencies_met_mathjax_rendered = setInterval(function() {
+                    // var isProcessing = lastElm.classList.contains('MathJax_Processing');
+                    var mj_state = j1.adapter.nbinteract.getState()
+                    if (mj_state == 'mathjax_finished') {
+                      allMathJaxSpan = document.querySelectorAll('*[id$="-Frame"]');
+                      for (var l = 0; l < allMathJaxSpan.length; l++) {
+                        // outputDiv = document.getElementById(allMathJaxSpan[l].id);
+                        outputDiv = allMathJaxSpan[l];
+                        logger.error('\n' + 'element: ' + outputDiv.id  );
+                        // outputDiv.classList.remove('MJXc-processing');
+                        outputDiv.classList.add('notranslate');
+                      }
+                      clearInterval(dependencies_met_mathjax_rendered);
+                    }
+                  }, 25);  // END interval dependencies_met_mathjax_rendered
+                  clearInterval(dependencies_met_mathjax_available);
+                };
+              }, 25);  // END interval dependencies_met_mathjax_available
 
-            // Adding class on input_area NOT needed. This element contains
-            // and 'highlight' element that is processed for 'notranslate'
-            // in adapter rouge.js already
-            //
-            // var input_area = document.getElementsByClassName('input_area');
-            // [...input_area].forEach(x => x.className += " notranslate");
+            } // END // disable translation on MathJax
 
-            // cleanup headlines in textbook HTML and add an id used by toccer
+            // rewrite headlines in textbook HTML, add an id used by toccer
             //
             $selector.find('h1').replaceWith( function() {
               // return '<h1 id="' + $(this)[0].id.replace(/\$/g, '') + '">' + $(this).text().slice(0,-1) + '</h1>';
@@ -791,6 +919,7 @@ j1.adapter.nbinteract = (function (j1, window) {
       var json_message      = JSON.stringify(message, undefined, 2);
       var messageSuccessUL  = document.getElementById(nbiModalSuccessMessagesID);
       var messageErrorUL    = document.getElementById(nbiModalErrorMessagesID);
+      var isUpdated = false;
       var message;
 
       logText = '\n' + 'received message from ' + sender + ': ' + json_message;
@@ -823,6 +952,30 @@ j1.adapter.nbinteract = (function (j1, window) {
 
       } // END message command/nbi_init_finished
 
+      if (message.type === 'command' && message.action === 'mathjax') {
+        logger.error('\n' + 'New Math, ID: ' + message.text);
+
+        MathJax.Hub.Startup.signal.Interest(function (message) {
+          logger.error("Startup: " + message)
+          // if (message.contains('End')) {
+          //   logger.error("Startup: " + message)
+          // }
+        });
+
+        var dependencies_met_mathjax_rendered = setInterval(function() {
+          var elm = document.getElementById('MathJax-Element-6' + '-Frame');
+          var isProcessing = (elm.classList.contains('MJXc-processing') || elm.classList.contains('MJXc-processed')) ? true : false;
+          if (!isProcessing && !isUpdated) {
+            isUpdated = true;
+            elm.classList.add('notranslate');
+            logger.error('\n' + 'New Math, ID: ' + message.text);
+            //clearInterval(dependencies_met_mathjax_rendered);
+          }
+          clearInterval(dependencies_met_mathjax_rendered);
+        }, 25);  // END interval dependencies_met_mathjax_rendered
+
+      } // END message command/nbi_init_finished
+
       // -----------------------------------------------------------------------
       //  command|info
       //

data/assets/themes/j1/core/css/themes/unodark/bootstrap.css

@@ -8899,8 +8899,8 @@ a.toc-link:hover {
 */
 /*
  # ----------------------------------------------------------------------------
- # ~/theme_uno_dark/vendor/asciidoc/_asciidoc.scss
- # Overload styles for Asciidoc Markups
+ # ~/theme_uno_dark/vendor/bgplot/_theme_uno.scss
+ # Overload styles for nbinteract/bgplot widgets
  #
  # Product/Info:
  # https://jekyll.one
@@ -8911,50 +8911,40 @@ a.toc-link:hover {
  # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
  # -----------------------------------------------------------------------------
 */
-code {
-  word-break: break-word;
-  padding: 0.125em 0.275em 0.125em 0.275em !important;
-  border-radius: 2px;
-  background-color: rgba(0, 0, 0, 0.3) !important; }
+.bqplot > svg .plotarea_background {
+  fill: #757575 !important; }
 
-.colist > table > tbody > tr {
-  background: transparent !important; }
-
-.listingblock pre {
-  border-color: rgba(0, 0, 0, 0.6) !important;
-  border: 1px solid #757575 !important; }
-
-.listingblock pre code {
-  background-color: transparent;
-  border: 1px !important;
-  border-color: rgba(0, 0, 0, 0.6) !important; }
-
-.admonitionblock > table {
-  background: #424242 !important; }
-
-.admonitionblock > table td.content {
-  border-right: 1px !important;
-  border-bottom: 1px !important; }
+/*
+ # ----------------------------------------------------------------------------
+ # ~/theme_uno_dark/vendor/jupyter/_theme_uno.scss
+ # Overload styles for nbinteract (jupyter/bgplot) widgets
+ #
+ # Product/Info:
+ # https://jekyll.one
+ #
+ # Copyright (C) 2022 Juergen Adams
+ #
+ # J1 Template is licensed under the MIT License.
+ # See: https://github.com/jekyll-one-org/J1 Template/blob/master/LICENSE
+ # -----------------------------------------------------------------------------
+*/
+.bqplot > svg .plotarea_background {
+  fill: #9E9E9E !important; }
 
-.admonitionblock > table td.icon {
-  border-right: 0px !important;
-  border-bottom: 1px !important; }
+.jupyter-widgets {
+  color: #F5F5F5; }
 
-.exampleblock {
-  border-radius: 0 !important;
-  background: rgba(255, 255, 255, 0.2) !important; }
+.widget-inline-hbox .widget-label {
+  color: #F5F5F5; }
 
-.admonitionblock > table {
-  border: solid 1px #757575; }
+.widget-readout {
+  color: #F5F5F5; }
 
-table tr th, table tr td {
-  color: rgba(255, 255, 255, 0.5);
-  border-right: 1px solid #9e9e9e;
-  border-bottom: 1px solid #9e9e9e; }
+.widget-slider .ui-slider .ui-slider-handle {
+  background-color: #212121; }
 
-.listingblock > .title,
-.imageblock > .title {
-  color: unset; }
+.jupyter-button {
+  background-color: #9E9E9E; }
 
 /*
  # -----------------------------------------------------------------------------