Merge pull request #1569 from klembot/develop

2.10.0

docs/en/src/customizing/preferences.md

@@ -33,6 +33,18 @@ stylesheet edit dialog](../editing-stories/js-and-css.md). This preference only
 controls the cursor in the large text fields of these dialogs. Twine uses your
 system setting for cursor blinking in one-line text fields.
 
+The _Use Enhanced Editors_ checkbox controls whether Twine uses an enhanced
+editor control in edit dialogs. Unfortunately, this control can cause problems
+for assistive technology like screen readers, so disabling this may help in that
+case. Disabling this has a few side effects:
+
+- The _Blinking Cursor in Editors_ checkbox will become disabled, and whether
+  the cursor blinks in editors will use use your system setting.
+- Some toolbar buttons in dialogs will be hidden, because they use functionality
+  present in the enhanced editor control.
+- Story format toolbars will not be shown in passage editing dialogs, because
+  they also use functionality in the enhanced editor control
+
 You can change the font and size used in passage edit dialogs and the stylesheet
 and JavaScript edit dialogs using the controls below the _Blinking Cursor in
 Editors_ checkbox. (The _Code Editor_ preferences apply to both the stylesheet

docs/en/src/release-notes/2-10.md

@@ -0,0 +1,23 @@
+# 2.10 versions
+
+## 2.10.0
+
+Release Date: November 24, 20242
+
+## New Features Added
+
+- The story format list is now a dialog instead of a separate screen.
+- A new preference has been added that allows disabling enhanced text editors,
+  which can have problems with assistive technology. Disabling these editors
+  disables syntax highlighting and some toolbar buttons, and you cannot control
+  whether the cursor blinks in non-enhanced fields. (In that case, it will use
+  your system setting.)
+
+## Bugs Fixed
+
+- Validation of story format URLs now occurs when you try to add the format, not
+  as you type in the field. This could cause the UI to become unresponsive.
+
+## Story Format Updates
+
+- Chapbook has been updated to version [2.3.0](https://klembot.github.io/chapbook/guide/references/version-history.html#230-24-november-24).

docs/en/src/story-formats/adding.md

@@ -4,10 +4,10 @@ To add a story format, you'll need to know its address. A story format should
 include this in its documentation. A story format address must be a URL, with a
 prefix like `https://` in front of it.
 
-Once you know your story format's address, choose _Add_ from the _Story Format_
-top toolbar tab and enter it in the dialog that appears. If Twine is able to
-load the story format from the address you've entered, it will show a preview of
-the format name and version you're adding. Choose _Add_ in the dialog to add it.
-It'll appear in the list of story format cards immediately. You can now either
-[set it as the default story format](default.md) or [change individual
+Once you know your story format's address, choose _Add_ at the top of the Story
+Formats dialog and enter it in the dialog that appears. If Twine is able to load
+the story format from the address you've entered, it will show a preview of the
+format name and version you're adding. Choose _Add_ in the dialog to add it.
+It'll appear in the list of story formats immediately. You can now either [set
+it as the default story format](default.md) or [change individual
 stories](../editing-stories/changing-story-format.md) to use it, if you like.

docs/en/src/story-formats/default.md

@@ -1,11 +1,11 @@
 # Changing the Default Story Format
 
-To change the default story format, select its card in the Story Formats screen
-and choose _Use as Default Format_ from the _Story Format_ top toolbar tab. A
-"Used as Default" sticker will appear on the card to confirm the change. If the
-_Use As Default_ button is disabled, the format you've selected is already the
-default format, or the format you've selected is for proofing. (In that case,
-you probably want to [set it as your proofing format](proofing.md) instead.)
+To change the default story format, use the _Use as Default Format_ button below
+it. A "Used as Default" sticker will appear on the card to confirm the change.
+If the _Use As Default_ button is disabled, the format you've selected is
+already the default format, or the format you've selected is for proofing. (In
+that case, you probably want to [set it as your proofing format](proofing.md)
+instead.)
 
 Changing the default story format doesn't affect stories you've already created,
 only new ones you create in the future. You [can change the story format for

docs/en/src/story-formats/extensions.md

@@ -8,10 +8,8 @@ Story formats can extend Twine by adding:
 - Syntax coloring in passage edit dialogs
 
 If these extensions are buggy or you just prefer not to use them, you can
-disable them. Select the story format card in the Story Format screen and choose
-_Disable Editor Extensions_ from the _Story Format_ top toolbar tab. To reverse
-this change, select the same card and choose _Enable Editor Extensions_ from the
-_Story Format_ top toolbar tab.
+disable them. To do this, uncheck the _Use Editor Extensions_ checkbox under the
+story format's name in the dialog. To reverse this change, check this checkbox.
 
 Disabling extensions disables all extensions for a format. You can't disable
 just the toolbar, for example, but not a format's references or syntax coloring.

docs/en/src/story-formats/proofing.md

@@ -1,9 +1,8 @@
 # Changing the Proofing Format
 
-To change the proofing format, select its card in the Story Formats screen and
-choose _Use to Proof Stories_ from the _Story Format_ top toolbar tab. A "Used
-for Proofing" sticker will appear on the card to confirm the change. If the _Use
-to Proof Stories_ button is disabled, the format you've selected is already the
-proofing format, or the format you've selected is not a proofing format. (In
-that case, you probably want to [set it as your default format](default.md)
-instead.)
+To change the proofing format, use the _Use As Proofing Format_ button below it.
+A "Used for Proofing" sticker will appear on the card to confirm the change. If
+the _Use As Proofing Format_ button is disabled, the format you've selected is
+already the proofing format, or the format you've selected is not a proofing
+format. (In that case, you probably want to [set it as your default
+format](default.md) instead.)

docs/en/src/story-formats/removing.md

@@ -1,9 +1,8 @@
 # Removing a Story Format
 
-To remove a story format, select its card in the Story Format screen and choose
-_Remove_ from the _Story Format_ top toolbar tab. If this button is disabled,
-you've selected a format that is built-in, or is currently your default or
-proofing story format.
+To remove a story format, click the _Delete_ button below its name. If you don't
+see a _Delete_ button, you've selected a format that is built-in, or is
+currently your default or proofing story format.
 
 If a story uses a story format you've removed, you'll need to [change it to
 another format](../editing-stories/changing-story-format.md). Twine will also

docs/en/src/story-formats/viewing.md

@@ -2,21 +2,22 @@
 
 To view a list of story formats installed in your version of Twine, choose
 _Story Formats_ from the _Twine_ top toolbar tab. By default, the Story Formats
-screen will show you the newest version of every story format you have
-installed. Each card in the Story Formats screen represents a single format
-that's installed. This list shows both regular story formats and proofing ones
-together, and is sorted alphabetically by name.
+dialog will show you the newest version of every story format you have
+installed. Each item represents a single format that's installed. This list
+shows both regular story formats and proofing ones together, and is sorted
+alphabetically by name.
 
 Story formats that come installed with Twine have a sticker on them labeled
 "Built In." The [default story format](default.md) has a sticker on it labeled
 "Used as Default," and the format that's used for proofing stories has a "Used
-for Proofing" sticker.
+for Proofing" sticker. These formats also have a blue background in the list to
+make them easier to locate.
 
 If Twine isn't able to load a story format, it will show an error symbol on its
 card with a short explanation of the error it encountered.
 
-To view only story formats you've added yourself, choose _User-Added Story
-Formats_ from the _View_ top toolbar tab.
+The dialog has a button that allows you to choose what formats are shown:
 
-To view all formats, including older versions of story formats, choose _All
-Story Formats_ from the _View_ top toolbar tab.
+- _Current Story Formats_ shows only the newest version of each story format.
+- _User-Added Story Formats_ shows only formats you have added.
+- _All Story Formats_ shows all formats installed, including older versions of formats.

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Twine",
-	"version": "2.9.2",
+	"version": "2.10.0",
 	"description": "a GUI for creating nonlinear stories",
 	"author": "Chris Klimas <chris@twinery.org>",
 	"license": "GPL-3.0",

public/locales/ca.json

@@ -29,7 +29,7 @@
 		"renameStoryButton": {"emptyName": "Introduïu un nom."},
 		"safariWarningCard": {},
 		"storyCard": {},
-		"storyFormatCard": {},
+		"storyFormatItem": {},
 		"storyFormatSelect": {},
 		"tagEditor": {}
 	},
@@ -81,10 +81,6 @@
 				"selectAllPassages": "Selecciona tots els passatges"
 			}
 		},
-		"storyFormatList": {
-			"title": {},
-			"storyFormatExplanation": "Els formats d'història controlen l'aparença i comportament de les històries durant la reproducció."
-		},
 		"storyImport": {},
 		"storyList": {
 			"noStories": "No hi ha cap història desada al Twine ara mateix. Per començar, podeu crear una història nova i importar una existent des d'un fitxer.",

public/locales/cs.json

@@ -118,11 +118,10 @@
 			"passageCount": "1 pasáž",
 			"passageCount_plural": "{{count}} pasáží"
 		},
-		"storyFormatCard": {
+		"storyFormatItem": {
 			"author": "Autor: {{author}}",
 			"builtIn": "Vestavěné",
 			"defaultFormat": "Použito jako výchozí",
-			"editorExtensionsDisabled": "Rozšíření editoru vypnuta",
 			"license": "Licence: {{license}}",
 			"loadingFormat": "Načítání tohoto formátu příběhu...",
 			"loadError": "Tento formát příběhu se nepodařilo načíst ({{errorMessage}}).",
@@ -193,6 +192,16 @@
 			"noTags": "K pasážím v tomto příběhu nebyly zatím přidány žádné značky.",
 			"title": "Značky pasáží"
 		},
+		"storyFormats": {
+			"addStoryFormatButton": {
+				"addPreview": "{{storyFormatName}} {{storyFormatVersion}} bude přidán.",
+				"alreadyAdded": "{{storyFormatName}} {{storyFormatVersion}} už byl přidán.",
+				"fetchError": "Formát příběhu nemohl být ze zadaného URL získán ({{errorMessage}}).",
+				"invalidUrl": "Zadejte validní URL.",
+				"prompt": "K přidání nového formátu příběhu zadejte jeho URL adresu níže."
+			},
+			"noneVisible": "Žádné formáty příběhu se neshodují s žádnými kritérii, která jste vybrali."
+		},
 		"storyImport": {
 			"deselectAll": "Zrušit výběr",
 			"filePrompt": "K importování příběhu do Twinu nahrejte archiv, publikovaný příběh, nebo zdrojový kód v Twee.",
@@ -322,29 +331,6 @@
 				"passageNamesAndExcerpts": "Zobrazi názvy pasáží a úryvky z nich"
 			}
 		},
-		"storyFormatList": {
-			"noneVisible": "Žádné formáty příběhu se neshodují s žádnými kritérii, která jste vybrali.",
-			"show": "Zobrazit...",
-			"title": {
-				"all": "Všechny formáty příběhu",
-				"current": "Současné formáty příbehu",
-				"user": "Uživatelské formáty příběhu"
-			},
-			"toolbar": {
-				"addStoryFormatButton": {
-					"addPreview": "{{storyFormatName}} {{storyFormatVersion}} bude přidán.",
-					"alreadyAdded": "{{storyFormatName}} {{storyFormatVersion}} už byl přidán.",
-					"fetchError": "Formát příběhu nemohl být ze zadaného URL získán ({{errorMessage}}).",
-					"invalidUrl": "Zadejte validní URL.",
-					"prompt": "K přidání nového formátu příběhu zadejte jeho URL adresu níže."
-				},
-				"disableFormatExtensions": "Vypnout rozšíření editoru",
-				"enableFormatExtensions": "Zapnout rozšíření editoru příběhu",
-				"useAsDefaultFormat": "Použít jako výchozí formát",
-				"useAsProofingFormat": "Použít ke korektuře příběhů"
-			},
-			"storyFormatExplanation": "Příběhové formáty ovlivňují vzhled a chování příběhů během jejich přehrávání."
-		},
 		"storyList": {
 			"library": "Knihovna",
 			"noStories": "Ve Twinu nejsou uložené žádné příběhy. Aby jste začali, můžete buď vytvořit nový příběh nebo ze souboru importovat již existující.",

public/locales/da.json

@@ -31,7 +31,7 @@
 		"renameStoryButton": {"emptyName": "Indtast et navn."},
 		"safariWarningCard": {},
 		"storyCard": {},
-		"storyFormatCard": {},
+		"storyFormatItem": {},
 		"storyFormatSelect": {},
 		"tagEditor": {}
 	},
@@ -69,10 +69,6 @@
 				"publishToFile": "Udgiv som fil"
 			}
 		},
-		"storyFormatList": {
-			"title": {},
-			"storyFormatExplanation": "Historieformater styrer udseende og opførsel af historier når der spilles."
-		},
 		"storyImport": {},
 		"storyList": {
 			"noStories": "Der er ingen historier gemt i Twine lige nu. For at begynde kan du enten oprette en ny historie eller importere en eksisterende fra en fil.",

public/locales/de.json

@@ -118,11 +118,10 @@
 			"passageCount": "1 Abschnitt",
 			"passageCount_plural": "{{count}} Abschnitte"
 		},
-		"storyFormatCard": {
+		"storyFormatItem": {
 			"author": "von {{author}}",
 			"builtIn": "Erstellt am",
 			"defaultFormat": "Als Standard gesetzt",
-			"editorExtensionsDisabled": "Editor Erweiterungen Deaktiviert",
 			"license": "Lizenz: {{license}}",
 			"loadingFormat": "Lade diese Geschichtsformat...",
 			"loadError": "Dieses Geschichtsformat konnte nicht geladen werden ({{errorMessage}}).",
@@ -219,6 +218,21 @@
 				"words": "Wörter"
 			}
 		},
+		"storyFormats": {
+			"addStoryFormatButton": {
+				"addPreview": "{{storyFormatName}} {{storyFormatVersion}} wird hinzugefügt.",
+				"alreadyAdded": "{{storyFormatName}} {{storyFormatVersion}} ist bereits vorhanden.",
+				"fetchError": "Das Geschichtsformat an dieser Adresse konnte nicht abgerufen werden ({{errorMessage}}).",
+				"invalidUrl": "Bitte eine gültige URL eingeben.",
+				"prompt": "Um ein Geschichtsformat hinzuzufügen, gebe unten die Adresse ein."
+			},
+			"filterButton": {
+				"all": "Alle Geschichtsformate",
+				"current": "Momentane Geschichtsformate",
+				"user": "Vom Benutzer hinzugefügte Geschichtsformate"
+			},
+			"noneVisible": "Keine Geschichtsformate passen zu deinen Kriterien."
+		},
 		"storyJavaScript": {
 			"editorLabel": "JavaScript der Geschicht",
 			"title": "JavaScript der Geschicht",
@@ -322,29 +336,6 @@
 				"passageNamesAndExcerpts": "Zeige Abschnittsnamen und -ausschnitte"
 			}
 		},
-		"storyFormatList": {
-			"noneVisible": "Keine Geschichtsformate passen zu deinen Kriterien.",
-			"show": "Anzeigen...",
-			"title": {
-				"all": "Alle Geschichtsformate",
-				"current": "Momentane Geschichtsformate",
-				"user": "Vom Benutzer hinzugefügte Geschichtsformate"
-			},
-			"toolbar": {
-				"addStoryFormatButton": {
-					"addPreview": "{{storyFormatName}} {{storyFormatVersion}} wird hinzugefügt.",
-					"alreadyAdded": "{{storyFormatName}} {{storyFormatVersion}} ist bereits vorhanden.",
-					"fetchError": "Das Geschichtsformat an dieser Adresse konnte nicht abgerufen werden ({{errorMessage}}).",
-					"invalidUrl": "Bitte eine gültige URL eingeben.",
-					"prompt": "Um ein Geschichtsformat hinzuzufügen, gebe unten die Adresse ein."
-				},
-				"disableFormatExtensions": "Deaktiviere Editor Erweiterungen",
-				"enableFormatExtensions": "Aktiviere Editor Erweiterungen",
-				"useAsDefaultFormat": "Benutze als Standardformat",
-				"useAsProofingFormat": "Benutze zur Korrektur von Geschichten"
-			},
-			"storyFormatExplanation": "Geschichtsformate bestimmen Aussehen und Verhalten Deiner Geschichten während des Spielens."
-		},
 		"storyList": {
 			"library": "Bibliothek",
 			"noStories": "Es sind derzeit noch keine Geschichten in Twine gespeichert. Du kannst entweder eine neue Geschichte erstellen oder eine bestehende Geschichte importieren.",