Change design

composer.dev.json

@@ -1,6 +1,6 @@
 {
-    "name": "franzz/mythoughts",
-    "description": "MyThoughts",
+    "name": "franzz/daydream",
+    "description": "Daydream",
     "type": "project",
 	"license": "GPL-3.0-or-later",
 	"repositories": [
@@ -21,7 +21,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Franzz\\MyThoughts\\": "lib/",
+            "Franzz\\Daydream\\": "lib/",
             "Franzz\\Objects\\": "../objects/inc/"
         },
         "files": [

composer.json

@@ -1,6 +1,6 @@
 {
-    "name": "franzz/mythoughts",
-    "description": "MyThoughts",
+    "name": "franzz/daydream",
+    "description": "Daydream",
     "type": "project",
 	"license": "GPL-3.0-or-later",
 	"repositories": [
@@ -18,7 +18,7 @@
     },
     "autoload": {
         "psr-4": {
-            "Franzz\\MyThoughts\\": "lib/"
+            "Franzz\\Daydream\\": "lib/"
         },
         "files": [
             "config/settings.php"

config/apache-localhost.conf

@@ -1,12 +1,12 @@
-# Serve https://localhost/mythoughts/ from the public web root.
+# Serve https://localhost/daydream/ from the public web root.
 #
 # Include this from the site VirtualHost (or paste the Alias/Directory block
 # into the existing one). Everything outside public/ - lib/, config/, vendor/,
 # node_modules/ - stays off the document root and is never web-reachable.
 
-Alias /mythoughts /var/www/html/mythoughts/public
+Alias /daydream /var/www/html/daydream/public
 
-<Directory /var/www/html/mythoughts/public>
+<Directory /var/www/html/daydream/public>
 	Options FollowSymLinks
 	AllowOverride None
 	Require all granted

config/settings-sample.php

@@ -4,7 +4,7 @@ class Settings {
 	public const DB_SERVER = 'localhost';
 	public const DB_LOGIN = '';
 	public const DB_PASS = '';
-	public const DB_NAME = 'mythoughts';
+	public const DB_NAME = 'daydream';
 	public const DB_ENC = 'utf8mb4';
 	public const TEXT_ENC = 'UTF-8';
 	public const TIMEZONE = 'Europe/Zurich';

lib/Controller.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Franzz\MyThoughts;
+namespace Franzz\Daydream;
 
 use Franzz\Objects\PhpObject;
 use Franzz\Objects\ToolBox;
@@ -28,7 +28,7 @@ class Controller extends PhpObject {
 		'logout'
 	];
 
-	private MyThoughts $oMyThoughts;
+	private Daydream $oDaydream;
 	private array $asReq = [];
 	private string $sCsrfToken = '';
 
@@ -64,32 +64,32 @@ class Controller extends PhpObject {
 		//Authentication and CSRF protection share the same server-side session.
 		$this->initCsrfToken();
 
-		$this->oMyThoughts = new MyThoughts($sProcessPage, $this->asReq['t']);
+		$this->oDaydream = new Daydream($sProcessPage, $this->asReq['t']);
 
 		//Validate CSRF, then release the session lock before long-running work.
 		$bValidMutationRequest = $this->validateMutationRequest($sAction);
 		if(!$bValidMutationRequest || !in_array($sAction, self::SESSION_WRITING_ACTIONS, true)) $this->closeSession();
 
-		if(!$bValidMutationRequest) $sResult = MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED);
-		else $sResult = ($sAction == '') ? $this->oMyThoughts->getAppMainPage($this->getCsrfToken()) : $this->dispatch($sAction);
+		if(!$bValidMutationRequest) $sResult = Daydream::getJsonResult(false, Daydream::UNAUTHORIZED);
+		else $sResult = ($sAction == '') ? $this->oDaydream->getAppMainPage($this->getCsrfToken()) : $this->dispatch($sAction);
 
 		//Clean errors
 		$sDebug = ob_get_clean();
-		if($sDebug != '') $this->oMyThoughts->addUncaughtError($sDebug);
+		if($sDebug != '') $this->oDaydream->addUncaughtError($sDebug);
 		$this->closeSession();
 
 		return $sResult;
 	}
 
 	private function dispatch(string $sAction): string {
-		$oJournal = $this->oMyThoughts->getJournal();
+		$oJournal = $this->oDaydream->getJournal();
 
 		return match($sAction) {
 			/* Account */
-			'signup'		=> $this->oMyThoughts->signup($this->asReq['name'], $this->asReq['email'], $this->asReq['password'], $this->asReq['t']),
-			'login'			=> $this->oMyThoughts->login($this->asReq['email'], $this->asReq['password'], $this->asReq['t'], $this->asReq['remember']),
-			'logout'		=> $this->oMyThoughts->logout(),
-			'account'		=> $this->oMyThoughts->updateAccount($this->asReq['field'], $this->asReq['value']),
+			'signup'		=> $this->oDaydream->signup($this->asReq['name'], $this->asReq['email'], $this->asReq['password'], $this->asReq['t']),
+			'login'			=> $this->oDaydream->login($this->asReq['email'], $this->asReq['password'], $this->asReq['t'], $this->asReq['remember']),
+			'logout'		=> $this->oDaydream->logout(),
+			'account'		=> $this->oDaydream->updateAccount($this->asReq['field'], $this->asReq['value']),
 
 			/* Reading the book */
 			'book'			=> $oJournal->getBook(),
@@ -102,7 +102,7 @@ class Controller extends PhpObject {
 			'close_entry'	=> $oJournal->closeEntry($this->asReq['id'], $this->asReq['content'], $this->asReq['has_content']),
 			'delete_entry'	=> $oJournal->deleteEntry($this->asReq['id']),
 
-			default			=> MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND)
+			default			=> Daydream::getJsonResult(false, Daydream::NOT_FOUND)
 		};
 	}
 

lib/Daydream.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Franzz\MyThoughts;
+namespace Franzz\Daydream;
 
 use Franzz\Objects\Db;
 use Franzz\Objects\Main;
@@ -16,10 +16,39 @@ use Settings;
  * page stamped with the local time of the moment it was written - and the
  * client formats from a UNIX timestamp, never from a preformatted string.
  */
-class MyThoughts extends Main {
-	public const PROJECT_NAME = 'MyThoughts';
+class Daydream extends Main {
+	public const PROJECT_NAME = 'Daydream';
 	public const DEFAULT_LANG = 'en';
 
+	/**
+	 * The hands the book can be written in.
+	 *
+	 * One list, here, because two things need it and they must not drift: the
+	 * settings picker offers it, and updateSettings() validates against it.
+	 *
+	 * `scale` is the type size as a fraction of one ruled line. It is not
+	 * cosmetic - every one of these hands has a different x-height for the same
+	 * em, so a single size would leave one sitting on the rule and the next
+	 * floating above it. The values are measured, not chosen.
+	 *
+	 * Adding one here also needs its webfont imported in src/scripts/fonts.js.
+	 */
+	public const HANDS = [
+		['id' => 'caveat',      'name' => 'Caveat',              'family' => '"Caveat Variable", "Caveat"',  'scale' => 0.82],
+		['id' => 'kalam',       'name' => 'Kalam',               'family' => '"Kalam"',                      'scale' => 0.81],
+		['id' => 'patrick',     'name' => 'Patrick Hand',        'family' => '"Patrick Hand"',               'scale' => 0.8],
+		['id' => 'shadows',     'name' => 'Shadows Into Light',  'family' => '"Shadows Into Light"',         'scale' => 0.7],
+		['id' => 'architect',   'name' => "Architect's Daughter",'family' => '"Architects Daughter"',        'scale' => 0.68],
+		['id' => 'indie',       'name' => 'Indie Flower',        'family' => '"Indie Flower"',               'scale' => 0.67]
+	];
+
+	public const DEFAULT_HAND = 'caveat';
+
+	/** @return string[] ids of every hand on offer */
+	public static function getHandIds(): array {
+		return array_column(self::HANDS, 'id');
+	}
+
 	//The dictionaries shipped in resources/lang. Listed rather than globbed:
 	//Translator resolves its folder relative to the calling script, and the
 	//settings panel needs the list on a page load either way.
@@ -62,7 +91,7 @@ class MyThoughts extends Main {
 	protected function getSqlOptions() {
 		return [
 			'tables' => [
-				User::USER_TABLE	=> ['name', 'email', 'password', 'token', 'token_exp', 'language', 'timezone', 'clearance'],
+				User::USER_TABLE	=> ['name', 'email', 'password', 'token', 'token_exp', 'language', 'timezone', 'hand', 'clearance'],
 				Journal::ENTRY_TABLE=> [Db::getId(User::USER_TABLE), 'content', 'status', 'started_on', 'closed_on', 'timezone']
 			],
 			'types' => [
@@ -71,6 +100,7 @@ class MyThoughts extends Main {
 				'password'	=> "VARCHAR(255) NOT NULL DEFAULT ''",
 				'token'		=> "VARCHAR(64) NOT NULL DEFAULT ''",
 				'token_exp'	=> 'TIMESTAMP DEFAULT 0',
+				'hand'		=> "VARCHAR(20) NOT NULL DEFAULT '".self::DEFAULT_HAND."'",
 				'language'	=> 'VARCHAR(2)',
 				'timezone'	=> 'CHAR(64) NOT NULL',			//see mysql.time_zone_name
 				'clearance'	=> 'TINYINT(1) DEFAULT '.User::CLEARANCE_USER,
@@ -102,6 +132,7 @@ class MyThoughts extends Main {
 				'consts'	=> [
 					'title'				=> self::PROJECT_NAME,
 					'languages'			=> self::LANGUAGES,
+					'hands'				=> self::HANDS,
 					'chunk_size'		=> Journal::CHUNK_SIZE,
 					'default_timezone'	=> Settings::TIMEZONE,
 					'autosave_delay'	=> 1200,	//ms of stillness before a save

lib/Journal.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Franzz\MyThoughts;
+namespace Franzz\Daydream;
 
 use Franzz\Objects\Db;
 use Franzz\Objects\PhpObject;
@@ -47,13 +47,13 @@ class Journal extends PhpObject {
 	 * the calendar. Bookmarks stay cheap - id and timestamp only, no content.
 	 */
 	public function getBook(): string {
-		if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED);
+		if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED);
 
 		$this->sealStaleEntries();
 
 		$asEntries = $this->getEntryWindow();
 
-		return MyThoughts::getJsonResult(true, '', [
+		return Daydream::getJsonResult(true, '', [
 			'entries'	=> $asEntries,
 			'bookmarks'	=> $this->getBookmarks(),
 			'has_older'	=> $this->hasOlderThan($asEntries[0]['id'] ?? 0),
@@ -62,7 +62,7 @@ class Journal extends PhpObject {
 	}
 
 	public function getEntries(string $sDirection, int $iCursorId): string {
-		if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED);
+		if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED);
 
 		$asEntries = match($sDirection) {
 			'before'	=> $this->getEntryWindow($iCursorId, 'before'),
@@ -71,9 +71,9 @@ class Journal extends PhpObject {
 			default		=> null
 		};
 
-		if($asEntries === null) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND);
+		if($asEntries === null) return Daydream::getJsonResult(false, Daydream::NOT_FOUND);
 
-		return MyThoughts::getJsonResult(true, '', [
+		return Daydream::getJsonResult(true, '', [
 			'entries'	=> $asEntries,
 			'has_older'	=> $this->hasOlderThan($asEntries[0]['id'] ?? 0),
 			'has_newer'	=> $this->hasNewerThan(end($asEntries)['id'] ?? 0)
@@ -86,18 +86,18 @@ class Journal extends PhpObject {
 	 * everything after it is blank.
 	 */
 	public function getEntryIdAtDate(string $sDate): string {
-		if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED);
+		if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED);
 
 		$oDate = \DateTime::createFromFormat('Y-m-d', $sDate);
-		if(!$oDate) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND);
+		if(!$oDate) return Daydream::getJsonResult(false, Daydream::NOT_FOUND);
 		$sDate = $oDate->format('Y-m-d');
 
 		$sMidnight = $sDate.' 00:00:00';
 		$iEntryId = $this->selectFirstId(['started_on' => $sMidnight], ['started_on' => ' >= '], 'ASC');
 		if(!$iEntryId) $iEntryId = $this->selectFirstId(['started_on' => $sMidnight], ['started_on' => ' < '], 'DESC');
-		if(!$iEntryId) return MyThoughts::getJsonResult(false, 'book.no_entry_yet');
+		if(!$iEntryId) return Daydream::getJsonResult(false, 'book.no_entry_yet');
 
-		return MyThoughts::getJsonResult(true, '', ['id' => (int) $iEntryId]);
+		return Daydream::getJsonResult(true, '', ['id' => (int) $iEntryId]);
 	}
 
 	/* Writing */
@@ -107,7 +107,7 @@ class Journal extends PhpObject {
 	 * open from a reload a minute ago, or a fresh one stamped with now.
 	 */
 	public function openEntry(): string {
-		if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED);
+		if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED);
 
 		$this->sealStaleEntries();
 
@@ -119,27 +119,27 @@ class Journal extends PhpObject {
 				'content'					=> '',
 				'status'					=> self::STATUS_OPEN,
 				'started_on'				=> date(Db::TIMESTAMP_FORMAT),
-				'closed_on'					=> MyThoughts::ZERO_TIMESTAMP,
+				'closed_on'					=> Daydream::ZERO_TIMESTAMP,
 				'timezone'					=> date_default_timezone_get()
 			]);
 
-			if($iEntryId <= 0) return MyThoughts::getJsonResult(false, 'error.commit_db');
+			if($iEntryId <= 0) return Daydream::getJsonResult(false, 'error.commit_db');
 		}
 
-		return MyThoughts::getJsonResult(true, '', ['entry' => $this->getEntryById($iEntryId)]);
+		return Daydream::getJsonResult(true, '', ['entry' => $this->getEntryById($iEntryId)]);
 	}
 
 	public function saveEntry(int $iEntryId, string $sContent): string {
-		if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED);
-		if(!$this->ownsEntry($iEntryId)) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND);
+		if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED);
+		if(!$this->ownsEntry($iEntryId)) return Daydream::getJsonResult(false, Daydream::NOT_FOUND);
 
 		$sContent = self::normaliseContent($sContent);
 
 		if($this->oDb->updateRow(self::ENTRY_TABLE, $iEntryId, ['content' => $sContent]) === false) {
-			return MyThoughts::getJsonResult(false, 'error.commit_db');
+			return Daydream::getJsonResult(false, 'error.commit_db');
 		}
 
-		return MyThoughts::getJsonResult(true, '', ['id' => $iEntryId, 'saved_at' => time()]);
+		return Daydream::getJsonResult(true, '', ['id' => $iEntryId, 'saved_at' => time()]);
 	}
 
 	/**
@@ -147,11 +147,11 @@ class Journal extends PhpObject {
 	 * nobody actually wrote in is dropped rather than left as a blank page.
 	 */
 	public function closeEntry(int $iEntryId, string $sContent = '', bool $bHasContent = false): string {
-		if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED);
-		if(!$this->ownsEntry($iEntryId)) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND);
+		if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED);
+		if(!$this->ownsEntry($iEntryId)) return Daydream::getJsonResult(false, Daydream::NOT_FOUND);
 
 		$asResult = $this->sealEntry($iEntryId, $bHasContent ? $sContent : null);
-		return MyThoughts::getJsonResult($asResult['result'], $asResult['desc_lang_id'], $asResult['data']);
+		return Daydream::getJsonResult($asResult['result'], $asResult['desc_lang_id'], $asResult['data']);
 	}
 
 	/**
@@ -169,23 +169,23 @@ class Journal extends PhpObject {
 
 		if(trim($sStored) === '') {
 			$this->oDb->deleteRow(self::ENTRY_TABLE, $iEntryId);
-			return MyThoughts::getResult(true, '', ['id' => $iEntryId, 'discarded' => true]);
+			return Daydream::getResult(true, '', ['id' => $iEntryId, 'discarded' => true]);
 		}
 
 		if($this->oDb->updateRow(self::ENTRY_TABLE, $iEntryId, $asData) === false) {
-			return MyThoughts::getResult(false, 'error.commit_db');
+			return Daydream::getResult(false, 'error.commit_db');
 		}
 
-		return MyThoughts::getResult(true, '', ['entry' => $this->getEntryById($iEntryId), 'discarded' => false]);
+		return Daydream::getResult(true, '', ['entry' => $this->getEntryById($iEntryId), 'discarded' => false]);
 	}
 
 	public function deleteEntry(int $iEntryId): string {
-		if(!$this->oUser->isLoggedIn()) return MyThoughts::getJsonResult(false, MyThoughts::UNAUTHORIZED);
-		if(!$this->ownsEntry($iEntryId)) return MyThoughts::getJsonResult(false, MyThoughts::NOT_FOUND);
+		if(!$this->oUser->isLoggedIn()) return Daydream::getJsonResult(false, Daydream::UNAUTHORIZED);
+		if(!$this->ownsEntry($iEntryId)) return Daydream::getJsonResult(false, Daydream::NOT_FOUND);
 
-		if(!$this->oDb->deleteRow(self::ENTRY_TABLE, $iEntryId)) return MyThoughts::getJsonResult(false, 'error.commit_db');
+		if(!$this->oDb->deleteRow(self::ENTRY_TABLE, $iEntryId)) return Daydream::getJsonResult(false, 'error.commit_db');
 
-		return MyThoughts::getJsonResult(true, 'book.entry_deleted', ['id' => $iEntryId]);
+		return Daydream::getJsonResult(true, 'book.entry_deleted', ['id' => $iEntryId]);
 	}
 
 	/* Internals */
@@ -265,7 +265,9 @@ class Journal extends PhpObject {
 			],
 			'from'		=> self::ENTRY_TABLE,
 			'constraint'=> [Db::getId(User::USER_TABLE) => $this->oUser->getUserId()],
-			'orderBy'	=> [$sIdColumn => 'ASC']
+			//By when it was written, not by when it was inserted. The id is only
+			//the tiebreaker for two entries begun in the same second.
+			'orderBy'	=> ['started_on' => 'ASC', $sIdColumn => 'ASC']
 		]);
 
 		return array_map(static function(array $asRow): array {

lib/User.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Franzz\MyThoughts;
+namespace Franzz\Daydream;
 
 use Franzz\Objects\Db;
 use Franzz\Objects\PhpObject;
@@ -26,12 +26,13 @@ class User extends PhpObject {
 		'email'		=> '',
 		'language'	=> '',
 		'timezone'	=> '',
+		'hand'		=> Daydream::DEFAULT_HAND,
 		'clearance'	=> self::CLEARANCE_USER
 	];
 
 	//Session & Cookie
 	private const SESSION_ID_USER = 'id_user';
-	private const COOKIE_TOKEN = 'mythoughts';
+	private const COOKIE_TOKEN = 'daydream';
 	private const COOKIE_DURATION = 60 * 60 * 24 * 90; //3 months
 
 	private Db $oDb;
@@ -100,14 +101,14 @@ class User extends PhpObject {
 		$sEmail = mb_strtolower(trim($sEmail));
 		$sName = mb_substr(trim($sName), 0, self::MAX_NAME_LENGTH);
 
-		if($sName === '') return MyThoughts::getResult(false, 'account.name_required');
-		if(!filter_var($sEmail, FILTER_VALIDATE_EMAIL)) return MyThoughts::getResult(false, 'account.invalid_email');
-		if(mb_strlen($sPassword) < self::MIN_PASSWORD_LENGTH) return MyThoughts::getResult(false, 'account.password_too_short', [], [self::MIN_PASSWORD_LENGTH]);
+		if($sName === '') return Daydream::getResult(false, 'account.name_required');
+		if(!filter_var($sEmail, FILTER_VALIDATE_EMAIL)) return Daydream::getResult(false, 'account.invalid_email');
+		if(mb_strlen($sPassword) < self::MIN_PASSWORD_LENGTH) return Daydream::getResult(false, 'account.password_too_short', [], [self::MIN_PASSWORD_LENGTH]);
 
 		//Taken emails must not be distinguishable from a wrong password, so the
 		//message stays the same one login gives - no account enumeration here.
 		if($this->oDb->selectId(self::USER_TABLE, ['email' => $sEmail]) > 0) {
-			return MyThoughts::getResult(false, 'account.invalid_credentials');
+			return Daydream::getResult(false, 'account.invalid_credentials');
 		}
 
 		$iUserId = $this->oDb->insertRow(self::USER_TABLE, [
@@ -116,13 +117,14 @@ class User extends PhpObject {
 			'password'	=> password_hash($sPassword, PASSWORD_DEFAULT),
 			'language'	=> $sLang,
 			'timezone'	=> $sTimezone,
+			'hand'		=> Daydream::DEFAULT_HAND,
 			'clearance'	=> self::CLEARANCE_USER
 		]);
 
-		if($iUserId <= 0) return MyThoughts::getResult(false, 'error.commit_db');
+		if($iUserId <= 0) return Daydream::getResult(false, 'error.commit_db');
 
 		$this->openSessionFor($iUserId, true);
-		return MyThoughts::getResult(true, 'account.welcome', ['user' => $this->getUserInfo()]);
+		return Daydream::getResult(true, 'account.welcome', ['user' => $this->getUserInfo()]);
 	}
 
 	public function login(string $sEmail, string $sPassword, string $sTimezone, bool $bRemember): array {
@@ -140,14 +142,14 @@ class User extends PhpObject {
 		$sHash = $asDbUser['password'] ?? '';
 		$bValid = ($sHash !== '') ? password_verify($sPassword, $sHash) : password_verify($sPassword, '$2y$10$'.str_repeat('.', 53));
 
-		if($iUserId <= 0 || !$bValid) return MyThoughts::getResult(false, 'account.invalid_credentials');
+		if($iUserId <= 0 || !$bValid) return Daydream::getResult(false, 'account.invalid_credentials');
 
 		if($sTimezone !== '' && $sTimezone !== ($asDbUser['timezone'] ?? '')) {
 			$this->oDb->updateRow(self::USER_TABLE, $iUserId, ['timezone' => $sTimezone]);
 		}
 
 		$this->openSessionFor($iUserId, $bRemember);
-		return MyThoughts::getResult(true, 'account.logged_in', ['user' => $this->getUserInfo()]);
+		return Daydream::getResult(true, 'account.logged_in', ['user' => $this->getUserInfo()]);
 	}
 
 	public function logout(): array {
@@ -157,23 +159,24 @@ class User extends PhpObject {
 		if(session_status() === PHP_SESSION_ACTIVE) session_regenerate_id(true);
 
 		$this->setUserId(0);
-		return MyThoughts::getResult(true, 'account.logged_out');
+		return Daydream::getResult(true, 'account.logged_out');
 	}
 
 	public function updateSettings(string $sField, string $sValue): array {
-		if(!$this->isLoggedIn()) return MyThoughts::getResult(false, MyThoughts::UNAUTHORIZED);
-		if(!in_array($sField, ['name', 'language', 'timezone'], true)) return MyThoughts::getResult(false, MyThoughts::NOT_FOUND);
+		if(!$this->isLoggedIn()) return Daydream::getResult(false, Daydream::UNAUTHORIZED);
+		if(!in_array($sField, ['name', 'language', 'timezone', 'hand'], true)) return Daydream::getResult(false, Daydream::NOT_FOUND);
 
 		$sValue = mb_substr(trim($sValue), 0, self::MAX_NAME_LENGTH);
-		if($sField === 'name' && $sValue === '') return MyThoughts::getResult(false, 'account.name_required');
-		if($sField === 'timezone' && !in_array($sValue, \DateTimeZone::listIdentifiers(), true)) return MyThoughts::getResult(false, MyThoughts::NOT_FOUND);
+		if($sField === 'name' && $sValue === '') return Daydream::getResult(false, 'account.name_required');
+		if($sField === 'timezone' && !in_array($sValue, \DateTimeZone::listIdentifiers(), true)) return Daydream::getResult(false, Daydream::NOT_FOUND);
+		if($sField === 'hand' && !in_array($sValue, Daydream::getHandIds(), true)) return Daydream::getResult(false, Daydream::NOT_FOUND);
 
 		if(!$this->oDb->updateRow(self::USER_TABLE, $this->iUserId, [$sField => $sValue])) {
-			return MyThoughts::getResult(false, 'error.commit_db');
+			return Daydream::getResult(false, 'error.commit_db');
 		}
 
 		$this->setUserId($this->iUserId);
-		return MyThoughts::getResult(true, 'account.saved', ['user' => $this->getUserInfo()]);
+		return Daydream::getResult(true, 'account.saved', ['user' => $this->getUserInfo()]);
 	}
 
 	/* Session plumbing */
@@ -252,7 +255,7 @@ class User extends PhpObject {
 
 	private function clearTokenCookie(): void {
 		if($this->isLoggedIn()) {
-			$this->oDb->updateRow(self::USER_TABLE, $this->iUserId, ['token' => '', 'token_exp' => MyThoughts::ZERO_TIMESTAMP]);
+			$this->oDb->updateRow(self::USER_TABLE, $this->iUserId, ['token' => '', 'token_exp' => Daydream::ZERO_TIMESTAMP]);
 		}
 
 		$this->writeCookie('', time() - 3600);

package-lock.json

@@ -1,14 +1,19 @@
 {
-  "name": "mythoughts",
+  "name": "daydream",
   "version": "2.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "mythoughts",
+      "name": "daydream",
       "version": "2.0.0",
       "dependencies": {
         "@fontsource-variable/caveat": "^5.3.0",
+        "@fontsource/architects-daughter": "^5.3.0",
+        "@fontsource/indie-flower": "^5.3.0",
+        "@fontsource/kalam": "^5.3.0",
+        "@fontsource/patrick-hand": "^5.3.0",
+        "@fontsource/shadows-into-light": "^5.3.0",
         "sass": "^1.103.1",
         "vue": "^3.5.42"
       },
@@ -204,6 +209,51 @@
         "url": "https://github.com/sponsors/ayuhito"
       }
     },
+    "node_modules/@fontsource/architects-daughter": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/architects-daughter/-/architects-daughter-5.3.0.tgz",
+      "integrity": "sha512-uezOgAlbhmf9nDW69VYq31lXNA+0uRFWXBGCSFWLXVcrNESFHpNjvu11kJss1PMsfH/YKz1hnnYB+JSNI/t+ew==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
+    "node_modules/@fontsource/indie-flower": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/indie-flower/-/indie-flower-5.3.0.tgz",
+      "integrity": "sha512-Wo5eN/ruEQcyC3+ArzhlpqWQgph3VuCNbJlEkVw17LUd0uyTHOb9bTec4g9njQzjiL/ijACF27sSwy90L6kZBg==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
+    "node_modules/@fontsource/kalam": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/kalam/-/kalam-5.3.0.tgz",
+      "integrity": "sha512-FDkVoDfPDCSN/eO81FOYtUI67eMgpVBJmjBtAqSL0PmEhJyeFY2biC+CR+yEttksgXR9+swpFdYmQTyjwBq80Q==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
+    "node_modules/@fontsource/patrick-hand": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/patrick-hand/-/patrick-hand-5.3.0.tgz",
+      "integrity": "sha512-V8C38IlIFfdWg0Xtri3F7sLCVpm069rUwn6w4n+oyn38gt7H4arOJmuReg3tAw1Q6jHqZp89wTnAAJagq4Atxw==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
+    "node_modules/@fontsource/shadows-into-light": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource/shadows-into-light/-/shadows-into-light-5.3.0.tgz",
+      "integrity": "sha512-3dvv0i8/ZwLMY08AAlTLivHUdNQYB6Fxe92d7BZiGbHY2GQnCxEd8JC9CBzxTiP4iyWNa6OZn9LXF+xjc9LaGw==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.2",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz",

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "mythoughts",
-  "description": "A journal that behaves like an open book: write the left page, then the right, then turn.",
+  "name": "daydream",
+  "description": "a place for wandering thoughts.",
   "version": "2.0.0",
   "private": true,
   "type": "module",
@@ -12,6 +12,11 @@
   "author": "Franzz",
   "dependencies": {
     "@fontsource-variable/caveat": "^5.3.0",
+    "@fontsource/architects-daughter": "^5.3.0",
+    "@fontsource/indie-flower": "^5.3.0",
+    "@fontsource/kalam": "^5.3.0",
+    "@fontsource/patrick-hand": "^5.3.0",
+    "@fontsource/shadows-into-light": "^5.3.0",
     "sass": "^1.103.1",
     "vue": "^3.5.42"
   },

public/index.php

@@ -2,6 +2,6 @@
 
 require __DIR__.'/../vendor/autoload.php';
 
-use Franzz\MyThoughts\Controller;
+use Franzz\Daydream\Controller;
 
 echo (new Controller())->handle(__FILE__, $argv ?? []);

resources/lang/en.json

@@ -31,11 +31,13 @@
 		"saved": "Saved.",
 		"settings": "Settings",
 		"language": "Language",
-		"timezone": "Time zone"
+		"timezone": "Time zone",
+		"hand": "Handwriting",
+		"hand_sample": "The morning came"
 	},
 	"book": {
-		"title": "MyThoughts",
-		"tagline": "Your thoughts, on paper.",
+		"title": "Daydream",
+		"tagline": "a place for wandering thoughts.",
 		"write_here": "Write here…",
 		"first_page": "This is the first page of your book.",
 		"no_entry_yet": "Nothing was written around that date.",
@@ -45,7 +47,9 @@
 		"loading": "Turning pages…",
 		"today": "Today",
 		"go_to_writing": "Back to today's page",
-		"empty_entry": "Blank page"
+		"empty_entry": "Blank page",
+		"earlier": "Earlier entries",
+		"later": "Later entries"
 	},
 	"action": {
 		"prev_page": "Previous page",

resources/lang/fr.json

@@ -31,11 +31,13 @@
 		"saved": "Enregistré.",
 		"settings": "Réglages",
 		"language": "Langue",
-		"timezone": "Fuseau horaire"
+		"timezone": "Fuseau horaire",
+		"hand": "Écriture",
+		"hand_sample": "Le matin est venu"
 	},
 	"book": {
-		"title": "MyThoughts",
-		"tagline": "Vos pensées, sur le papier.",
+		"title": "Daydream",
+		"tagline": "Où l'esprit vagabonde.",
 		"write_here": "Écrivez ici…",
 		"first_page": "C'est la première page de votre carnet.",
 		"no_entry_yet": "Rien n'a été écrit autour de cette date.",
@@ -45,7 +47,9 @@
 		"loading": "On tourne les pages…",
 		"today": "Aujourd'hui",
 		"go_to_writing": "Revenir à la page du jour",
-		"empty_entry": "Page blanche"
+		"empty_entry": "Page blanche",
+		"earlier": "Entrées précédentes",
+		"later": "Entrées suivantes"
 	},
 	"action": {
 		"prev_page": "Page précédente",

resources/masks/index.html

@@ -6,10 +6,10 @@
 	<meta name="description" content="[#]lang:meta.page_desc[#]">
 	<meta name="robots" content="noindex, nofollow">
 	<meta name="color-scheme" content="light">
-	<meta name="theme-color" content="#2c2114">
+	<meta name="theme-color" content="#fef9ed">
 	<meta name="apple-mobile-web-app-title" content="[#]title[#]" />
-	<link rel="icon" type="image/svg+xml" href="assets/images/icons/favicon.svg" />
-	<link rel="apple-touch-icon" href="assets/images/icons/apple-touch-icon.svg" />
+	<link rel="icon" type="image/png" href="assets/images/icons/favicon.png" />
+	<link rel="apple-touch-icon" href="assets/images/icons/apple-touch-icon.png" />
 	<link rel="manifest" href="assets/images/icons/site.webmanifest" />
 	<script id="app-config" type="application/json">[#]app_config[#]</script>
 	<title>[#]title[#]</title>

src/App.vue

@@ -184,8 +184,12 @@ export default {
 	<div class="app">
 		<header class="app__header">
 			<h1 class="app__brand">
-				<img class="app__logo" :src="sLogo" :alt="consts.title" />
-				<span class="app__tagline">{{ lang.get('book.tagline') }}</span>
+				<img class="app__logo" :src="sLogo" alt="" />
+				<span class="app__name">
+					<!-- The app's own name, in the app's own handwriting -->
+					<span class="app__wordmark">{{ consts.title }}</span>
+					<span class="app__tagline">{{ lang.get('book.tagline') }}</span>
+				</span>
 			</h1>
 
 			<div class="app__tools">

src/app.js

@@ -1,5 +1,6 @@
 //Librairies
 import 'vite/modulepreload-polyfill';
+import { applyHand } from '@scripts/hands';
 import Api from '@scripts/api';
 import Journal from '@scripts/journal';
 import Lang from '@scripts/lang';
@@ -10,7 +11,7 @@ import { createApp, reactive } from 'vue';
 import App from './App.vue';
 
 //Style
-import '@styles/mythoughts.scss';
+import '@styles/daydream.scss';
 
 //App Configuration from PHP
 const appConfig = JSON.parse(document.getElementById('app-config').textContent);
@@ -36,6 +37,10 @@ const oApi = new Api({
 });
 
 const oUser = reactive({...appConfig.user});
+
+//Before the first paint, so the book is never drawn in one hand and then
+//redrawn in another
+applyHand(appConfig.consts.hands, oUser.hand);
 const oJournal = reactive(new Journal(oApi, appConfig.consts));
 
 //Mount app

src/components/AuthPanel.vue

@@ -84,8 +84,8 @@ export default {
 	<div class="veil">
 		<form class="leaf" @submit.prevent="submit">
 			<div class="leaf__head">
-				<!-- Paper at last: the logo's own colours, as it was drawn -->
-				<img class="leaf__logo" :src="sLogo" alt="MyThoughts" />
+				<!-- Paper at last: the mark as it was painted, on paper of its own -->
+				<img class="leaf__logo" :src="sLogo" alt="Daydream" />
 				<h2 class="leaf__title">
 					{{ bNewBook ? lang.get('account.sign_up') : lang.get('account.sign_in') }}
 				</h2>

src/components/Book.vue

@@ -8,7 +8,8 @@ import { getDayKey } from '@scripts/time';
 //the book paginates one page per view instead.
 const SINGLE_PAGE_WIDTH = 860;
 
-const TURN_MS = 700;
+//Must outlast $turn in _var.scss, or the leaf is torn away mid-flight
+const TURN_MS = 500;
 
 /**
  * The open book.
@@ -34,7 +35,7 @@ export default {
 		bookPage
 	},
 	emits: ['reading'],
-	inject: ['journal', 'lang'],
+	inject: ['journal', 'lang', 'user'],
 	data() {
 		return {
 			iSpread: 0,
@@ -55,6 +56,17 @@ export default {
 			asCaret: null,
 			asSelection: [],
 
+			//Whether the book should keep the caret in view. True while writing,
+			//false once the reader has deliberately turned or jumped somewhere
+			//else - otherwise the next re-measure drags them back to the page
+			//being written on.
+			bFollowCaret: true,
+
+			//An entry jumped to from the rail or the calendar. Held so that
+			//"where you are" is the entry you asked for, not whichever one
+			//happens to open the page it starts on.
+			iFocusId: 0,
+
 			//The leaf in flight: {id, dir, front, back, from} while a page turns
 			asTurn: null,
 			iTurnId: 0,
@@ -144,9 +156,18 @@ export default {
 				offset: iOffset
 			};
 		},
-		//What the rail highlights and the calendar opens on: the entry the
-		//visible spread starts with.
+		/**
+		 * What the rail highlights and the calendar opens on.
+		 *
+		 * Normally the entry the visible spread starts with. But an entry can
+		 * begin partway down a page that opens with the tail of an earlier one -
+		 * and when you have just clicked that entry's bookmark, the one you
+		 * asked for is where you are, not the one above it. So a jumped-to entry
+		 * holds the position for as long as it is on the spread.
+		 */
 		currentEntryId() {
+			if((this.iFocusId > 0) && this.spreadShows(this.iFocusId)) return this.iFocusId;
+
 			for(const oPage of this.visiblePages) {
 				if(oPage.lines.length > 0) return oPage.lines[0].id;
 			}
@@ -196,6 +217,13 @@ export default {
 		iPagesPerView() {
 			this.$nextTick(() => this.measure());
 		},
+		//A different hand breaks the lines in different places, so the whole
+		//book has to be re-measured and re-flowed - nothing about the old
+		//layout survives a change of font.
+		'user.hand'() {
+			this.oPaginator.reset();
+			this.$nextTick(() => this.measure());
+		},
 		//The rail highlights, and the calendar opens on, whatever is being read
 		currentEntryId: {
 			immediate: true,
@@ -278,7 +306,10 @@ export default {
 			if(this.oPaginator.setMetrics(oMeasure, iLineHeight, iLines)) this.relayout();
 
 			this.bReady = true;
-			this.$nextTick(() => this.paintOverlay());
+
+			//Re-measuring can move the caret onto a different spread, so the
+			//caret is re-derived here rather than simply repainted where it was.
+			this.$nextTick(() => this.syncCaret());
 		},
 
 		//Geometry of the column the input and the measurer overlay
@@ -444,6 +475,8 @@ export default {
 		},
 
 		onInput(oEvent) {
+			//Typing goes into the open entry, so the book has to be showing it
+			this.bFollowCaret = true;
 			this.journal.write(oEvent.target.value);
 			this.relayout();
 			this.syncCaret();
@@ -461,12 +494,20 @@ export default {
 			const oInput = this.$refs.input;
 			if(!oInput) return;
 
+			//Read the focus rather than trusting the event: focusing an element
+			//that already has the focus fires nothing, so on load - where the
+			//book focuses itself twice - the flag would never be set and the
+			//caret would stay hidden until the first keystroke.
+			this.bFocused = (document.activeElement === oInput);
+
 			this.iSelectionStart = oInput.selectionStart;
 			this.iSelectionEnd = oInput.selectionEnd;
 			this.iCaretOffset = (oInput.selectionDirection === 'backward') ? oInput.selectionStart : oInput.selectionEnd;
 
+			//Following happens when the writing moves, not every time the caret
+			//is re-read: a re-measure must not undo a page turn.
 			const oPos = this.caretPosition;
-			if(oPos && (oPos.spread !== this.iSpread)) this.setSpread(oPos.spread);
+			if(this.bFollowCaret && this.bFocused && oPos && (oPos.spread !== this.iSpread)) this.setSpread(oPos.spread);
 
 			this.$nextTick(() => this.paintOverlay());
 		},
@@ -475,6 +516,9 @@ export default {
 			const oInput = this.$refs.input;
 			if(!oInput) return;
 
+			//Putting the caret somewhere is asking to write there
+			this.bFollowCaret = true;
+
 			oInput.focus({preventScroll: true});
 
 			if(bExtend) oInput.setSelectionRange(Math.min(oInput.selectionStart, iOffset), Math.max(oInput.selectionEnd, iOffset));
@@ -585,38 +629,60 @@ export default {
 			const sDir = sDirection || ((iNext > iFrom) ? 'forward' : 'back');
 			const bForward = (sDir === 'forward');
 
+			//Moving to the facing spread is a page turn and looks like one. A
+			//jump across the book - to a bookmark, a date, or the writing on
+			//load - is not, so it does not pretend to be. (One page per view has
+			//no gutter to hinge on; the template gives it a slide instead.)
+			const bTurn = (Math.abs(iNext - iFrom) === 1);
+
 			//Keys the leaf element. Turning again before the last turn finished
 			//has to build a new leaf, or Vue patches the old one in place and
 			//the CSS animation carries on from wherever it had got to.
 			this.iTurnId++;
 
-			if(this.iPagesPerView > 1) {
-				this.asTurn = {
-					id: this.iTurnId,
-					dir: sDir,
-					from: iFrom,
-					//Front: the face you were reading. Back: what it reveals.
-					front: bForward ? ((iFrom * 2) + 1) : (iFrom * 2),
-					back: bForward ? (iNext * 2) : ((iNext * 2) + 1)
-				};
-			}
-			else this.asTurn = {id: this.iTurnId, dir: sDir, from: iFrom, front: -1, back: -1};
+			this.asTurn = bTurn ? {
+				id: this.iTurnId,
+				dir: sDir,
+				from: iFrom,
+				//Front: the face you were reading. Back: what it reveals.
+				front: bForward ? ((iFrom * 2) + 1) : (iFrom * 2),
+				back: bForward ? (iNext * 2) : ((iNext * 2) + 1)
+			} : null;
 
 			this.iSpread = iNext;
 
 			clearTimeout(this.oTurnTimer);
-			this.oTurnTimer = setTimeout(() => {
-				this.asTurn = null;
-			}, TURN_MS);
+
+			if(bTurn) {
+				this.oTurnTimer = setTimeout(() => {
+					this.asTurn = null;
+
+					//The overlay must be redrawn once the leaf is gone: while it
+					//was flying, one side of the spread was showing the page it
+					//lifted from, so the caret had no page to be measured
+					//against and was left undrawn.
+					this.$nextTick(() => this.paintOverlay());
+				}, TURN_MS);
+			}
 
 			this.$nextTick(() => this.paintOverlay());
 		},
 
+		spreadShows(iEntryId) {
+			return this.visiblePages.some((oPage) => oPage.lines.some((oLine) => oLine.id === iEntryId));
+		},
+
 		sideFor(iPage) {
 			return ((iPage % 2) === 0) ? 'left' : 'right';
 		},
 
 		async turn(iDelta) {
+			//Turning the page by hand means you are reading the book again, not
+			//sitting on the entry you jumped to - and not being pulled back to
+			//the writing by the next re-measure.
+			this.iFocusId = 0;
+			this.bFollowCaret = false;
+
 			//Turning past either edge of the loaded window fetches more book
 			//before it turns, so the flow never dead-ends on a chunk boundary.
 			if((iDelta < 0) && (this.iSpread === 0)) {
@@ -676,6 +742,8 @@ export default {
 			const oPos = this.asLayout.index.get(iEntryId);
 			if(!oPos) return;
 
+			this.iFocusId = iEntryId;
+			this.bFollowCaret = false;
 			this.setSpread(Math.floor(oPos.firstPage / this.iPagesPerView));
 		},
 
@@ -724,6 +792,16 @@ export default {
 					@pick="onPick"
 				/>
 
+				<!-- The shadow the leaf throws onto the page it is coming down
+					onto, so that page reads as lying underneath rather than as
+					a second column of text beside it. -->
+				<span
+					v-if="asTurn && (iPagesPerView > 1)"
+					:key="'cast' + asTurn.id"
+					class="book__cast"
+					:class="'book__cast--' + asTurn.dir"
+				></span>
+
 				<!-- The leaf in flight. Two real pages back to back, hinged on
 					the gutter - the front is the page being lifted away, the
 					back is the one it carries into view. -->

src/components/BookmarkRail.vue

@@ -1,6 +1,33 @@
 <script>
 import appIcon from '@components/AppIcon';
-import { formatShortDate, formatTime } from '@scripts/time';
+import { formatShortDate, formatTime, getDayKey } from '@scripts/time';
+
+/* The dyes, matching $tabs in _color.scss - the three ribbons in the logo, and
+ * the same three dyed deeper.
+ *
+ * Chosen by the day an entry was written rather than by its position, so the
+ * colour means something: entries from one day share a tab colour, and a run of
+ * the same colour down the rail is a day you wrote a lot. Position-based colour
+ * would look the same and say nothing. */
+const TAB_DYES = ['#eab469', '#a2b097', '#c7a4b8', '#bc781a', '#697a5c', '#85526f'];
+
+/**
+ * A stable dye for a day.
+ *
+ * The day key is turned into a number and taken modulo the palette, so the same
+ * date always gets the same colour - on every reload, in every session, for
+ * however far back the book goes. Consecutive days land on different dyes,
+ * which is the whole point of dyeing them.
+ */
+function dyeForDay(sDay) {
+	//YYYY-MM-DD -> a day number. Not calendar-exact, and it does not need to
+	//be: it only has to be stable and to step by one from one day to the next.
+	const asParts = sDay.split('-').map(Number);
+	if(asParts.length !== 3 || asParts.some(isNaN)) return TAB_DYES[0];
+
+	const iDays = (asParts[0] * 372) + (asParts[1] * 31) + asParts[2];
+	return TAB_DYES[((iDays % TAB_DYES.length) + TAB_DYES.length) % TAB_DYES.length];
+}
 
 //Bookmarks shown either side of the entry being read. A whole book's worth of
 //tabs is a scrollbar, not a rail - a handful around where you are is something
@@ -36,7 +63,8 @@ export default {
 				date: formatShortDate(oBookmark.time, oBookmark.timezone, this.lang.locale),
 				time: formatTime(oBookmark.time, oBookmark.timezone, this.lang.locale),
 				preview: oBookmark.preview || this.lang.get('book.empty_entry'),
-				open: (oBookmark.status === 'open')
+				open: (oBookmark.status === 'open'),
+				dye: dyeForDay(getDayKey(oBookmark.time, oBookmark.timezone))
 			}));
 		},
 		/**
@@ -73,6 +101,19 @@ export default {
 		this.$nextTick(() => this.scrollToCurrent());
 	},
 	methods: {
+		/**
+		 * Walk the window one reach further back, by reading from its topmost
+		 * tab. At the top of what is loaded there is nothing to walk to, so this
+		 * fetches older entries instead.
+		 */
+		stepBack() {
+			if(this.hasBefore) this.$emit('pick', this.shown[0].id);
+			else this.$emit('load-older');
+		},
+		stepForward() {
+			if(this.hasAfter) this.$emit('pick', this.shown.at(-1).id);
+		},
+
 		scrollToCurrent() {
 			const oList = this.$refs.list;
 			if(!oList) return;
@@ -89,14 +130,15 @@ export default {
 	<nav class="rail" :aria-label="lang.get('book.bookmarks')">
 		<span class="rail__title">{{ lang.get('book.bookmarks') }}</span>
 
-		<!-- There is more book above the window, or older entries still to load -->
+		<!-- The book carries on above the window - or, at the top of what is
+			loaded, there is more of it still to fetch. -->
 		<button
 			v-if="hasBefore || hasOlder"
 			type="button"
-			class="rail__more"
+			class="rail__more rail__more--before"
 			:disabled="loading"
-			:title="lang.get('action.prev_page')"
-			@click="$emit('load-older')"
+			:title="lang.get('book.earlier')"
+			@click="stepBack"
 		>
 			<appIcon icon="chevronLeft" size="0.8em" />
 		</button>
@@ -111,6 +153,7 @@ export default {
 					'rail__tab--current': (oTab.id === currentId),
 					'rail__tab--open': (oTab.id === openId)
 				}"
+				:style="{'--tab': oTab.dye, '--tab-wash': oTab.dye + '40'}"
 				@click="$emit('pick', oTab.id)"
 			>
 				<span class="rail__date">
@@ -121,6 +164,16 @@ export default {
 			</button>
 		</div>
 
+		<button
+			v-if="hasAfter"
+			type="button"
+			class="rail__more rail__more--after"
+			:title="lang.get('book.later')"
+			@click="stepForward"
+		>
+			<appIcon icon="chevronRight" size="0.8em" />
+		</button>
+
 		<span v-if="tabs.length === 0" class="rail__empty">{{ lang.get('book.first_page') }}</span>
 	</nav>
 </template>

src/components/SettingsPanel.vue

@@ -1,5 +1,6 @@
 <script>
 import appIcon from '@components/AppIcon';
+import { applyHand, loadHand } from '@scripts/hands';
 
 /**
  * Account settings, saved one field at a time.
@@ -35,6 +36,9 @@ export default {
 				return [this.user.timezone].filter((sZone) => sZone !== '');
 			}
 		},
+		hands() {
+			return this.consts.hands || [];
+		},
 		languageNames() {
 			const oNames = new Intl.DisplayNames([this.lang.locale], {type: 'language'});
 			return this.languages.map((sCode) => ({
@@ -44,6 +48,23 @@ export default {
 		}
 	},
 	methods: {
+		/**
+		 * Show the hand on the page as soon as it is picked, before the save
+		 * comes back - choosing a hand is a visual decision, and waiting on a
+		 * round trip to see it makes the picker feel broken.
+		 */
+		async pickHand(sHandId) {
+			if(sHandId === this.user.hand) return;
+
+			await loadHand(this.hands, sHandId);
+			applyHand(this.hands, sHandId);
+			await this.set('hand', sHandId);
+
+			//The save is what settles it; if it failed, go back to the one the
+			//account actually has rather than leaving a lie on screen.
+			if(this.sError !== '') applyHand(this.hands, this.user.hand);
+		},
+
 		async set(sField, sValue) {
 			this.bBusy = true;
 			this.sError = '';
@@ -126,6 +147,29 @@ export default {
 				</select>
 			</div>
 
+			<div class="leaf__row">
+				<span class="paper-label">{{ lang.get('account.hand') }}</span>
+				<div class="hand-picker" role="radiogroup" :aria-label="lang.get('account.hand')">
+					<button
+						v-for="oHand in hands"
+						:key="oHand.id"
+						type="button"
+						class="hand-picker__option"
+						:class="(oHand.id === user.hand) ? 'hand-picker__option--on' : null"
+						role="radio"
+						:aria-checked="oHand.id === user.hand"
+						:disabled="bBusy"
+						:style="{fontFamily: oHand.family + ', cursive'}"
+						@click="pickHand(oHand.id)"
+					>
+						<!-- Written in itself: the only thing worth knowing about
+							a hand is what your words look like in it. -->
+						<span class="hand-picker__sample">{{ lang.get('account.hand_sample') }}</span>
+						<span class="hand-picker__name">{{ oHand.name }}</span>
+					</button>
+				</div>
+			</div>
+
 			<div class="leaf__row">
 				<label class="paper-label" for="set-tz">{{ lang.get('account.timezone') }}</label>
 				<select

src/images/icons/apple-touch-icon.svg

@@ -1,23 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 180 180" role="img" aria-label="MyThoughts">
-	<title>MyThoughts</title>
-	<defs>
-		<linearGradient id="desk" x1="0" y1="0" x2="0.4" y2="1">
-			<stop offset="0" stop-color="#44321e"/>
-			<stop offset="0.55" stop-color="#2c2114"/>
-			<stop offset="1" stop-color="#1a140d"/>
-		</linearGradient>
-	</defs>
-	<!-- Touch icons are masked by the OS, so the artwork keeps clear of the edges -->
-	<rect width="180" height="180" fill="url(#desk)"/>
-	<g transform="translate(90 92) scale(2.55) translate(-32 -33)">
-		<path d="M32 19.5C27.7 15.9 22.2 14.2 14.5 14.2v32.4c7.7 0 13.2 1.7 17.5 5.2 4.3-3.5 9.8-5.2 17.5-5.2V14.2c-7.7 0-13.2 1.7-17.5 5.3z"
-			fill="#f8f2e4" stroke="#cdbb99" stroke-width="1.6" stroke-linejoin="round"/>
-		<path d="M32 19.5v32.3" stroke="#cdbb99" stroke-width="2" stroke-linecap="round"/>
-		<g stroke="#6d6358" stroke-width="1.7" stroke-linecap="round" opacity="0.75">
-			<path d="M20.5 26.5h7.5"/>
-			<path d="M20.5 32h7.5"/>
-			<path d="M20.5 37.5h5"/>
-		</g>
-		<path d="M36.5 14.6h6v16l-3-2.4-3 2.4z" fill="#795731"/>
-	</g>
-</svg>

src/images/icons/favicon.svg

@@ -1,17 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" role="img" aria-label="MyThoughts">
-	<title>MyThoughts</title>
-	<rect width="64" height="64" rx="12" fill="#2c2114"/>
-	<!-- The two pages, splayed from the gutter -->
-	<path d="M32 19.5C27.7 15.9 22.2 14.2 14.5 14.2v32.4c7.7 0 13.2 1.7 17.5 5.2 4.3-3.5 9.8-5.2 17.5-5.2V14.2c-7.7 0-13.2 1.7-17.5 5.3z"
-		fill="#f8f2e4" stroke="#cdbb99" stroke-width="1.6" stroke-linejoin="round"/>
-	<!-- The gutter -->
-	<path d="M32 19.5v32.3" stroke="#cdbb99" stroke-width="2" stroke-linecap="round"/>
-	<!-- Writing on the left page, trailing off the way a page in progress does -->
-	<g stroke="#6d6358" stroke-width="1.7" stroke-linecap="round" opacity="0.75">
-		<path d="M20.5 26.5h7.5"/>
-		<path d="M20.5 32h7.5"/>
-		<path d="M20.5 37.5h5"/>
-	</g>
-	<!-- The ribbon, marking today's page -->
-	<path d="M36.5 14.6h6v16l-3-2.4-3 2.4z" fill="#795731"/>
-</svg>

src/images/icons/site.webmanifest

@@ -1,23 +1,23 @@
 {
-	"name": "MyThoughts",
-	"short_name": "MyThoughts",
-	"description": "A quiet place to write. Your thoughts, on paper.",
+	"name": "Daydream",
+	"short_name": "Daydream",
+	"description": "A quiet place to write. Where the mind wanders, on paper.",
 	"start_url": "../../../",
 	"scope": "../../../",
 	"display": "standalone",
 	"orientation": "any",
-	"background_color": "#2c2114",
-	"theme_color": "#2c2114",
+	"background_color": "#fef9ed",
+	"theme_color": "#fef9ed",
 	"icons": [
 		{
-			"src": "favicon.svg",
-			"sizes": "any",
-			"type": "image/svg+xml"
+			"src": "favicon.png",
+			"sizes": "128x128",
+			"type": "image/png"
 		},
 		{
-			"src": "apple-touch-icon.svg",
-			"sizes": "any",
-			"type": "image/svg+xml",
+			"src": "apple-touch-icon.png",
+			"sizes": "180x180",
+			"type": "image/png",
 			"purpose": "maskable"
 		}
 	]

src/scripts/hands.js

@@ -0,0 +1,54 @@
+/* The webfonts for every hand the book can be written in.
+ *
+ * Side-effect imports only: these declare @font-face rules and nothing more.
+ * A declared face costs nothing until something is rendered in it, so shipping
+ * all six is a few KB of CSS - the woff2 files are fetched only for the hand
+ * actually in use, plus whatever the settings picker previews when it is opened.
+ *
+ * The list itself lives in Daydream::HANDS on the server, which is also what
+ * validates a change - adding one there means adding its import here.
+ */
+import '@fontsource-variable/caveat/index.css';
+import '@fontsource/kalam/400.css';
+import '@fontsource/patrick-hand/400.css';
+import '@fontsource/shadows-into-light/400.css';
+import '@fontsource/architects-daughter/400.css';
+import '@fontsource/indie-flower/400.css';
+
+//Fallbacks appended to whichever hand is chosen, so the book still reads as
+//handwriting if a webfont fails
+const FALLBACK = '"Segoe Script", cursive';
+
+/**
+ * Put a hand on the page.
+ *
+ * Both values are set together and read by the book's type metrics: the family
+ * and the size that makes that family sit on the ruled lines. Setting one
+ * without the other gives writing that floats above the rule or crashes
+ * through it.
+ */
+export function applyHand(asHands, sHandId) {
+	const oHand = asHands.find((oItem) => oItem.id === sHandId) || asHands[0];
+	if(!oHand) return null;
+
+	const oRoot = document.documentElement;
+	oRoot.style.setProperty('--book-hand', oHand.family + ', ' + FALLBACK);
+	oRoot.style.setProperty('--book-hand-scale', String(oHand.scale));
+
+	return oHand;
+}
+
+/** Wait for a hand's files to arrive, so the book is not measured in the fallback */
+export async function loadHand(asHands, sHandId, sSizeSample = '16px') {
+	const oHand = asHands.find((oItem) => oItem.id === sHandId);
+	if(!oHand || !document.fonts?.load) return;
+
+	try {
+		await document.fonts.load(sSizeSample + ' ' + oHand.family.split(',')[0].trim());
+	}
+	catch{
+		//A hand that will not load is not worth failing the page over - the
+		//fallback stack still renders, and the next measure picks up the real
+		//font whenever it does arrive.
+	}
+}

src/scripts/paginator.js

@@ -44,6 +44,19 @@ export default class Paginator {
 		return true;
 	}
 
+	/**
+	 * Throw away every measurement taken so far.
+	 *
+	 * For a change of font, where setMetrics() cannot help: the column width,
+	 * the line height and the lines per page can all come back identical, so
+	 * the signature says nothing has changed - while every line in the book now
+	 * breaks somewhere else.
+	 */
+	reset() {
+		this.asCache.clear();
+		this.sSignature = '';
+	}
+
 	/* Layout */
 
 	/**

src/styles/_app.scss

@@ -31,30 +31,44 @@
 	font-weight: normal;
 }
 
-/* The logo is dark roast ink on a transparent bubble - drawn for paper, not for
- * the desk. Rather than sit it on a light patch and break the surface, it is
- * re-inked in cream: brightness(0) flattens it to a silhouette, invert lifts it
- * to white, and the sepia/hue pass warms that back to the colour of the pages.
- * Its full colour is kept for the sign-in leaf, which is paper. */
+/* The mark is the painting itself, carried as a layer over its own sheet: what
+ * each pixel took away from the paper is its opacity, so the book arrives with
+ * its colours and its shadow arrives as a shadow. It needs no plate behind it
+ * and no shadow added to it - it darkens the desk here and the paper of the
+ * sign-in card by exactly as much as it darkened the sheet it was painted on. */
 .app__logo {
-	height: 3.3rem;
+	//Below about 80px wide the ribbons stop reading as ribbons, so the mark is
+	//given the room it needs rather than shrunk to fit
+	height: 3.5rem;
 	width: auto;
 	display: block;
-	//brightness(0) flattens the artwork to a silhouette, invert lifts it to
-	//white, and the short sepia pass warms that to the colour of the pages.
-	//Kept deliberately simple - a longer chain only muddies it.
-	filter:
-		brightness(0)
-		invert(1)
-		sepia(0.22)
-		saturate(1.5)
-		drop-shadow(0 1px 1px rgba(0, 0, 0, 0.4));
-	opacity: 0.95;
+	flex: 0 0 auto;
+}
+
+.app__name {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	min-width: 0;
+	line-height: 1.05;
+}
+
+/* The name is set in the book's own hand rather than drawn as paths: it is
+ * already loaded, it stays crisp at any size, and it changes with the hand the
+ * reader chose - so the masthead is written in the same writing as the pages. */
+.app__wordmark {
+	font-family: var.$font-hand;
+	font-size: 2rem;
+	letter-spacing: 0.01em;
+	color: color.$ink;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
 }
 
 .app__tagline {
 	font-size: 0.8rem;
-	color: rgba(255, 238, 210, 0.58);
+	color: color.$ink-soft;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -77,7 +91,9 @@
 	justify-content: center;
 	gap: 0;
 	min-height: 0;
-	padding: 0 clamp(0.5rem, 2vw, 2rem) clamp(0.75rem, 2.5vh, 2rem);
+	//Room for the desk. The book is still the app, but a book with no desk
+	//around it is a page, and the mark is a book lying on something.
+	padding: clamp(0.25rem, 1.2vh, 0.9rem) clamp(0.5rem, 2vw, 2rem) clamp(0.9rem, 3vh, 2.2rem);
 }
 
 .app__book {
@@ -128,21 +144,23 @@
 	padding: 0.5rem 0.9rem;
 	border-radius: 999px;
 	font-size: 0.85rem;
-	color: #fff4e2;
-	background-color: rgba(29, 21, 15, 0.92);
+	//The one thing that is allowed to be dark on the desk: the cover of the
+	//book, borrowed for a strip that has to be read before it goes away
+	color: color.$paper;
+	background-color: color.$cover-deep;
 	box-shadow: var.$shadow-panel;
 }
 
 .app__notice--bad {
-	background-color: color.$ribbon-deep;
+	background-color: color.$bad;
 }
 
 .app__notice-close {
-	color: rgba(255, 244, 226, 0.6);
+	color: rgba(254, 244, 225, 0.6);
 	display: inline-flex;
 
 	&:hover {
-		color: #fff4e2;
+		color: color.$paper;
 	}
 }
 

src/styles/_book.scss

@@ -38,7 +38,14 @@
 	background-color: color.$paper-edge;
 	box-shadow: var.$shadow-page;
 
-	//The page block: a few stacked cut edges peeking out below and to the sides
+	//The page block: a few stacked cut edges peeking out below and to the sides,
+	//and the board they are bound into.
+	//
+	//The cover is what makes the book an object here. On the ivory desk cream
+	//paper against cream is barely an edge; in the mark it is the dark brown
+	//board around the paper that you actually read as a book, so the block
+	//carries one - a ring of cover just past the cut edges, and the shadow it
+	//throws on the desk.
 	&::before {
 		content: "";
 		position: absolute;
@@ -53,7 +60,10 @@
 			color.$paper-edge 62%,
 			color.$paper-deep 100%
 		);
-		box-shadow: 0 0.9rem 1.6rem color.$shadow-deep;
+		box-shadow:
+			0 0 0 0.5rem color.$cover,
+			0 0 0 calc(0.5rem + 1px) color.$cover-deep,
+			0 1rem 1.8rem color.$shadow-deep;
 	}
 }
 
@@ -213,7 +223,7 @@
  * three of them take their typography from exactly one place: here. */
 @mixin page-text-metrics {
 	font-family: var.$font-hand;
-	font-size: calc(var(--book-line) * 0.82);
+	font-size: calc(var(--book-line) * #{var.$hand-scale});
 	line-height: var(--book-line);
 	letter-spacing: 0.005em;
 	word-spacing: 0.02em;
@@ -410,13 +420,13 @@
 .book__leaf--forward {
 	left: 50%;
 	transform-origin: left center;
-	animation: leaf-forward var.$trans-slow cubic-bezier(0.4, 0.06, 0.3, 0.96) forwards;
+	animation: leaf-forward var.$turn cubic-bezier(0.4, 0.06, 0.3, 0.96) forwards;
 }
 
 .book__leaf--back {
 	left: 0;
 	transform-origin: right center;
-	animation: leaf-back var.$trans-slow cubic-bezier(0.4, 0.06, 0.3, 0.96) forwards;
+	animation: leaf-back var.$turn cubic-bezier(0.4, 0.06, 0.3, 0.96) forwards;
 }
 
 //Right page sweeping left across the gutter
@@ -447,7 +457,7 @@
 	overflow: hidden;
 	backface-visibility: hidden;
 	background-color: color.$paper;
-	box-shadow: 0 0 2rem rgba(20, 14, 9, 0.35);
+	box-shadow: 0 0 2.4rem rgba(20, 14, 9, 0.5), 0 0 0 1px rgba(120, 96, 62, 0.18);
 
 	//The page fills the leaf rather than half a spread
 	.page {
@@ -461,6 +471,47 @@
 	transform: rotateY(180deg);
 }
 
+/* Which face you can see is switched explicitly at the upright crossing,
+ * rather than left to `backface-visibility` alone.
+ *
+ * That property is the right tool and is set above, but engines disagree about
+ * it once `preserve-3d` and a clipped ancestor are involved - and when it is
+ * ignored the front face shows straight through the back one, putting both
+ * pages' words on top of each other for the length of the turn. The switch
+ * point is where the leaf passes 90 degrees under the easing above (measured,
+ * not guessed - the rotation is not linear in time). */
+.book__leaf-face--front {
+	animation: leaf-face-front var.$turn linear forwards;
+}
+
+.book__leaf-face--back {
+	animation: leaf-face-back var.$turn linear forwards;
+}
+
+@keyframes leaf-face-front {
+	0%,
+	38% {
+		visibility: visible;
+	}
+
+	39%,
+	100% {
+		visibility: hidden;
+	}
+}
+
+@keyframes leaf-face-back {
+	0%,
+	38% {
+		visibility: hidden;
+	}
+
+	39%,
+	100% {
+		visibility: visible;
+	}
+}
+
 /* Paper catches the light as it lifts and loses it as it lands. Two passes of
  * the same shade, offset by half the turn, is what sells the leaf as solid. */
 .book__leaf-shade {
@@ -471,12 +522,12 @@
 
 .book__leaf-face--front .book__leaf-shade {
 	background-image: linear-gradient(to left, rgba(20, 14, 9, 0.42), rgba(20, 14, 9, 0.04) 45%, transparent 75%);
-	animation: leaf-shade-out var.$trans-slow ease-in forwards;
+	animation: leaf-shade-out var.$turn ease-in forwards;
 }
 
 .book__leaf-face--back .book__leaf-shade {
 	background-image: linear-gradient(to right, rgba(20, 14, 9, 0.46), rgba(20, 14, 9, 0.06) 45%, transparent 75%);
-	animation: leaf-shade-in var.$trans-slow ease-out forwards;
+	animation: leaf-shade-in var.$turn ease-out forwards;
 }
 
 @keyframes leaf-shade-out {
@@ -499,9 +550,71 @@
 	}
 }
 
+/* The shadow a leaf casts on the page it is coming down onto.
+ *
+ * This is what stops the page underneath reading as a second page of text
+ * beside the leaf: real paper coming over a page darkens it, and the eye uses
+ * that to tell which sheet is on top. Sits above the pages and below the leaf.
+ */
+.book__cast {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	width: 50%;
+	z-index: 6;
+	pointer-events: none;
+	opacity: 0;
+}
+
+.book__cast--forward {
+	left: 0;
+	background-image: linear-gradient(to left, rgba(24, 17, 10, 0.62), rgba(24, 17, 10, 0.34) 45%, rgba(24, 17, 10, 0.16) 100%);
+	animation: cast-forward var.$turn cubic-bezier(0.4, 0.06, 0.3, 0.96) forwards;
+}
+
+.book__cast--back {
+	left: 50%;
+	background-image: linear-gradient(to right, rgba(24, 17, 10, 0.62), rgba(24, 17, 10, 0.34) 45%, rgba(24, 17, 10, 0.16) 100%);
+	animation: cast-back var.$turn cubic-bezier(0.4, 0.06, 0.3, 0.96) forwards;
+}
+
+/* Deepens from the moment the leaf starts to lift - a raised sheet shades the
+ * spread under it - holds through the crossing, where the page being left and
+ * the page being uncovered are both in view, and lifts once the leaf has landed
+ * and is itself the page being read. */
+@keyframes cast-forward {
+	0% {
+		opacity: 0;
+	}
+
+	22%,
+	66% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0;
+	}
+}
+
+@keyframes cast-back {
+	0% {
+		opacity: 0;
+	}
+
+	22%,
+	66% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0;
+	}
+}
+
 /* The gutter darkens under a leaf that is standing up over it */
 .book__turning .book__spine {
-	animation: gutter-deepen var.$trans-slow ease-in-out;
+	animation: gutter-deepen var.$turn ease-in-out;
 }
 
 @keyframes gutter-deepen {
@@ -518,11 +631,11 @@
 /* One page per view has no gutter to hinge on, so the page is dealt off the
  * pile in the direction of travel instead of pretending to be bound. */
 .book__spread--single.book__turning--forward .page {
-	animation: page-in-from-right var.$trans-mid ease-out;
+	animation: page-in-from-right var.$turn ease-out;
 }
 
 .book__spread--single.book__turning--back .page {
-	animation: page-in-from-left var.$trans-mid ease-out;
+	animation: page-in-from-left var.$turn ease-out;
 }
 
 @keyframes page-in-from-right {
@@ -587,8 +700,8 @@
 .book__ribbon {
 	position: absolute;
 	top: 0;
-	left: calc(50% - 0.55rem);
-	width: 1.1rem;
+	left: calc(50% - 0.425rem);
+	width: 0.85rem;
 	z-index: 4;
 	pointer-events: none;
 	background-image: linear-gradient(to right, color.$ribbon-deep, color.$ribbon 45%, color.$ribbon-deep);

src/styles/_calendar.scss

@@ -105,11 +105,11 @@
 }
 
 .calendar__day--today {
-	box-shadow: inset 0 0 0 1px color.$caramel;
+	box-shadow: inset 0 0 0 1px color.$amber;
 }
 
 .calendar__day--current {
-	color: #fff6e6;
+	color: color.$paper;
 	background-color: color.$ribbon;
 
 	&:hover {
@@ -117,7 +117,7 @@
 	}
 
 	&::after {
-		background-color: #fff6e6;
+		background-color: color.$paper;
 	}
 }
 

src/styles/_color.scss

@@ -1,52 +1,87 @@
-/* The palette is taken from the logo, not chosen alongside it.
+/* Everything here is sampled off the logo.
  *
- * src/images/logo.png is dark-roast lettering in a thought bubble with a cup of
- * coffee; sampling it gives one dominant near-black brown (#2c2114) and a run of
- * caramels from #795731 up to #b47e41. Those are the colours below. The book is
- * the same idea in furniture: a coffee-dark desk, cream paper, and caramel for
- * anything that has to catch the eye.
+ * The mark is an open book lying on warm ivory: a dark brown board, cream
+ * pages, a hand you cannot quite read, and three dyed ribbons hanging out of
+ * the fore-edge. Every value below was read out of that drawing rather than
+ * guessed next to it - the sheet it is printed on is the desk, the pages are
+ * the paper, the board is the ink, and the three ribbons are the only colour
+ * the app is allowed to raise its voice with.
  *
- * There is no pure grey and no pure black anywhere - paper and lamplight do not
- * have any, and neither does the logo. */
+ * There is no pure grey, no pure black and no blue anywhere, because there is
+ * none in the mark. Every neutral here is a brown that has been let go.
+ *
+ * Where a dye had to carry text it is the same dye with the lightness taken
+ * down - hue and saturation untouched - until it clears 4.6:1. Nothing is
+ * invented; things are only ever put in shadow.
+ */
 
-//The desk the book lies on - straight from the logo's darkest inks
-$desk-deep: #1a140d;
-$desk: #2c2114;
-$desk-edge: #44321e;
+//The desk: the sheet the mark is printed on, the light on it, and the corners
+//falling away into the shadow the book throws
+$linen: #fef9ed;
+$linen-light: #fffdf7;
+$linen-deep: #f2e7d1;
 
-//Paper. -shade is the tint towards the spine, -edge the cut edge of the stack
-$paper: #f8f2e4;
-$paper-shade: #f0e7d3;
-$paper-edge: #e0d3b8;
-$paper-deep: #cdbb99;
+//Paper. -shade is the tint towards the spine, -edge and -deep the cut edges of
+//the stack, lit and in shadow
+$paper: #fef4e1;
+$paper-shade: #fbf1dc;
+$paper-edge: #eed9b7;
+$paper-deep: #d7b990;
+
+//The board the pages are bound into. Cream paper on a cream desk is a rumour;
+//in the mark it is the dark brown cover that makes the book an object
+$cover-light: #774b31;
+$cover: #5a361f;
+$cover-deep: #361d0c;
 
 //Ink, in the three weights the book uses: what you wrote, what the book says
-//about it, and what is barely there
-$ink: #2e2822;
-$ink-soft: #6d6358;
-$ink-faint: #a29684;
-$ink-ghost: rgba(46, 40, 34, 0.38);
+//about it, and what is barely there. The heaviest is the brown the wordmark is
+//set in, the middle one is the lit face of the board, and the faintest is the
+//hand the mark is written in
+$ink: #45220d;
+$ink-soft: #774b31;
+$ink-faint: #a9957b;
+$ink-ghost: rgba(69, 34, 13, 0.32);
 
-//Ruling. The horizontal rules are cold on purpose - they are the one thing on
-//the page that is not ink, and that contrast is what makes paper read as paper
-$rule: rgba(90, 120, 150, 0.22);
-$rule-margin: rgba(168, 118, 62, 0.5);
+//Ruling. Not ink: the rules are that same handwriting brown, faded until they
+//are something the writing crosses rather than meets
+$rule: rgba(169, 149, 123, 0.42);
+$rule-margin: rgba(223, 167, 91, 0.6);
 
-//Accents: the coffee and the steam swirl
-$caramel: #b47e41;
-$caramel-deep: #795731;
-$caramel-light: #d0a06a;
+//The gold ribbon: anything that has to catch the eye off the paper
+$amber: #eab469;
+$amber-light: #f0bd74;
+$amber-deep: #9a6316;
 
-//The ribbon marking the page being written on
-$ribbon: $caramel-deep;
-$ribbon-deep: #5c4428;
+//The green ribbon
+$sage: #a2b097;
+$sage-deep: #647458;
 
-//Feedback. Brick rather than red, so a warning still belongs to the palette
-$ok: #5c6b3a;
-$warn: #a8763e;
-$bad: #9c4a34;
+//The lilac ribbon. It marks the page being written on - gold and green already
+//have work, and this is the one the eye has nothing else to confuse with
+$ribbon: #8e5777;
+$ribbon-deep: #6f445c;
 
-//Overlays
-$veil: rgba(20, 14, 9, 0.74);
-$shadow-soft: rgba(20, 14, 9, 0.18);
-$shadow-deep: rgba(20, 14, 9, 0.45);
+/* Dyed index tabs.
+ *
+ * Six, cycled by the day an entry was written - so every entry from one day
+ * shares a colour and the rail reads as a run of days rather than a list of
+ * rows. They are the mark's three ribbons exactly as they were painted, then
+ * the same three in shadow, ordered so the hue changes at every step and no two
+ * days running look alike.
+ */
+$tabs: #eab469, #a2b097, #c7a4b8, #bc781a, #697a5c, #85526f;
+
+//Feedback. Kept in the same register as everything else - a warning belongs to
+//the palette, it does not shout over it. There is no red in the mark, so the
+//one failure colour is the deepest brown in it pulled as far towards red as it
+//can go and still belong
+$ok: #647458;
+$warn: #b37319;
+$bad: #9b4631;
+
+//Overlays. The book's own shadow on the sheet: warm, and never heavier than it
+//is in the mark
+$veil: rgba(54, 29, 12, 0.5);
+$shadow-soft: rgba(90, 54, 31, 0.12);
+$shadow-deep: rgba(54, 29, 12, 0.22);

src/styles/_common.scss

@@ -15,19 +15,25 @@ body {
 	font-family: var.$font-ui;
 	font-size: 16px;
 	color: color.$ink;
-	background-color: color.$desk-deep;
+	background-color: color.$linen;
 
-	//The desk: a warm pool of lamplight falling on wood, with the grain done as
-	//a pair of very low-contrast repeating gradients rather than a bitmap.
+	/* The desk the mark is printed on: warm ivory, lit where the book lies.
+	 *
+	 * Three layers, front to back: the pool of light the book sits in, the same
+	 * warmth spread wide enough to keep the middle of the screen from going flat,
+	 * and the corners falling away into the deeper cream of the paper stack.
+	 *
+	 * All gradients, no bitmap - it costs nothing, resizes to any screen, and
+	 * stays clean on a retina display where a photograph would not. */
 	background-image:
-		radial-gradient(ellipse 120% 90% at 50% -10%, rgba(255, 226, 178, 0.16), transparent 60%),
-		repeating-linear-gradient(
-			92deg,
-			rgba(0, 0, 0, 0.05) 0 3px,
-			rgba(255, 255, 255, 0.014) 3px 7px,
-			rgba(0, 0, 0, 0.035) 7px 11px
-		),
-		linear-gradient(160deg, color.$desk-edge 0%, color.$desk 45%, color.$desk-deep 100%);
+		//The light the book lies in
+		radial-gradient(ellipse 62% 52% at 50% 40%, #{color.$linen-light} 0%, rgba(255, 253, 247, 0) 72%),
+
+		//The warmth of that light, carried further out
+		radial-gradient(ellipse 96% 78% at 50% 46%, rgba(255, 253, 247, 0.6) 0%, rgba(255, 253, 247, 0) 78%),
+
+		//The corners of the desk, where the light does not reach
+		radial-gradient(ellipse 118% 96% at 50% 44%, rgba(242, 231, 209, 0) 58%, #{color.$linen-deep} 100%);
 	background-attachment: fixed;
 
 	overflow: hidden;
@@ -55,34 +61,35 @@ textarea {
 	font: inherit;
 	color: inherit;
 	//Checkboxes and the like belong to the palette, not to the browser
-	accent-color: color.$caramel-deep;
+	accent-color: color.$amber-deep;
 }
 
-/* Buttons that sit on the desk rather than on the paper: brass-ish, restrained */
+/* Buttons that sit on the desk rather than on the paper: a card of the same
+ * paper as the book, laid on the ivory. Restrained - they are furniture */
 .desk-button {
 	display: inline-flex;
 	align-items: center;
 	gap: var.$text-spacing;
 	padding: 0.45rem 0.8rem;
 	border-radius: var.$block-radius;
-	color: rgba(255, 244, 224, 0.82);
-	background-color: rgba(255, 240, 214, 0.07);
-	border: 1px solid rgba(255, 240, 214, 0.14);
+	color: color.$ink-soft;
+	background-color: rgba(254, 244, 225, 0.55);
+	border: 1px solid color.$paper-edge;
 	transition: background-color var.$trans-quick, color var.$trans-quick, border-color var.$trans-quick;
 	white-space: nowrap;
 
 	&:hover,
 	&:focus-visible {
-		color: #fff8ea;
-		background-color: rgba(255, 240, 214, 0.14);
-		border-color: rgba(255, 240, 214, 0.28);
+		color: color.$ink;
+		background-color: color.$paper;
+		border-color: color.$paper-deep;
 	}
 
 	&[aria-expanded="true"],
 	&.is-active {
-		color: #fff8ea;
-		background-color: rgba(255, 240, 214, 0.18);
-		border-color: rgba(255, 240, 214, 0.34);
+		color: color.$ink;
+		background-color: color.$paper-shade;
+		border-color: color.$paper-deep;
 	}
 
 	&:disabled {
@@ -109,7 +116,7 @@ textarea {
 	&:focus {
 		outline: 0;
 		border-color: color.$ribbon;
-		box-shadow: 0 0 0 3px rgba(163, 55, 47, 0.14);
+		box-shadow: 0 0 0 3px rgba(142, 87, 119, 0.18);
 	}
 }
 
@@ -136,7 +143,7 @@ textarea {
 }
 
 :focus-visible {
-	outline: 2px solid color.$caramel;
+	outline: 2px solid color.$amber;
 	outline-offset: 2px;
 }
 

src/styles/_mobile.scss

@@ -126,7 +126,7 @@
 		z-index: 90;
 		width: min(17rem, 82vw);
 		padding: 0.75rem 0.5rem 0.75rem 0.75rem;
-		background-color: rgba(29, 21, 15, 0.96);
+		background-color: rgba(54, 29, 12, 0.96);
 		box-shadow: var.$shadow-panel;
 		transform: translateX(100%);
 		transition: transform var.$trans-mid ease-out;
@@ -158,8 +158,21 @@
 		max-width: 100%;
 	}
 
+	/* The drawer is the inside of the back board, so the two bits of text that
+	 * sit on it rather than on a tab have to come off the paper and onto the
+	 * cover - everywhere else they are ink on ivory */
 	.rail__empty {
 		writing-mode: horizontal-tb;
+		color: rgba(254, 244, 225, 0.55);
+	}
+
+	.rail__more {
+		color: rgba(254, 244, 225, 0.6);
+
+		&:hover {
+			color: color.$paper;
+			background-color: rgba(254, 244, 225, 0.12);
+		}
 	}
 
 	.calendar {

src/styles/_panel.scss

@@ -1,3 +1,4 @@
+@use "sass:color" as sass-color;
 @use "@styles/color";
 @use "@styles/var";
 
@@ -102,14 +103,17 @@
 	gap: var.$text-spacing;
 	padding: 0.55rem 1.1rem;
 	border-radius: var.$block-radius;
-	color: #fff6e6;
-	background-color: color.$ribbon;
+	//The gold ribbon with the wordmark brown on it, exactly as the two sit
+	//together in the mark. Gold is the palette's one colour for things that
+	//have to be reached for; the lilac ribbon belongs to the book
+	color: color.$ink;
+	background-color: color.$amber;
 	box-shadow: var.$shadow-elem;
 	transition: background-color var.$trans-quick;
 
 	&:hover:not(:disabled),
 	&:focus-visible {
-		background-color: color.$ribbon-deep;
+		background-color: sass-color.adjust(color.$amber, $lightness: 6%);
 	}
 
 	&:disabled {
@@ -132,12 +136,12 @@
 }
 
 .text-button--bad {
-	color: color.$ribbon;
+	color: color.$bad;
 
 	&:hover,
 	&:focus-visible {
-		color: color.$ribbon-deep;
-		background-color: rgba(163, 55, 47, 0.08);
+		color: color.$bad;
+		background-color: rgba(155, 70, 49, 0.09);
 	}
 }
 
@@ -148,7 +152,7 @@
 	align-items: center;
 	gap: 0.4rem;
 	font-size: 0.78rem;
-	color: rgba(255, 238, 210, 0.5);
+	color: color.$ink-faint;
 	padding: 0.35rem 0.5rem;
 	white-space: nowrap;
 	transition: color var.$trans-quick;
@@ -156,11 +160,11 @@
 
 .saver--saving,
 .saver--pending {
-	color: rgba(255, 238, 210, 0.75);
+	color: color.$ink-soft;
 }
 
 .saver--failed {
-	color: #f0b6ae;
+	color: color.$bad;
 }
 
 .saver__dot {
@@ -185,3 +189,66 @@
 		opacity: 1;
 	}
 }
+
+/* Picking the hand the book is written in.
+ *
+ * Each option is set in the hand it offers, because the name of a typeface
+ * tells you nothing - what your own words look like in it is the whole
+ * decision. The sample line comes from the dictionary, so it reads as a
+ * sentence rather than as "Aa Bb Cc" in whatever language.
+ */
+.hand-picker {
+	display: grid;
+	grid-template-columns: repeat(auto-fit, minmax(11rem, 1fr));
+	gap: 0.5rem;
+}
+
+.hand-picker__option {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	gap: 0.15rem;
+	padding: 0.6rem 0.75rem;
+	text-align: left;
+	cursor: pointer;
+	border: 1px solid color.$rule;
+	border-radius: var.$block-radius;
+	background-color: color.$paper;
+	color: color.$ink;
+	transition: border-color var.$trans-quick, background-color var.$trans-quick;
+
+	&:hover:not(:disabled) {
+		border-color: color.$ink-faint;
+		background-color: color.$paper-shade;
+	}
+
+	&:disabled {
+		opacity: 0.55;
+		cursor: default;
+	}
+}
+
+//The one in use: a ruled line under the sample, like the page itself
+.hand-picker__option--on {
+	border-color: color.$amber;
+	background-color: color.$paper-shade;
+	box-shadow: inset 0 0 0 1px color.$amber;
+}
+
+.hand-picker__sample {
+	font-size: 1.45rem;
+	line-height: 1.35;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	max-width: 100%;
+}
+
+//The name is the only part not set in the hand - it is a label, not a sample
+.hand-picker__name {
+	font-family: var.$font-ui;
+	font-size: 0.72rem;
+	letter-spacing: 0.04em;
+	text-transform: uppercase;
+	color: color.$ink-faint;
+}

src/styles/_rail.scss

@@ -39,6 +39,9 @@
 	scrollbar-width: none;
 	display: flex;
 	flex-direction: column;
+	//The window is small and centred on where the reading is, so the current
+	//tab sits at eye level rather than wherever a full list would put it.
+	justify-content: center;
 	gap: 0.3rem;
 	padding: 0.15rem 0;
 
@@ -66,9 +69,17 @@
 	color: color.$ink-soft;
 	background-color: color.$paper-shade;
 	//The shadowed strip that reads as the part still inside the book
-	background-image: linear-gradient(to right, rgba(90, 68, 40, 0.22), rgba(90, 68, 40, 0.04) var.$tab-tuck, transparent calc(var.$tab-tuck + 0.5rem));
+	background-image:
+		linear-gradient(to right, rgba(90, 68, 40, 0.22), rgba(90, 68, 40, 0.04) var.$tab-tuck, transparent calc(var.$tab-tuck + 0.5rem)),
+		//The dye, washing in from the outer edge
+		linear-gradient(to right, transparent 30%, var(--tab-wash, transparent) 100%);
+
+	//`--tab` is set per tab from the day the entry was written, so a day's
+	//entries share a colour and the rail reads as a run of days rather than a
+	//list of rows. The card is still paper - only its edge is properly dyed.
+	border-right: 0.45rem solid var(--tab, #{color.$paper-deep});
 	border-radius: 0 var.$block-radius var.$block-radius 0;
-	box-shadow: 0.12rem 0.15rem 0.5rem rgba(20, 14, 9, 0.3);
+	box-shadow: 0.12rem 0.15rem 0.5rem rgba(90, 54, 31, 0.22);
 
 	transition: transform var.$trans-mid ease-out, background-color var.$trans-quick, color var.$trans-quick;
 
@@ -85,7 +96,11 @@
 	transform: translateX(0.3rem);
 	background-color: color.$paper;
 	color: color.$ink;
-	box-shadow: 0.12rem 0.15rem 0.5rem rgba(20, 14, 9, 0.34), inset -0.2rem 0 0 color.$caramel;
+	box-shadow: 0.12rem 0.15rem 0.5rem rgba(90, 54, 31, 0.3);
+	//The one being read is pulled clear of the others, and its paper is clean -
+	//the dye stays on the edge so the preview text is easiest to read here
+	background-image:
+		linear-gradient(to right, rgba(90, 68, 40, 0.22), rgba(90, 68, 40, 0.04) var.$tab-tuck, transparent calc(var.$tab-tuck + 0.5rem));
 
 	&:hover,
 	&:focus-visible {
@@ -95,11 +110,11 @@
 
 /* The entry still being written */
 .rail__tab--open {
-	box-shadow: 0.12rem 0.15rem 0.5rem rgba(20, 14, 9, 0.34), inset -0.2rem 0 0 color.$ribbon;
+	box-shadow: 0.12rem 0.15rem 0.5rem rgba(90, 54, 31, 0.26), inset -0.2rem 0 0 color.$ribbon;
 }
 
 .rail__tab--current.rail__tab--open {
-	box-shadow: 0.12rem 0.15rem 0.6rem rgba(20, 14, 9, 0.4), inset -0.2rem 0 0 color.$ribbon;
+	box-shadow: 0.12rem 0.15rem 0.6rem rgba(90, 54, 31, 0.3), inset -0.2rem 0 0 color.$ribbon;
 }
 
 .rail__date {
@@ -138,25 +153,25 @@
 .rail__empty {
 	font-family: var.$font-hand;
 	font-size: 1.05rem;
-	color: rgba(255, 238, 210, 0.35);
+	color: color.$ink-faint;
 	padding: 0.5rem 0.75rem;
 	writing-mode: vertical-rl;
 	white-space: nowrap;
 }
 
-/* "Load older entries" sits at the top of the rail, since the rail is
- * chronological and the oldest entry is the first tab. */
+/* The rail shows a few tabs either side of where the reading is. These two
+ * say the book carries on past them, and walk the window along. */
 .rail__more {
 	flex: 0 0 auto;
 	align-self: flex-start;
 	margin-left: 0;
 	padding: 0.3rem 0.4rem;
 	font-size: 0.7rem;
-	color: rgba(255, 238, 210, 0.55);
+	color: color.$ink-soft;
 	border-radius: var.$block-radius;
 
 	&:hover {
-		color: #fff8ea;
-		background-color: rgba(255, 240, 214, 0.1);
+		color: color.$ink;
+		background-color: rgba(254, 244, 225, 0.6);
 	}
 }

src/styles/_var.scss

@@ -29,7 +29,13 @@ $tab-height: 3.1rem;
 $tab-tuck: 1.4rem;
 
 //Typography
-$font-hand: "Caveat Variable", "Caveat", "Segoe Script", cursive;
+//The hand the book is written in, chosen in settings and set on :root by
+//hands.js. The literal here is only what shows before that runs.
+$font-hand: var(--book-hand, "Caveat Variable", "Caveat", "Segoe Script", cursive);
+
+//Type size as a fraction of one ruled line. Travels with the hand, since each
+//has its own x-height for the same em.
+$hand-scale: var(--book-hand-scale, 0.82);
 $font-ui: system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;
 
 //Transitions
@@ -37,6 +43,11 @@ $trans-quick: 160ms;
 $trans-mid: 280ms;
 $trans-slow: 600ms;
 
+//A page turn. Short on purpose: while a leaf is upright both the page it left
+//and the page it is landing on are legible at once, and the longer that lasts
+//the more it reads as two pages muddled together rather than one turning.
+$turn: 430ms;
+
 //Elevation
 $shadow-page: 0 1.5rem 3rem color.$shadow-deep;
 $shadow-panel: 0 0.75rem 2rem color.$shadow-deep;

src/styles/daydream.scss

@@ -15,4 +15,3 @@
 /* The hand the journal is written in. Only the variable face is pulled in -
  * the paginator measures whatever is actually loaded, so the font has to be
  * settled (document.fonts.ready) before the first layout, not merely linked. */
-@import '@fontsource-variable/caveat/index.css';

vite.config.mjs

@@ -65,7 +65,7 @@ export default defineConfig(({ mode }) => {
 
 function myThoughtsLint(isDev) {
 	return {
-		name: 'mythoughts-lint',
+		name: 'daydream-lint',
 		apply: 'build',
 		//In `--watch` mode Vite re-runs the whole plugin pipeline (including
 		//buildStart) on every rebuild it triggers from a file change, so this
@@ -96,7 +96,7 @@ async function runLint(isDev) {
 
 function myThoughtsPublicAssets() {
 	return {
-		name: 'mythoughts-public-assets',
+		name: 'daydream-public-assets',
 		apply: 'build',
 		buildStart() {
 			cleanGeneratedAssets();