Merge branch 'story' into 'pregmod-master'

Convert story caption to use domPassage

See merge request !8558

devNotes/sugarcube stuff/sugarcube-fc-changes.patch

@@ -39,9 +39,18 @@ index 4d90705..79058a1 100644
  			'src/lib/simplestore/adapters/cookie.js',
  			'src/lib/debugview.js',
 diff --git a/src/lib/helpers.js b/src/lib/helpers.js
-index ff3e30f..2fc3a0d 100644
+index ff3e30f..18fa690 100644
 --- a/src/lib/helpers.js
 +++ b/src/lib/helpers.js
+@@ -289,7 +289,7 @@ var { // eslint-disable-line no-var
+ 
+ 		for (let i = 0, iend = ids.length; i < iend; ++i) {
+ 			if (Story.has(ids[i])) {
+-				new Wikifier(el, Story.get(ids[i]).processText().trim());
++				el.append(Story.get(ids[i]).render());
+ 				return el;
+ 			}
+ 		}
 @@ -308,11 +308,11 @@ var { // eslint-disable-line no-var
  	/*
  		Appends an error view to the passed DOM element.

src/005-passages/SpecialUIPassages.js

+new App.DomPassage("StoryCaption", () => { return App.UI.storyCaption(); });

src/gui/storyCaption.tw

-:: StoryCaption [nobr]
-
-<<includeDOM App.UI.storyCaption()>>

sugarcube-2 @ e8af6b2f

-Subproject commit 563752841c740a7ffeb921f4e7250172d7b497d3
+Subproject commit e8af6b2f60fa88f5111d1812593e0b0e47b2779f