Skip to content

Commit

Permalink
Merge pull request #1472 from klembot/develop
Browse files Browse the repository at this point in the history
2.8.0
  • Loading branch information
klembot authored Nov 27, 2023
2 parents b86f316 + d36cec7 commit ba52b37
Show file tree
Hide file tree
Showing 168 changed files with 16,474 additions and 42,566 deletions.
2 changes: 1 addition & 1 deletion docs/en/src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ In order to use Twine most effectively, you should spend some time reading the d
- [Snowman](https://videlais.github.io/snowman/2/)
- [SugarCube](http://www.motoslave.net/sugarcube/2/)

You might also find the [Twine Cookbook](https://twinery.org/cookbook) useful to read. It contains example code and explanations for things Twine authors often want to do.
You might also find the [Twine Cookbook](https://twinery.org/cookbook) useful to read. It contains example code and explanations for things Twine authors often want to do.
6 changes: 5 additions & 1 deletion docs/en/src/SUMMARY.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
- [Archiving and Exporting Stories](story-library/exporting.md)
- [Deleting Stories](story-library/deleting.md)
- [Tagging Stories](story-library/tagging.md)
- [Changing the Library's Location](story-library/location.md)
- [Editing Stories](editing-stories/index.md)
- [Navigating the Story Map](editing-stories/navigating.md)
- [Undoing and Redoing](editing-stories/undoing.md)
Expand All @@ -34,6 +35,7 @@
- [Proofing a Story](publishing/proofing.md)
- [Playing a Story](publishing/playing.md)
- [Publishing a Story](publishing/publishing.md)
- [The Scratch Folder](publishing/scratch-folder.md)
- [Managing Story Formats](story-formats/index.md)
- [Viewing Story Formats](story-formats/viewing.md)
- [Changing the Default Story Format](story-formats/default.md)
Expand All @@ -44,6 +46,7 @@
- [How Twine Manages Story Format Versions](story-formats/versions.md)
- [Customizing Twine](customizing/index.md)
- [Setting Preferences](customizing/preferences.md)
- [Command-Line Switches](customizing/command-line.md)
- [Advanced Customization](customizing/advanced.md)
- [Limitations](limitations/index.md)
- [Large Stories](limitations/large-stories.md)
Expand All @@ -57,4 +60,5 @@
- [If An Error Message Appears While Editing](troubleshooting/error-message.md)
- [If Twine Won't Start](troubleshooting/wont-start.md)
- [If Twine Lost Your Story](troubleshooting/lost-story.md)
- [If Your Story Is Damaged](troubleshooting/damaged-story.md)
- [If Your Story Is Damaged](troubleshooting/damaged-story.md)
- [If You See Visual Glitches in Twine](troubleshooting/visual-glitches.md)
2 changes: 1 addition & 1 deletion docs/en/src/customizing/advanced.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ features.
Here's a sample `user.css` that replaces the graph paper background of the story
map with a plain gray color:

```
```css
.passage-map {
background: hsl(0, 0%, 75%) !important;
}
Expand Down
129 changes: 129 additions & 0 deletions docs/en/src/customizing/command-line.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
# Command-Line Switches

This page only applies to app Twine.

In addition to preferences you set through Twine's user interface, you can
customize app Twine's behavior through command-line switches. These change
Twine's behavior in only the session you launch with these switches. They don't
change preferences you have set using other methods.

## Setting Command-Line Switches

The way you set command-line switches depends on what operating system you use.

### Linux

These are set in the command that launches Twine. If you are launching Twine via
a terminal session, you'd add them to that command. If you are launching it
using a desktop environment like Gnome or KDE, check to documentation for your
desktop environment for directions.

### macOS

There are two ways to accomplish this:

- Launch Twine using the Terminal application and add the switches to the end of
the command launching Twine. You will need to invoke the Twine executable
directly, like this:

```
/Applications/Twine.app/Contents/MacOS/Twine --switch --switch2
```

- Create an AppleScript that runs the command for you. See [this StackOverflow
post](https://superuser.com/a/16777) for details.

### Windows

There are two ways to do this:

- Launch Twine using the Command Prompt or Console application. Add switches to
the end of the command launching Twine, like this:

```
C:\Program Files\Twine\Twine.exe --switch --switch2
```

- Edit the shortcut that you use to launch Twine, or create a new one. Add
command-line switches to the end of the _Target_ field of the shortcut dialog,
following the example above.

Although some applications on Windows use `/` to start command-line switches,
Twine doesn't. It uses `--`, the same as on other operating systems.

## A Reminder About Spaces and Pathnames

Many command line switches used by Twine set pathnames for folders. If a folder
in the path you want to set contains a space, you must put quotation marks
around the entire path, like so:

<code>&#x2011;&#x2011;scratchFolderPath="C:\Users\Jane Doe\twine-scratch"</code>

## Backup Folder Switches

### <code>--backupFolderPath=_[path]_</code>

Example: <code>&#x2011;&#x2011;backupFolderPath=/Users/janedoe/twine-backups/</code>

This sets the full pathname of the backup folder to use. Twine will create this
folder if it doesn't already exist. If Twine isn't able to do this, or isn't
able to read the files in this folder, it will show an error message whenever it
tries to save a backup of your story library.

**Never set your backup folder to a folder that has files created by other
applications in it.** Twine can't distinguish between backups it created and any
other files, and **will delete them permanently** when they become too old.

## Graphics Switches

### <code>--disableHardwareAcceleration=_[true or false]_</code>

Example: <code>&#x2011;&#x2011;disableHardwareAcceleration=true</code>

This disables hardware accelerated graphics in Twine. This should only be needed
if you experience visual glitches in Twine. Disabling hardware acceleration will
likely make Twine less performant in general.

## Story Library Folder Switches

### <code>--storyLibraryFolderPath=_[path]_</code>

Example:
<code>&#x2011;&#x2011;storyLibraryFolderPath=/Users/janedoe/twine-stories/</code>

This sets the full pathname of the story library. For example,
<code>&#x2011;&#x2011;storyLibraryFolderPath=/Users/janedoe/twine-stories</code>.
Twine will create this folder if it doesn't already exist. If Twine isn't able
to do this, or it isn't able to read the files in this folder, it will show a
dialog box where you can choose to either use the default folder instead, or to
quit the app.

## Scratch Folder Switches

You can use a different location as your scratch folder, or change the length of
time Twine keeps files around for in the scratch folder. For example, if your
main storage volume is a solid state drive and you'd like to avoid writing to
it, you can use a different volume.

### <code>--scratchFolderPath=_[path]_</code>

Example: <code>&#x2011;&#x2011;scratchFolderPath=/tmp/twine-scratch</code>

This sets the full pathname of the scratch folder to use. If this folder doesn't
already exist, Twine will try to create it. If Twine is unable to create the
folder at the path you've set, it will show an error message when you play,
test, or proof a story.

**Never set your scratch folder to a folder that has files created by other
applications in it.** Twine can't distinguish between files it created and any
other files, and **will delete them permanently** when they become too old.

### <code>--scratchFileCleanupAge=_[number]_</code>

Example: <code>&#x2011;&#x2011;scratchFileCleanupAge=60</code>

This sets how old a file must be before Twine deletes it from the scratch
folder, in minutes. Twine considers the last time the file was modified, not
when it was created, when deciding whether to keep the file. To have Twine
delete all files from the scratch folder every time you quit it, set
<code>&#x2011;&#x2011;scratchFileCleanupAge=0</code>.
2 changes: 1 addition & 1 deletion docs/en/src/customizing/index.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Customizing Twine

This section describes how you can customize Twine to fit your needs.
This section describes how you can customize Twine to fit your needs.
2 changes: 1 addition & 1 deletion docs/en/src/customizing/preferences.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,4 @@ and JavaScript edit dialogs.)
- The _Custom_ font setting allows you to specify any font that's installed in
your computer. You _must_ spell this font name exactly right, including any
spaces or other symbols in the font name. Capitalization doesn't matter when
setting a custom font.
setting a custom font.
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/changing-story-format.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ tab. There's a menu in the dialog that opens that allows you to set a different
format.

Story formats must be [installed in Twine](../story-formats/adding.md) before
they appear in this menu.
they appear in this menu.
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/deleting.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ shortcut.

Deleting passages can be undone using [the buttons in the corner of the top
toolbar](undoing.md). (So can almost all actions in the Story Map screen, but
because deleting stories is permanent, it's worth calling out here.)
because deleting stories is permanent, it's worth calling out here.)
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/editing-passages.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ are true:
- It is linked to from another passage
- It has any tags
- It has a different size than the default
- It is the story start
- It is the story start

## Text Formatting, Code, Images, Sound, Video... Basically Everything Cool

Expand Down
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/finding-replacing.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ has a good introduction to the topic.
If you use regular expressions in your search, the _Replace_ field can also
contain backreferences. For example, if you enter `(.)and` in the _Find_ field
and `$1---` in the _Replace_ field, the text `Sand band` will be replaced to
`S--- b---`.
`S--- b---`.
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@

When you edit a story from the Story Library screen, it will take you to a view
of the story called the Story Map screen. You'll probably spend most of your
time in Twine here.
time in Twine here.
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/linking-passages.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ that use story format-specific functionality, like code.
It's possible to use more than plain text as the trigger for a link, but how
this works is dependent on the story format you are using. It's often possible,
for example, to enter an HTML `<img>` tag in the label part of a link. But this
may or may not be supported by the story format you are using.
may or may not be supported by the story format you are using.
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/navigating.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ text field.
This will open a dialog with a search field. Enter either the name of a passage
or some text it contains, and a list of matching passages will appear. Twine
uses fuzzy matching, so you don't have to enter the passage name exactly, and it
will find close matches if you make a typo. When deciding which pasages match
will find close matches if you make a typo. When deciding which passages match
what you've typed, it slightly prefers matches in a passage name to what's in
passage text.

Expand Down
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/renaming.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ top toolbar. The only restriction on story names is that they must be unique
among your library.

You can also rename a story [in the _Story Library_
screen](../story-library/renaming.md).
screen](../story-library/renaming.md).
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/selecting.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ each story in your library, so one story can use grid snapping while another
doesn't.

Grid snapping only affects passage cards when you move them. It doesn't affect
the existing position of cards.
the existing position of cards.
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/stats.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ _Story_ top toolbar tab. This shows:

IFIDs are akin to ISBNs for books. They help catalog Twine stories alongside
other forms of interactive fiction. You can learn more about IFIDs at [the
Interactive Fiction Database](https://ifdb.org/help-ifid).
Interactive Fiction Database](https://ifdb.org/help-ifid).
2 changes: 1 addition & 1 deletion docs/en/src/editing-stories/undoing.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ When you leave the Story Map screen, either going to a different screen in Twine
or closing the application entirely, your undo history is discarded.

If the undo or redo button is disabled, that's because there's nothing to undo
or redo yet.
or redo yet.
5 changes: 3 additions & 2 deletions docs/en/src/getting-started/basic-concepts.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ _library_ for short.

If you're using browser Twine, the library is stored invisibly in your browser's
storage. However, if you're using app Twine, you'll find your library in a
folder named Twine in your documents folder. Or use the _Show Story Library_
folder named _Twine_ in your documents folder. Or use the _Show Story Library_
menu item in the _View_ menu of Twine's main menu bar (not the top toolbar).
[This location can be changed](../story-library/location.md).

Your library belongs to just you, regardless of whether you're using app or
browser Twine. You can't share it directly with other people, but you can
Expand Down Expand Up @@ -76,7 +77,7 @@ for others.

Twine includes four story formats when you download it, and it is possible to
[add other story formats](../story-formats/adding.md) that people in the
community have made.
community have made.

- [**Chapbook**](https://klembot.github.io/chapbook/) is the youngest story
format. It's designed to be easy to learn and to make many common tasks people
Expand Down
2 changes: 1 addition & 1 deletion docs/en/src/getting-started/downgrading.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@ uses.

You may also need to [reset your preferences](../troubleshooting/wont-start.md).
Although the instructions linked are for the most recent version of Twine, they
will probably work with most older versions of Twine as well.
will probably work with most older versions of Twine as well.
2 changes: 1 addition & 1 deletion docs/en/src/getting-started/getting-around.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,4 @@ Dialog boxes have a few controls in their title bar:

You can have as many dialogs open as you have room onscreen for. Right now, the
order of dialogs can't be changed, nor can their position onscreen be changed.
The width of dialogs can be changed in [preferences](../preferences).
The width of dialogs can be changed in [preferences](../preferences).
2 changes: 1 addition & 1 deletion docs/en/src/getting-started/index.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Getting Started

This section describes Twine from the ground up: how to start using it and basic
concepts that are key to understanding how it works.
concepts that are key to understanding how it works.
2 changes: 1 addition & 1 deletion docs/en/src/getting-started/installing.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ your platform (Linux, macOS, or Windows).
Directly](../troubleshooting/local-storage.md). Local storage is similar to
browser cookies, which you might be more familiar with, but cookies are
limited to 4 KB of storage, whereas local storage can hold megabytes of data
(the exact number is dependent on the browser).
(the exact number is dependent on the browser).
2 changes: 1 addition & 1 deletion docs/en/src/getting-started/uninstalling.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ you're using.
to uninstall it.
- On macOS, delete the Twine app from your Applications folder.
- On Windows, right-click the Twine entry in your Start menu and choose
_Uninstall_.
_Uninstall_.
8 changes: 4 additions & 4 deletions docs/en/src/getting-started/updating.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

## Browser Twine

Browser Twine is updated whenver there's a new release, so there's no work for
Browser Twine is updated when there's a new release, so there's no work for
you to do to stay up-to-date. If you need to use an older version, go to
https://twinery.org/[version number]. That is, to use 2.3.13, go to
https://twinery.org/2.3.13. These different versions will use the same story
`https://twinery.org/[version number]`. That is, to use 2.3.13, go to
`https://twinery.org/2.3.13`. These different versions will use the same story
library and preferences.

Keep in mind, though, that earlier versions will have bugs the most recent
Expand All @@ -18,4 +18,4 @@ To check if a newer version of Twine is available, choose _Check for Updates_
from the menu named _Twine_ in the menu bar (not the top toolbar). Twine will
tell you if there's an update available and, if you like, will direct you to
where to go to download the new version. Twine doesn't automatically update
itself.
itself.
2 changes: 1 addition & 1 deletion docs/en/src/limitations/collaborating.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ If you're using app Twine, using cloud storage services like Dropbox or Google
Drive to sync your story library is not recommended. It is very easy for these
services to get confused as to the state of your story files--they often try to
merge changes from different sources together on your behalf--and cause your
stories to become corrupted.
stories to become corrupted.
2 changes: 1 addition & 1 deletion docs/en/src/limitations/combining.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ files, using a notation called
If you want to have multiple, separate story files that communicate with each
other in some way--say, for an episodic game--then how you might do that is
specific to the story format you are using, so check its documentation for
details.
details.
2 changes: 1 addition & 1 deletion docs/en/src/limitations/index.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Limitations

Twine, like any piece of software, isn't perfect. In this section, some
limitations of Twine are described as well as possible ways to work around them.
limitations of Twine are described as well as possible ways to work around them.
4 changes: 2 additions & 2 deletions docs/en/src/limitations/large-stories.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ number of passages, amount of text, or number of links.

If you're using browser Twine, you are limited by the amount of storage space
your browser allows Twine. You can see the amount of space available as a
percentage in the corner of the Story Library screen.
percentage in the corner of the Story Library screen.

If you're using app Twine, you're limited by the amount of space on your
computer, but you're very unlikely to be limited by this in practice.
Expand All @@ -18,4 +18,4 @@ more. As a result, it's hard to advise specific actions if you notice that Twine
is sluggish with your story.

One possibility, though, is to [split your story](./combining.md) into multiple
stories.
stories.
2 changes: 1 addition & 1 deletion docs/en/src/limitations/multimedia.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ preview it with the multimedia files.
It is possible to use [Base64
encoding](https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URLs)
to embed multimedia directly into a Twine story, but this isn't recommended as
it is difficult to work with and will make your stories much larger in size.
it is difficult to work with and will make your stories much larger in size.
2 changes: 1 addition & 1 deletion docs/en/src/limitations/source-control.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ stories difficult. Converting your stories to the plain-text Twee format before
checking them into a source code repository can help with this. Command-line
tools like [Tweego](https://www.motoslave.net/tweego/),
[Extwee](https://github.com/videlais/extwee), and
[twine-utils](https://www.npmjs.com/package/twine-utils) can do this for you.
[twine-utils](https://www.npmjs.com/package/twine-utils) can do this for you.
Loading

0 comments on commit ba52b37

Please sign in to comment.