Merge branch 'main' into fix-gpg-signature-error-page

Author: Gusted

docs/content/doc/advanced/config-cheat-sheet.en-us.md

@@ -1145,7 +1145,7 @@ in this mapping or the filetype using heuristics.
 ## Time (`time`)
 
 - `FORMAT`: Time format to display on UI. i.e. RFC1123 or 2006-01-02 15:04:05
-- `DEFAULT_UI_LOCATION`: Default location of time on the UI, so that we can display correct user's time on UI. i.e. Shanghai/Asia
+- `DEFAULT_UI_LOCATION`: Default location of time on the UI, so that we can display correct user's time on UI. i.e. Asia/Shanghai
 
 ## Task (`task`)
 

options/gitignore/Godot

@@ -1,3 +1,6 @@
+# Godot 4+ specific ignores
+.godot/
+
 # Godot-specific ignores
 .import/
 export.cfg
@@ -9,3 +12,4 @@ export_presets.cfg
 # Mono-specific ignores
 .mono/
 data_*/
+mono_crash.*.json

options/license/Bitstream-Charter

@@ -0,0 +1,9 @@
+(c) Copyright 1989-1992, Bitstream Inc., Cambridge, MA. 
+
+You are hereby granted permission under all Bitstream propriety rights 
+to use, copy, modify, sublicense, sell, and redistribute the 4 Bitstream 
+Charter (r) Type 1 outline fonts and the 4 Courier Type 1 outline fonts for 
+any purpose and without restriction; provided, that this notice is left 
+intact on all copies of such fonts and that Bitstream's trademark is acknowledged 
+as shown below on all unmodified copies of the 4 Charter Type 1 fonts. 
+BITSTREAM CHARTER is a registered trademark of Bitstream Inc. 

options/license/Graphics-Gems

@@ -0,0 +1,5 @@
+LICENSE
+
+This code repository predates the concept of Open Source, and predates most licenses along such lines. As such, the official license truly is:
+
+EULA: The Graphics Gems code is copyright-protected. In other words, you cannot claim the text of the code as your own and resell it. Using the code is permitted in any program, product, or library, non-commercial or commercial. Giving credit is not required, though is a nice gesture. The code comes as-is, and if there are any flaws or problems with any Gems code, nobody involved with Gems - authors, editors, publishers, or webmasters - are to be held responsible. Basically, don't be a jerk, and remember that anything free comes with no guarantee.

options/license/IJG-short

@@ -0,0 +1,35 @@
+The authors make NO WARRANTY or representation, either express or
+implied, with respect to this software, its quality, accuracy,
+merchantability, or fitness for a particular purpose.  This software is
+provided "AS IS", and you, its user, assume the entire risk as to its
+quality and accuracy.
+
+This software is copyright (C) 1991, 1992, Thomas G. Lane.  All Rights
+Reserved except as specified below.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+software (or portions thereof) for any purpose, without fee, subject to
+these conditions:  
+
+(1) If any part of the source code for this software
+is distributed, then this README file must be included, with this
+copyright and no-warranty notice unaltered; and any additions,
+deletions, or changes to the original files must be clearly indicated
+in accompanying documentation.  
+
+(2) If only executable code is
+distributed, then the accompanying documentation must state that "this
+software is based in part on the work of the Independent JPEG Group".
+
+(3) Permission for use of this software is granted only if the user
+accepts full responsibility for any undesirable consequences; the
+authors accept NO LIABILITY for damages of any kind.
+
+Permission is NOT granted for the use of any IJG author's name or
+company name in advertising or publicity relating to this software or
+products derived from it.  This software may be referred to only as
+"the Independent JPEG Group's software".
+
+We specifically permit and encourage the use of this software as the
+basis of commercial products, provided that all warranty or liability
+claims are assumed by the product vendor.

options/license/MIT-Wu

@@ -0,0 +1,28 @@
+Copyright (c) 2003-2005  Tom Wu
+All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND,
+EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+
+IN NO EVENT SHALL TOM WU BE LIABLE FOR ANY SPECIAL, INCIDENTAL,
+INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER OR NOT ADVISED OF
+THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF LIABILITY, ARISING OUT
+OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+In addition, the following condition applies:
+
+All redistributions must retain an intact copy of this copyright notice
+and disclaimer.

options/license/TPDL

@@ -0,0 +1,2 @@
+Copyright (C) 1996-2010 David Muir Sharnoff. Copyright (C) 2011 Google, Inc. 
+License hereby granted for anyone to use, modify or redistribute this module at their own risk. Please feed useful changes back to [email protected].

options/license/TTWL

@@ -0,0 +1,8 @@
+Copyright (C) 1996-2002,2005,2006 David Muir Sharnoff.  
+Copyright (C) 2005 Aristotle Pagaltzis 
+Copyright (C) 2012-2013 Google, Inc.
+
+This module may be modified, used, copied, and redistributed at your own risk.
+Although allowed by the preceding license, please do not publicly
+redistribute modified versions of this code with the name "Text::Tabs"
+unless it passes the unmodified Text::Tabs test suite.

web_src/js/markup/codecopy.js

@@ -1,15 +1,18 @@
 import {svg} from '../svg.js';
 
-export function renderCodeCopy() {
-  const els = document.querySelectorAll('.markup .code-block code');
-  if (!els.length) return;
-
+export function makeCodeCopyButton() {
   const button = document.createElement('button');
   button.classList.add('code-copy', 'ui', 'button');
   button.innerHTML = svg('octicon-copy');
+  return button;
+}
+
+export function renderCodeCopy() {
+  const els = document.querySelectorAll('.markup .code-block code');
+  if (!els.length) return;
 
   for (const el of els) {
-    const btn = button.cloneNode(true);
+    const btn = makeCodeCopyButton();
     btn.setAttribute('data-clipboard-text', el.textContent);
     el.after(btn);
   }

web_src/js/markup/mermaid.js

@@ -1,4 +1,6 @@
 import {isDarkTheme} from '../utils.js';
+import {makeCodeCopyButton} from './codecopy.js';
+
 const {mermaidMaxSourceCharacters} = window.config;
 
 const iframeCss = `
@@ -58,7 +60,13 @@ export async function renderMermaid() {
         iframe.sandbox = 'allow-scripts';
         iframe.style.height = `${Math.ceil(parseFloat(heightStr))}px`;
         iframe.srcdoc = `<html><head><style>${iframeCss}</style></head><body>${svgStr}</body></html>`;
-        el.closest('pre').replaceWith(iframe);
+        const mermaidBlock = document.createElement('div');
+        mermaidBlock.classList.add('mermaid-block');
+        mermaidBlock.append(iframe);
+        const btn = makeCodeCopyButton();
+        btn.setAttribute('data-clipboard-text', source);
+        mermaidBlock.append(btn);
+        el.closest('pre').replaceWith(mermaidBlock);
       });
     } catch (err) {
       displayError(el, err);

web_src/js/modules/tippy.js

@@ -6,6 +6,7 @@ export function createTippy(target, opts = {}) {
     placement: target.getAttribute('data-placement') || 'top-start',
     animation: false,
     allowHTML: false,
+    hideOnClick: false,
     interactiveBorder: 30,
     ignoreAttributes: true,
     maxWidth: 500, // increase over default 350px
@@ -46,7 +47,7 @@ export function showTemporaryTooltip(target, content) {
   }
 
   tippy.setContent(content);
-  tippy.show();
+  if (!tippy.state.isShown) tippy.show();
   tippy.setProps({
     onHidden: (tippy) => {
       if (oldContent) {

web_src/less/markup/codecopy.less

@@ -1,4 +1,5 @@
-.markup .code-block {
+.markup .code-block,
+.markup .mermaid-block {
   position: relative;
 }
 
@@ -26,7 +27,8 @@
   background: var(--color-secondary-dark-1) !important;
 }
 
-.markup .code-block:hover .code-copy {
+.markup .code-block:hover .code-copy,
+.markup .mermaid-block:hover .code-copy {
   visibility: visible;
   animation: fadein .2s both;
 }