release 0.46.7

This reverts commit 03a11e6f

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:12.16.3-alpine
+FROM node:12.19.0-alpine
 
 # Create app directory
 WORKDIR /usr/src/app
@@ -23,5 +23,7 @@ RUN set -x \
 # Bundle app source
 COPY . .
 
+USER node
+
 EXPOSE 8080
 CMD [ "node", "./src/www" ]

README-ZH_CN.md

@@ -0,0 +1,58 @@
+# Trilium注意事项
+
+[![Join the chat at https://gitter.im/trilium-notes/Lobby](https://badges.gitter.im/trilium-notes/Lobby.svg)](https://gitter.im/trilium-notes/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+Trilium Notes是一个分层的笔记应用程序，专注于建立大型个人知识库。请参阅[屏幕截图](https://github.com/zadam/trilium/wiki/Screenshot-tour)以快速了解：
+
+![](https://raw.githubusercontent.com/wiki/zadam/trilium/images/screenshot.png)
+
+## 特性
+
+* 笔记可以排列成任意深的树。单个笔记可以放在树中的多个位置（请参阅[克隆](https://github.com/zadam/trilium/wiki/Cloning-notes)）
+* 丰富的所见即所得笔记编辑功能，包括带有markdown[自动格式化功能的](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)表格，图像和[数学](https://github.com/zadam/trilium/wiki/Text-notes#math-support)
+* 支持编辑[使用源代码的笔记](https://github.com/zadam/trilium/wiki/Code-notes)，包括语法高亮显示
+* 笔记之间快速[导航](https://github.com/zadam/trilium/wiki/Note-navigation)，全文搜索和[笔记挂起](https://github.com/zadam/trilium/wiki/Note-hoisting)
+* 无缝[笔记版本控制](https://github.com/zadam/trilium/wiki/Note-revisions)
+* 笔记[属性](https://github.com/zadam/trilium/wiki/Attributes)可用于笔记组织，查询和高级[脚本编写](https://github.com/zadam/trilium/wiki/Scripts)
+* [同步](https://github.com/zadam/trilium/wiki/Synchronization)与自托管同步服务器
+* 具有按笔记粒度的强大的[笔记加密](https://github.com/zadam/trilium/wiki/Protected-notes)
+* [关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)，用于可视化笔记及其关系
+* [脚本](https://github.com/zadam/trilium/wiki/Scripts)-请参阅[高级展示](https://github.com/zadam/trilium/wiki/Advanced-showcases)
+* 可用性和性能均能很好地扩展至超过10万个笔记
+* 针对智能手机和平板电脑进行触摸优化的[移动前端](https://github.com/zadam/trilium/wiki/Mobile-frontend)
+* [夜间主题](https://github.com/zadam/trilium/wiki/Themes)
+* [Evernote](https://github.com/zadam/trilium/wiki/Evernote-import)和[Markdown导入导出](https://github.com/zadam/trilium/wiki/Markdown)
+* [Web Clipper](https://github.com/zadam/trilium/wiki/Web-clipper)可轻松保存Web内容
+
+## 构建
+
+Trilium是作为桌面应用程序（Linux和Windows）或服务器上托管的Web应用程序（Linux）提供的。Mac OS桌面版本可用，但[不受支持](https://github.com/zadam/trilium/wiki/FAQ#mac-os-support)。
+
+* 如果要在桌面上使用Trilium，请从[最新版本](https://github.com/zadam/trilium/releases/latest)下载适用于您平台的二进制[版本](https://github.com/zadam/trilium/releases/latest)，解压缩该软件包并运行`trilium`可执行文件。
+* 如果要在服务器上安装Trilium，请遵循[此页面](https://github.com/zadam/trilium/wiki/Server-installation)。
+    * 当前仅支持（经过测试）最新的Chrome和Firefox浏览器。
+
+## 文档
+
+[有关文档页面的完整列表，请参见Wiki。](https://github.com/zadam/trilium/wiki/)
+
+您还可以阅读[个人知识库模式](https://github.com/zadam/trilium/wiki/Patterns-of-personal-knowledge-base)，以获取有关如何使用Trilium的灵感。
+
+## 贡献
+
+使用基于浏览器的开发环境
+
+[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/zadam/trilium)
+
+或在本地克隆并运行
+
+```
+npm install
+npm run start-server
+```
+
+## 致谢
+
+* [CKEditor 5](https://github.com/ckeditor/ckeditor5) - 市场上最好的所见即所得编辑器，互动性强且聆听能力强的团队
+* [FancyTree](https://github.com/mar10/fancytree) - 一个非常丰富的关于树的库，强大的没有对手。没有它，Trilium Notes将不会如此。
+* [CodeMirror](https://github.com/codemirror/CodeMirror) - 支持大量语言的代码编辑器
+* [jsPlumb](https://github.com/jsplumb/jsplumb)强大的可视化连接库。- 用于[关系图](https://github.com/zadam/trilium/wiki/Relation-map)和[链接图](https://github.com/zadam/trilium/wiki/Link-map)

README.md

@@ -8,7 +8,7 @@ Trilium Notes is a hierarchical note taking application with focus on building l
 ## Features
 
 * Notes can be arranged into arbitrarily deep tree. Single note can be placed into multiple places in the tree (see [cloning](https://github.com/zadam/trilium/wiki/Cloning-notes))
-* Rich WYSIWYG note editing including e.g. tables and images with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
+* Rich WYSIWYG note editing including e.g. tables, images and [math](https://github.com/zadam/trilium/wiki/Text-notes#math-support) with markdown [autoformat](https://github.com/zadam/trilium/wiki/Text-notes#autoformat)
 * Support for editing [notes with source code](https://github.com/zadam/trilium/wiki/Code-notes), including syntax highlighting
 * Fast and easy [navigation between notes](https://github.com/zadam/trilium/wiki/Note-navigation), full text search and [note hoisting](https://github.com/zadam/trilium/wiki/Note-hoisting)
 * Seamless [note versioning](https://github.com/zadam/trilium/wiki/Note-revisions)
@@ -54,4 +54,8 @@ npm run start-server
 * [CKEditor 5](https://github.com/ckeditor/ckeditor5) - best WYSIWYG editor on the market, very interactive and listening team
 * [FancyTree](https://github.com/mar10/fancytree) - very feature rich tree library without real competition. Trilium Notes would not be the same without it.
 * [CodeMirror](https://github.com/codemirror/CodeMirror) - code editor with support for huge amount of languages
-* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)
+* [jsPlumb](https://github.com/jsplumb/jsplumb) - visual connectivity library without competition. Used in [relation maps](https://github.com/zadam/trilium/wiki/Relation-map) and [link maps](https://github.com/zadam/trilium/wiki/Link-map)
+
+## License
+
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.

bin/build-docker.sh

@@ -5,7 +5,7 @@ SERIES=${VERSION:0:4}-latest
 
 cat package.json | grep -v electron > server-package.json
 
-sudo docker build -t zadam/trilium:$VERSION -t zadam/trilium:$SERIES .
+sudo docker build -t zadam/trilium:$VERSION --network host -t zadam/trilium:$SERIES .
 
 if [[ $VERSION != *"beta"* ]]; then
   sudo docker tag zadam/trilium:$VERSION zadam/trilium:latest

bin/build-server.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 PKG_DIR=dist/trilium-linux-x64-server
-NODE_VERSION=12.18.3
+NODE_VERSION=12.19.0
 
 if [ "$1" != "DONTCOPY" ]
 then

config-sample.ini

@@ -1,10 +1,13 @@
 [General]
-# Instance name can be used to distinguish between different instances
+# Instance name can be used to distinguish between different instances using backend api.getInstanceName()
 instanceName=
 
 # set to true to allow using Trilium without authentication (makes sense for server build only, desktop build doesn't need password)
 noAuthentication=false
 
+# set to true to disable backups (e.g. because of limited space on server)
+noBackup=false
+
 # Disable automatically generating desktop icon
 # noDesktopIcon=true
 

db/migrations/0166__add_dateModified_to_note_content.sql

@@ -11,7 +11,7 @@ INSERT INTO note_contents_mig (noteId, content, hash, dateModified, utcDateModif
     SELECT noteId,
            content,
            hash,
-           (SELECT dateModified FROM notes WHERE noteId = note_contents.noteId),
+           COALESCE((SELECT dateModified FROM notes WHERE noteId = note_contents.noteId), utcDateModified),
            utcDateModified
     FROM note_contents;
 

db/migrations/0169__convert_h1_to_h2.js

@@ -3,13 +3,15 @@ const repository = require('../../src/services/repository');
 module.exports = () => {
     for (const note of repository.getEntities("SELECT * FROM notes WHERE type = 'text' AND isProtected = 0")) {
         try {
-            let content = note.getContent();
+            let origContent = note.getContent();
 
-            content = content
+            const newContent = origContent
                 .replace(/<h1/ig, "<h2")
                 .replace(/<\/h1/ig, "</h2");
 
-            note.setContent(content);
+            if (newContent !== origContent) {
+                note.setContent(newContent);
+            }
         }
         catch (e) {
             console.log(`Changing note content for note ${note.noteId} failed with: ${e.message} ${e.stack}`);

db/migrations/0170__fix_branch_ordering.js

@@ -0,0 +1,14 @@
+const repository = require('../../src/services/repository');
+const sql = require('../../src/services/sql');
+
+module.exports = () => {
+    for (const note of repository.getEntities("SELECT * FROM notes")) {
+        let position = 0;
+
+        for (const branch of note.getChildBranches()) {
+            sql.execute(`UPDATE branches SET notePosition = ? WHERE branchId = ?`, [position, branch.branchId]);
+
+            position += 10;
+        }
+    }
+};

db/migrations/0171__cleanup_options.sql

@@ -0,0 +1,15 @@
+DELETE FROM options WHERE name IN (
+    'noteInfoWidget',
+    'attributesWidget',
+    'linkMapWidget',
+    'noteRevisionsWidget',
+    'whatLinksHereWidget',
+    'codeNotesMimeTypes',
+    'similarNotesWidget',
+    'editedNotesWidget',
+    'calendarWidget',
+    'sidebarMinWidth',
+    'sidebarWidthPercent',
+    'showSidebarInNewTab',
+    'hoistedNoteId'
+);

db/migrations/0173__isErased_in_entity_changes.sql

@@ -0,0 +1,69 @@
+CREATE TABLE IF NOT EXISTS "mig_entity_changes" (
+                                                    `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                    `entityName`	TEXT NOT NULL,
+                                                    `entityId`	TEXT NOT NULL,
+                                                    `hash`	TEXT NOT NULL,
+                                                    `sourceId` TEXT NOT NULL,
+                                                    `isErased` INT NOT NULL,
+                                                    `utcDateChanged` TEXT NOT NULL,
+                                                    `isSynced` INTEGER NOT NULL);
+
+INSERT INTO mig_entity_changes (id, entityName, entityId, hash, sourceId, isSynced, utcDateChanged, isErased)
+SELECT id, entityName, entityId, '', sourceId, isSynced, utcChangedDate, 0 FROM entity_changes;
+
+UPDATE mig_entity_changes SET isErased = (SELECT isErased FROM notes WHERE noteId = entityId) WHERE entityName = 'notes';
+UPDATE mig_entity_changes SET utcDateChanged = COALESCE((SELECT utcDateModified FROM notes WHERE noteId = entityId), '2020-12-14 14:07:05.165Z') WHERE entityName = 'notes';
+
+UPDATE mig_entity_changes SET isErased = (SELECT isErased FROM notes WHERE noteId = entityId) WHERE entityName = 'note_contents';
+
+UPDATE mig_entity_changes SET isErased = (
+    SELECT isErased
+    FROM attributes
+         JOIN notes USING(noteId)
+    WHERE attributeId = entityId
+) WHERE entityName = 'attributes';
+UPDATE mig_entity_changes SET utcDateChanged = COALESCE((SELECT utcDateModified FROM attributes WHERE attributeId = entityId), '2020-12-14 14:07:05.165Z') WHERE entityName = 'attributes';
+
+UPDATE mig_entity_changes SET isErased = (
+    SELECT isErased
+    FROM branches
+    JOIN notes USING(noteId)
+    WHERE branchId = entityId
+) WHERE entityName = 'branches';
+UPDATE mig_entity_changes SET utcDateChanged = COALESCE((SELECT utcDateModified FROM branches WHERE branchId = entityId), '2020-12-14 14:07:05.165Z') WHERE entityName = 'branches';
+
+UPDATE mig_entity_changes SET isErased = (
+    SELECT isErased
+    FROM note_revisions
+    WHERE noteRevisionId = entityId
+) WHERE entityName = 'note_revisions';
+UPDATE mig_entity_changes SET utcDateChanged = COALESCE((SELECT utcDateModified FROM note_revisions WHERE noteRevisionId = entityId), '2020-12-14 14:07:05.165Z') WHERE entityName = 'note_revisions';
+
+UPDATE mig_entity_changes SET utcDateChanged = COALESCE((SELECT utcDateCreated FROM api_tokens WHERE apiTokenId = entityId), '2020-12-14 14:07:05.165Z') WHERE entityName = 'api_tokens';
+
+UPDATE mig_entity_changes SET utcDateChanged = COALESCE((SELECT utcDateModified FROM note_contents WHERE noteId = entityId), '2020-12-14 14:07:05.165Z') WHERE entityName = 'note_contents';
+
+UPDATE mig_entity_changes SET utcDateChanged = COALESCE((SELECT utcDateModified FROM note_revision_contents WHERE noteRevisionId = entityId), '2020-12-14 14:07:05.165Z') WHERE entityName = 'note_revision_contents';
+
+UPDATE mig_entity_changes SET utcDateChanged = COALESCE((SELECT utcDateModified FROM options WHERE name = entityId), '2020-12-14 14:07:05.165Z') WHERE entityName = 'options';
+
+UPDATE mig_entity_changes SET utcDateChanged = COALESCE((SELECT utcDateCreated FROM recent_notes WHERE noteId = entityId), '2020-12-14 14:07:05.165Z') WHERE entityName = 'options';
+
+DROP TABLE entity_changes;
+ALTER TABLE mig_entity_changes RENAME TO entity_changes;
+
+CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
+                                                                                 `entityName`,
+                                                                                 `entityId`
+    );
+
+DELETE FROM attributes WHERE noteId IN (SELECT noteId FROM notes WHERE isErased = 1);
+DELETE FROM branches WHERE noteId IN (SELECT noteId FROM notes WHERE isErased = 1);
+DELETE FROM note_contents WHERE noteId IN (SELECT noteId FROM notes WHERE isErased = 1);
+DELETE FROM note_revision_contents WHERE noteRevisionId IN (
+    SELECT noteRevisionId FROM note_revisions WHERE isErased = 1
+);
+DELETE FROM note_revisions WHERE isErased = 1;
+DELETE FROM notes WHERE isErased = 1;
+
+UPDATE entity_changes SET isErased = COALESCE((SELECT isErased FROM entity_changes AS sub WHERE sub.entityId = entity_changes.entityId AND sub.entityName = 'note_revisions'), 0) WHERE entityName = 'note_revision_contents';

db/migrations/0174__move_hash_to_entity_changes.sql

@@ -0,0 +1,198 @@
+CREATE TABLE IF NOT EXISTS "mig_entity_changes" (
+                                                `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                `entityName`	TEXT NOT NULL,
+                                                `entityId`	TEXT NOT NULL,
+                                                `hash`	TEXT NOT NULL,
+                                                `isErased` INT NOT NULL,
+                                                `sourceId` TEXT NOT NULL,
+                                                `isSynced` INTEGER NOT NULL,
+                                                `utcDateChanged` TEXT NOT NULL
+                                                );
+
+INSERT INTO mig_entity_changes (id, entityName, entityId, hash, sourceId, isSynced, isErased, utcDateChanged)
+    SELECT id, entityName, entityId, '', sourceId, isSynced, isErased, utcDateChanged FROM entity_changes;
+
+UPDATE mig_entity_changes SET hash = COALESCE((SELECT hash FROM api_tokens WHERE apiTokenId = entityId), '') WHERE entityName = 'api_tokens';
+UPDATE mig_entity_changes SET hash = COALESCE((SELECT hash FROM attributes WHERE attributeId = entityId), '') WHERE entityName = 'attributes';
+UPDATE mig_entity_changes SET hash = COALESCE((SELECT hash FROM branches WHERE branchId = entityId), '') WHERE entityName = 'branches';
+UPDATE mig_entity_changes SET hash = COALESCE((SELECT hash FROM notes WHERE noteId = entityId), '') WHERE entityName = 'notes';
+UPDATE mig_entity_changes SET hash = COALESCE((SELECT hash FROM note_contents WHERE noteId = entityId), '') WHERE entityName = 'note_contents';
+UPDATE mig_entity_changes SET hash = COALESCE((SELECT hash FROM note_revisions WHERE noteRevisionId = entityId), '') WHERE entityName = 'note_revisions';
+UPDATE mig_entity_changes SET hash = COALESCE((SELECT hash FROM note_revision_contents WHERE noteRevisionId = entityId), '') WHERE entityName = 'note_revision_contents';
+UPDATE mig_entity_changes SET hash = COALESCE((SELECT hash FROM options WHERE name = entityId), '') WHERE entityName = 'options';
+UPDATE mig_entity_changes SET hash = COALESCE((SELECT hash FROM recent_notes WHERE noteId = entityId), '') WHERE entityName = 'recent_notes';
+
+DROP TABLE entity_changes;
+ALTER TABLE mig_entity_changes RENAME TO entity_changes;
+
+CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
+                                                                                 `entityName`,
+                                                                                 `entityId`
+    );
+
+CREATE TABLE IF NOT EXISTS "mig_api_tokens"
+(
+    apiTokenId TEXT PRIMARY KEY NOT NULL,
+    token TEXT NOT NULL,
+    utcDateCreated TEXT NOT NULL,
+    isDeleted INT NOT NULL DEFAULT 0);
+
+INSERT INTO mig_api_tokens (apiTokenId, token, utcDateCreated, isDeleted)
+SELECT apiTokenId, token, utcDateCreated, isDeleted FROM api_tokens;
+
+DROP TABLE api_tokens;
+ALTER TABLE mig_api_tokens RENAME TO api_tokens;
+
+CREATE TABLE IF NOT EXISTS "mig_attributes"
+(
+    attributeId      TEXT not null primary key,
+    noteId       TEXT not null,
+    type         TEXT not null,
+    name         TEXT not null,
+    value        TEXT default '' not null,
+    position     INT  default 0 not null,
+    utcDateCreated  TEXT not null,
+    utcDateModified TEXT not null,
+    isDeleted    INT  not null,
+    `deleteId`    TEXT DEFAULT NULL,
+    isInheritable int DEFAULT 0 NULL);
+
+INSERT INTO mig_attributes (attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, deleteId, isInheritable)
+SELECT attributeId, noteId, type, name, value, position, utcDateCreated, utcDateModified, isDeleted, deleteId, isInheritable FROM attributes;
+
+DROP TABLE attributes;
+ALTER TABLE mig_attributes RENAME TO attributes;
+
+CREATE INDEX IDX_attributes_name_value
+    on attributes (name, value);
+CREATE INDEX IDX_attributes_noteId_index
+    on attributes (noteId);
+CREATE INDEX IDX_attributes_value_index
+    on attributes (value);
+
+CREATE TABLE IF NOT EXISTS "mig_branches" (
+                                          `branchId`	TEXT NOT NULL,
+                                          `noteId`	TEXT NOT NULL,
+                                          `parentNoteId`	TEXT NOT NULL,
+                                          `notePosition`	INTEGER NOT NULL,
+                                          `prefix`	TEXT,
+                                          `isExpanded`	INTEGER NOT NULL DEFAULT 0,
+                                          `isDeleted`	INTEGER NOT NULL DEFAULT 0,
+                                          `deleteId`    TEXT DEFAULT NULL,
+                                          `utcDateModified`	TEXT NOT NULL,
+                                          utcDateCreated TEXT NOT NULL,
+                                          PRIMARY KEY(`branchId`));
+
+INSERT INTO mig_branches (branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, deleteId, utcDateModified, utcDateCreated)
+SELECT branchId, noteId, parentNoteId, notePosition, prefix, isExpanded, isDeleted, deleteId, utcDateModified, utcDateCreated FROM branches;
+
+DROP TABLE branches;
+ALTER TABLE mig_branches RENAME TO branches;
+
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
+
+CREATE TABLE IF NOT EXISTS "mig_notes" (
+                                       `noteId`	TEXT NOT NULL,
+                                       `title`	TEXT NOT NULL DEFAULT "note",
+                                       `isProtected`	INT NOT NULL DEFAULT 0,
+                                       `type` TEXT NOT NULL DEFAULT 'text',
+                                       `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                       `isDeleted`	INT NOT NULL DEFAULT 0,
+                                       `deleteId`   TEXT DEFAULT NULL,
+                                       `dateCreated`	TEXT NOT NULL,
+                                       `dateModified`	TEXT NOT NULL,
+                                       `utcDateCreated`	TEXT NOT NULL,
+                                       `utcDateModified`	TEXT NOT NULL,
+                                       PRIMARY KEY(`noteId`));
+
+INSERT INTO mig_notes (noteId, title, isProtected, type, mime, isDeleted, deleteId, dateCreated, dateModified, utcDateCreated, utcDateModified)
+SELECT noteId, title, isProtected, type, mime, isDeleted, deleteId, dateCreated, dateModified, utcDateCreated, utcDateModified FROM notes;
+
+DROP TABLE notes;
+ALTER TABLE mig_notes RENAME TO notes;
+
+CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
+CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
+CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
+CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
+CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
+CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
+
+CREATE TABLE IF NOT EXISTS "mig_note_contents" (
+                                               `noteId`	TEXT NOT NULL,
+                                               `content`	TEXT NULL DEFAULT NULL,
+                                               `dateModified` TEXT NOT NULL,
+                                               `utcDateModified` TEXT NOT NULL,
+                                               PRIMARY KEY(`noteId`)
+);
+
+INSERT INTO mig_note_contents (noteId, content, dateModified, utcDateModified)
+SELECT noteId, content, dateModified, utcDateModified FROM note_contents;
+
+DROP TABLE note_contents;
+ALTER TABLE mig_note_contents RENAME TO note_contents;
+
+CREATE TABLE IF NOT EXISTS "mig_note_revisions" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                             `noteId`	TEXT NOT NULL,
+                                             type TEXT DEFAULT '' NOT NULL,
+                                             mime TEXT DEFAULT '' NOT NULL,
+                                             `title`	TEXT,
+                                             `isProtected`	INT NOT NULL DEFAULT 0,
+                                             `utcDateLastEdited` TEXT NOT NULL,
+                                             `utcDateCreated` TEXT NOT NULL,
+                                             `utcDateModified` TEXT NOT NULL,
+                                             `dateLastEdited` TEXT NOT NULL,
+                                             `dateCreated` TEXT NOT NULL);
+
+INSERT INTO mig_note_revisions (noteRevisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated)
+SELECT noteRevisionId, noteId, type, mime, title, isProtected, utcDateLastEdited, utcDateCreated, utcDateModified, dateLastEdited, dateCreated FROM note_revisions;
+
+DROP TABLE note_revisions;
+ALTER TABLE mig_note_revisions RENAME TO note_revisions;
+
+CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
+CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
+CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
+CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
+CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
+
+CREATE TABLE IF NOT EXISTS "mig_note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                     `content`	TEXT,
+                                                     `utcDateModified` TEXT NOT NULL);
+
+INSERT INTO mig_note_revision_contents (noteRevisionId, content, utcDateModified)
+SELECT noteRevisionId, content, utcDateModified FROM note_revision_contents;
+
+DROP TABLE note_revision_contents;
+ALTER TABLE mig_note_revision_contents RENAME TO note_revision_contents;
+
+CREATE TABLE IF NOT EXISTS "mig_options"
+(
+    name TEXT not null PRIMARY KEY,
+    value TEXT,
+    isSynced INTEGER default 0 not null,
+    utcDateCreated TEXT not null,
+    utcDateModified TEXT NOT NULL
+);
+
+INSERT INTO mig_options (name, value, isSynced, utcDateCreated, utcDateModified)
+SELECT name, value, isSynced, utcDateCreated, utcDateModified FROM options;
+
+DROP TABLE options;
+ALTER TABLE mig_options RENAME TO options;
+
+CREATE TABLE mig_recent_notes
+(
+    noteId TEXT not null primary key,
+    notePath TEXT not null,
+    utcDateCreated TEXT not null,
+    isDeleted INT NOT NULL DEFAULT 0
+);
+
+INSERT INTO mig_recent_notes (noteId, notePath, utcDateCreated, isDeleted)
+SELECT noteId, notePath, utcDateCreated, isDeleted FROM recent_notes;
+
+DROP TABLE recent_notes;
+ALTER TABLE mig_recent_notes RENAME TO recent_notes;

db/migrations/0175__rename_eraseNotesAfterTimeInSeconds.sql

@@ -0,0 +1,2 @@
+UPDATE options SET name = 'eraseEntitiesAfterTimeInSeconds' WHERE name = 'eraseNotesAfterTimeInSeconds';
+UPDATE entity_changes SET entityId = 'eraseEntitiesAfterTimeInSeconds' WHERE entityName = 'options' AND entityId = 'eraseNotesAfterTimeInSeconds';

db/migrations/0176__remove_utcDateCreated_in_attributes.sql

@@ -0,0 +1,25 @@
+CREATE TABLE IF NOT EXISTS "mig_attributes"
+(
+    attributeId      TEXT not null primary key,
+    noteId       TEXT not null,
+    type         TEXT not null,
+    name         TEXT not null,
+    value        TEXT default '' not null,
+    position     INT  default 0 not null,
+    utcDateModified TEXT not null,
+    isDeleted    INT  not null,
+    `deleteId`    TEXT DEFAULT NULL,
+    isInheritable int DEFAULT 0 NULL);
+
+INSERT INTO mig_attributes (attributeId, noteId, type, name, value, position, utcDateModified, isDeleted, deleteId, isInheritable)
+SELECT attributeId, noteId, type, name, value, position, utcDateModified, isDeleted, deleteId, isInheritable FROM attributes;
+
+DROP TABLE attributes;
+ALTER TABLE mig_attributes RENAME TO attributes;
+
+CREATE INDEX IDX_attributes_name_value
+    on attributes (name, value);
+CREATE INDEX IDX_attributes_noteId_index
+    on attributes (noteId);
+CREATE INDEX IDX_attributes_value_index
+    on attributes (value);

db/migrations/0177__cleanup_keyboard_shortcuts.sql

@@ -0,0 +1,5 @@
+DELETE FROM options WHERE name = 'keyboardShortcutsCreateNoteIntoInbox'; -- in case there is already one which shouldn't (except for in-dev documents)
+UPDATE options SET name = 'keyboardShortcutsCreateNoteIntoInbox' WHERE name = 'keyboardShortcutsCreateNoteIntoDayNote';
+
+DELETE FROM options WHERE name = 'keyboardShortcutsShowAttributes';
+DELETE FROM entity_changes WHERE entityName = 'options' AND entityId = 'keyboardShortcutsShowAttributes';

db/migrations/0178__drop_isDeleted_index.sql

@@ -0,0 +1 @@
+DROP INDEX IDX_notes_isDeleted;

db/migrations/0179__VACUUM.sql

@@ -0,0 +1 @@
+VACUUM

db/migrations/0180__rename_quickSearch_shortcut.sql

@@ -0,0 +1,2 @@
+UPDATE options SET name = 'keyboardShortcutsQuickSearch' WHERE name = 'keyboardShortcutsSearchNotes';
+UPDATE entity_changes SET entityId = 'keyboardShortcutsQuickSearch' WHERE entityId = 'keyboardShortcutsSearchNotes' AND entityName = 'options';

db/migrations/0181__fix_entityChanges_isSynced.sql

@@ -0,0 +1,5 @@
+UPDATE entity_changes SET isSynced = COALESCE((
+    SELECT options.isSynced
+    FROM options
+    WHERE options.name = entity_changes.entityId
+), 0) WHERE entityName = 'options';

db/migrations/0182__remove_recentChanges_from_entityChanges.sql

@@ -0,0 +1,14 @@
+DELETE FROM entity_changes WHERE entityName = 'recent_notes';
+
+CREATE TABLE IF NOT EXISTS "mig_recent_notes"
+(
+    noteId TEXT not null primary key,
+    notePath TEXT not null,
+    utcDateCreated TEXT not null
+);
+
+INSERT INTO mig_recent_notes (noteId, notePath, utcDateCreated)
+    SELECT noteId, notePath, utcDateCreated FROM recent_notes;
+
+DROP TABLE recent_notes;
+ALTER TABLE mig_recent_notes RENAME TO recent_notes;

db/migrations/0183__migrate_saved_search_notes.js

@@ -0,0 +1,25 @@
+const repository = require('../../src/services/repository');
+
+module.exports = () => {
+    for (const note of repository.getEntities("SELECT * FROM notes WHERE type = 'search' AND isProtected = 0 AND isDeleted = 0")) {
+        try {
+            let origContent = note.getJsonContent();
+
+            if (!origContent) {
+                continue;
+            }
+
+            note.addLabel('searchString', origContent.searchString);
+
+            note.setContent('');
+
+            note.mime = 'text/plain';
+            note.save();
+
+            console.log(`Migrated search note ${note.noteId}`);
+        }
+        catch (e) {
+            console.log(`Changing note content for note ${note.noteId} failed with: ${e.message} ${e.stack}`);
+        }
+    }
+};

db/schema.sql

@@ -1,31 +1,19 @@
+CREATE TABLE IF NOT EXISTS "entity_changes" (
+                                                `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+                                                `entityName`	TEXT NOT NULL,
+                                                `entityId`	TEXT NOT NULL,
+                                                `hash`	TEXT NOT NULL,
+                                                `isErased` INT NOT NULL,
+                                                `sourceId` TEXT NOT NULL,
+                                                `isSynced` INTEGER NOT NULL,
+                                                `utcDateChanged` TEXT NOT NULL
+                                                );
 CREATE TABLE IF NOT EXISTS "api_tokens"
 (
-  apiTokenId TEXT PRIMARY KEY NOT NULL,
-  token TEXT NOT NULL,
-  utcDateCreated TEXT NOT NULL,
-  isDeleted INT NOT NULL DEFAULT 0,
-  hash TEXT DEFAULT "" NOT NULL);
-CREATE TABLE IF NOT EXISTS "options"
-(
-  name TEXT not null PRIMARY KEY,
-  value TEXT,
-  isSynced INTEGER default 0 not null,
-  hash TEXT default "" not null,
-  utcDateCreated TEXT not null,
-  utcDateModified TEXT NOT NULL
-);
-CREATE TABLE recent_notes
-(
-    noteId TEXT not null primary key,
-    notePath TEXT not null,
-    hash TEXT default "" not null,
-    utcDateCreated TEXT not null,
-    isDeleted INT
-);
-CREATE TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
-                                                 `content`	TEXT,
-                                                 hash TEXT DEFAULT '' NOT NULL,
-                                                 `utcDateModified` TEXT NOT NULL);
+    apiTokenId TEXT PRIMARY KEY NOT NULL,
+    token TEXT NOT NULL,
+    utcDateCreated TEXT NOT NULL,
+    isDeleted INT NOT NULL DEFAULT 0);
 CREATE TABLE IF NOT EXISTS "branches" (
                                           `branchId`	TEXT NOT NULL,
                                           `noteId`	TEXT NOT NULL,
@@ -37,10 +25,49 @@ CREATE TABLE IF NOT EXISTS "branches" (
                                           `deleteId`    TEXT DEFAULT NULL,
                                           `utcDateModified`	TEXT NOT NULL,
                                           utcDateCreated TEXT NOT NULL,
-                                          hash TEXT DEFAULT "" NOT NULL,
                                           PRIMARY KEY(`branchId`));
-CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
-CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
+CREATE TABLE IF NOT EXISTS "notes" (
+                                       `noteId`	TEXT NOT NULL,
+                                       `title`	TEXT NOT NULL DEFAULT "note",
+                                       `isProtected`	INT NOT NULL DEFAULT 0,
+                                       `type` TEXT NOT NULL DEFAULT 'text',
+                                       `mime` TEXT NOT NULL DEFAULT 'text/html',
+                                       `isDeleted`	INT NOT NULL DEFAULT 0,
+                                       `deleteId`   TEXT DEFAULT NULL,
+                                       `dateCreated`	TEXT NOT NULL,
+                                       `dateModified`	TEXT NOT NULL,
+                                       `utcDateCreated`	TEXT NOT NULL,
+                                       `utcDateModified`	TEXT NOT NULL,
+                                       PRIMARY KEY(`noteId`));
+CREATE TABLE IF NOT EXISTS "note_contents" (
+                                               `noteId`	TEXT NOT NULL,
+                                               `content`	TEXT NULL DEFAULT NULL,
+                                               `dateModified` TEXT NOT NULL,
+                                               `utcDateModified` TEXT NOT NULL,
+                                               PRIMARY KEY(`noteId`)
+);
+CREATE TABLE IF NOT EXISTS "note_revisions" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                             `noteId`	TEXT NOT NULL,
+                                             type TEXT DEFAULT '' NOT NULL,
+                                             mime TEXT DEFAULT '' NOT NULL,
+                                             `title`	TEXT,
+                                             `isProtected`	INT NOT NULL DEFAULT 0,
+                                             `utcDateLastEdited` TEXT NOT NULL,
+                                             `utcDateCreated` TEXT NOT NULL,
+                                             `utcDateModified` TEXT NOT NULL,
+                                             `dateLastEdited` TEXT NOT NULL,
+                                             `dateCreated` TEXT NOT NULL);
+CREATE TABLE IF NOT EXISTS "note_revision_contents" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
+                                                     `content`	TEXT,
+                                                     `utcDateModified` TEXT NOT NULL);
+CREATE TABLE IF NOT EXISTS "options"
+(
+    name TEXT not null PRIMARY KEY,
+    value TEXT,
+    isSynced INTEGER default 0 not null,
+    utcDateCreated TEXT not null,
+    utcDateModified TEXT NOT NULL
+);
 CREATE TABLE IF NOT EXISTS "attributes"
 (
     attributeId      TEXT not null primary key,
@@ -49,77 +76,36 @@ CREATE TABLE IF NOT EXISTS "attributes"
     name         TEXT not null,
     value        TEXT default '' not null,
     position     INT  default 0 not null,
-    utcDateCreated  TEXT not null,
     utcDateModified TEXT not null,
     isDeleted    INT  not null,
     `deleteId`    TEXT DEFAULT NULL,
-    hash         TEXT default "" not null,
     isInheritable int DEFAULT 0 NULL);
-CREATE INDEX IDX_attributes_name_value
-    on attributes (name, value);
-CREATE INDEX IDX_attributes_noteId_index
-    on attributes (noteId);
-CREATE INDEX IDX_attributes_value_index
-    on attributes (value);
-CREATE TABLE IF NOT EXISTS "entity_changes" (
-                                                `id`	INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
-                                                `entityName`	TEXT NOT NULL,
-                                                `entityId`	TEXT NOT NULL,
-                                                `sourceId` TEXT NOT NULL,
-                                                `isSynced` INTEGER default 0 not null,
-                                                `utcChangedDate`	TEXT NOT NULL);
 CREATE UNIQUE INDEX `IDX_entityChanges_entityName_entityId` ON "entity_changes" (
                                                                                  `entityName`,
                                                                                  `entityId`
     );
-CREATE INDEX `IDX_entityChanges_utcChangedDate` ON "entity_changes" (
-                                                                  `utcChangedDate`
-    );
-CREATE TABLE IF NOT EXISTS "notes" (
-                                       `noteId`	TEXT NOT NULL,
-                                       `title`	TEXT NOT NULL DEFAULT "note",
-                                       `isProtected`	INT NOT NULL DEFAULT 0,
-                                       `type` TEXT NOT NULL DEFAULT 'text',
-                                       `mime` TEXT NOT NULL DEFAULT 'text/html',
-                                       `hash` TEXT DEFAULT "" NOT NULL,
-                                       `isDeleted`	INT NOT NULL DEFAULT 0,
-                                       `deleteId`   TEXT DEFAULT NULL,
-                                       `isErased`	INT NOT NULL DEFAULT 0,
-                                       `dateCreated`	TEXT NOT NULL,
-                                       `dateModified`	TEXT NOT NULL,
-                                       `utcDateCreated`	TEXT NOT NULL,
-                                       `utcDateModified`	TEXT NOT NULL,
-                                       PRIMARY KEY(`noteId`));
-CREATE INDEX `IDX_notes_isDeleted` ON `notes` (`isDeleted`);
+CREATE INDEX `IDX_branches_noteId_parentNoteId` ON `branches` (`noteId`,`parentNoteId`);
+CREATE INDEX IDX_branches_parentNoteId ON branches (parentNoteId);
 CREATE INDEX `IDX_notes_title` ON `notes` (`title`);
 CREATE INDEX `IDX_notes_type` ON `notes` (`type`);
 CREATE INDEX `IDX_notes_dateCreated` ON `notes` (`dateCreated`);
 CREATE INDEX `IDX_notes_dateModified` ON `notes` (`dateModified`);
 CREATE INDEX `IDX_notes_utcDateModified` ON `notes` (`utcDateModified`);
 CREATE INDEX `IDX_notes_utcDateCreated` ON `notes` (`utcDateCreated`);
-CREATE TABLE IF NOT EXISTS "note_revisions" (`noteRevisionId`	TEXT NOT NULL PRIMARY KEY,
-                                             `noteId`	TEXT NOT NULL,
-                                             `title`	TEXT,
-                                             `isErased`	INT NOT NULL DEFAULT 0,
-                                             `isProtected`	INT NOT NULL DEFAULT 0,
-                                             `utcDateLastEdited` TEXT NOT NULL,
-                                             `utcDateCreated` TEXT NOT NULL,
-                                             `utcDateModified` TEXT NOT NULL,
-                                             `dateLastEdited` TEXT NOT NULL,
-                                             `dateCreated` TEXT NOT NULL,
-                                             type TEXT DEFAULT '' NOT NULL,
-                                             mime TEXT DEFAULT '' NOT NULL,
-                                             hash TEXT DEFAULT '' NOT NULL);
 CREATE INDEX `IDX_note_revisions_noteId` ON `note_revisions` (`noteId`);
 CREATE INDEX `IDX_note_revisions_utcDateCreated` ON `note_revisions` (`utcDateCreated`);
 CREATE INDEX `IDX_note_revisions_utcDateLastEdited` ON `note_revisions` (`utcDateLastEdited`);
 CREATE INDEX `IDX_note_revisions_dateCreated` ON `note_revisions` (`dateCreated`);
 CREATE INDEX `IDX_note_revisions_dateLastEdited` ON `note_revisions` (`dateLastEdited`);
-CREATE TABLE IF NOT EXISTS "note_contents" (
-                                               `noteId`	TEXT NOT NULL,
-                                               `content`	TEXT NULL DEFAULT NULL,
-                                               `hash` TEXT DEFAULT "" NOT NULL,
-                                               `dateModified` TEXT NOT NULL,
-                                               `utcDateModified` TEXT NOT NULL,
-                                               PRIMARY KEY(`noteId`)
+CREATE INDEX IDX_attributes_name_value
+    on attributes (name, value);
+CREATE INDEX IDX_attributes_noteId_index
+    on attributes (noteId);
+CREATE INDEX IDX_attributes_value_index
+    on attributes (value);
+CREATE TABLE IF NOT EXISTS "recent_notes"
+(
+    noteId TEXT not null primary key,
+    notePath TEXT not null,
+    utcDateCreated TEXT not null
 );

docs/backend_api/ApiToken.html

@@ -293,7 +293,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/Attribute.html

@@ -106,7 +106,7 @@
 
             
 
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
         </tr>
 
     
@@ -129,7 +129,7 @@
 
             
 
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
         </tr>
 
     
@@ -152,7 +152,7 @@
 
             
 
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
         </tr>
 
     
@@ -175,7 +175,7 @@
 
             
 
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
         </tr>
 
     
@@ -244,7 +244,7 @@
 
             
 
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
         </tr>
 
     
@@ -298,29 +298,6 @@
 
     
 
-        <tr>
-            
-                <td class="name"><code>utcDateCreated</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-
-            
-
-            <td class="description last"></td>
-        </tr>
-
-    
-
         <tr>
             
                 <td class="name"><code>utcDateModified</code></td>
@@ -378,7 +355,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line30">line 30</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line25">line 25</a>
     </li></ul></dd>
     
 
@@ -445,7 +422,7 @@
     
 
     
-    <h4 class="name" id="getNote"><span class="type-signature">(async) </span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -493,7 +470,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line47">line 47</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line43">line 43</a>
     </li></ul></dd>
     
 
@@ -529,7 +506,10 @@
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -547,7 +527,7 @@
     
 
     
-    <h4 class="name" id="getTargetNote"><span class="type-signature">(async) </span>getTargetNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getTargetNote"><span class="type-signature"></span>getTargetNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -595,7 +575,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line54">line 54</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line50">line 50</a>
     </li></ul></dd>
     
 
@@ -631,7 +611,10 @@
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -697,7 +680,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line69">line 69</a>
+        <a href="entities_attribute.js.html">entities/attribute.js</a>, <a href="entities_attribute.js.html#line65">line 65</a>
     </li></ul></dd>
     
 
@@ -767,7 +750,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/BackendScriptApi.html

@@ -471,7 +471,7 @@
     
 
     
-    <h4 class="name" id="createDataNote"><span class="type-signature"></span>createDataNote<span class="signature">(parentNoteId, title, content)</span><span class="type-signature"> &rarr; {Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}>}</span></h4>
+    <h4 class="name" id="createDataNote"><span class="type-signature"></span>createDataNote<span class="signature">(parentNoteId, title, content)</span><span class="type-signature"> &rarr; {Object}</span></h4>
     
 
     
@@ -619,7 +619,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line204">line 204</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line207">line 207</a>
     </li></ul></dd>
     
 
@@ -655,7 +655,7 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}></span>
+<span class="param-type">Object</span>
 
 
     </dd>
@@ -673,7 +673,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="createNewNote"><span class="type-signature"></span>createNewNote<span class="signature">(params<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}>}</span></h4>
+    <h4 class="name" id="createNewNote"><span class="type-signature"></span>createNewNote<span class="signature">(params<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Object}</span></h4>
     
 
     
@@ -782,7 +782,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line231">line 231</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line234">line 234</a>
     </li></ul></dd>
     
 
@@ -822,7 +822,7 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}></span>
+<span class="param-type">Object</span>
 
 
     </dd>
@@ -840,7 +840,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="createNote"><span class="type-signature"></span>createNote<span class="signature">(parentNoteId, title, content<span class="signature-attributes">opt</span>, extraOptions<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}>}</span></h4>
+    <h4 class="name" id="createNote"><span class="type-signature"></span>createNote<span class="signature">(parentNoteId, title, content<span class="signature-attributes">opt</span>, extraOptions<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Object}</span></h4>
     
 
     
@@ -1054,7 +1054,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-        <dt class="important tag-deprecated">Deprecated:</dt><dd><ul class="dummy"><li>please use createNote() API method instead</li></ul></dd>
+        <dt class="important tag-deprecated">Deprecated:</dt><dd><ul class="dummy"><li>please use createTextNote() with similar API for simpler use cases or createNewNote() for more complex needs</li></ul></dd>
     
 
     
@@ -1068,7 +1068,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line259">line 259</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line262">line 262</a>
     </li></ul></dd>
     
 
@@ -1108,7 +1108,7 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}></span>
+<span class="param-type">Object</span>
 
 
     </dd>
@@ -1126,7 +1126,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="createTextNote"><span class="type-signature"></span>createTextNote<span class="signature">(parentNoteId, title, content)</span><span class="type-signature"> &rarr; {Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}>}</span></h4>
+    <h4 class="name" id="createTextNote"><span class="type-signature"></span>createTextNote<span class="signature">(parentNoteId, title, content)</span><span class="type-signature"> &rarr; {Object}</span></h4>
     
 
     
@@ -1273,7 +1273,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line188">line 188</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line191">line 191</a>
     </li></ul></dd>
     
 
@@ -1309,7 +1309,7 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;{note: <a href="Note.html">Note</a>, branch: <a href="Branch.html">Branch</a>}></span>
+<span class="param-type">Object</span>
 
 
     </dd>
@@ -1327,7 +1327,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="ensureNoteIsAbsentFromParent"><span class="type-signature"></span>ensureNoteIsAbsentFromParent<span class="signature">(noteId, parentNoteId)</span><span class="type-signature"> &rarr; {Promise.&lt;void>}</span></h4>
+    <h4 class="name" id="ensureNoteIsAbsentFromParent"><span class="type-signature"></span>ensureNoteIsAbsentFromParent<span class="signature">(noteId, parentNoteId)</span><span class="type-signature"> &rarr; {void}</span></h4>
     
 
     
@@ -1451,7 +1451,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line159">line 159</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line162">line 162</a>
     </li></ul></dd>
     
 
@@ -1487,7 +1487,7 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;void></span>
+<span class="param-type">void</span>
 
 
     </dd>
@@ -1505,7 +1505,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="ensureNoteIsPresentInParent"><span class="type-signature"></span>ensureNoteIsPresentInParent<span class="signature">(noteId, parentNoteId, prefix)</span><span class="type-signature"> &rarr; {Promise.&lt;void>}</span></h4>
+    <h4 class="name" id="ensureNoteIsPresentInParent"><span class="type-signature"></span>ensureNoteIsPresentInParent<span class="signature">(noteId, parentNoteId, prefix)</span><span class="type-signature"> &rarr; {void}</span></h4>
     
 
     
@@ -1652,7 +1652,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line149">line 149</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line152">line 152</a>
     </li></ul></dd>
     
 
@@ -1688,7 +1688,7 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;void></span>
+<span class="param-type">void</span>
 
 
     </dd>
@@ -1754,7 +1754,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line398">line 398</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line399">line 399</a>
     </li></ul></dd>
     
 
@@ -1815,7 +1815,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="getAttribute"><span class="type-signature"></span>getAttribute<span class="signature">(attributeId)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Attribute.html">Attribute</a>|null)>}</span></h4>
+    <h4 class="name" id="getAttribute"><span class="type-signature"></span>getAttribute<span class="signature">(attributeId)</span><span class="type-signature"> &rarr; {<a href="Attribute.html">Attribute</a>|null}</span></h4>
     
 
     
@@ -1948,7 +1948,10 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Attribute.html">Attribute</a>|null)></span>
+<span class="param-type"><a href="Attribute.html">Attribute</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -1966,7 +1969,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="getBranch"><span class="type-signature"></span>getBranch<span class="signature">(branchId)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Branch.html">Branch</a>|null)>}</span></h4>
+    <h4 class="name" id="getBranch"><span class="type-signature"></span>getBranch<span class="signature">(branchId)</span><span class="type-signature"> &rarr; {<a href="Branch.html">Branch</a>|null}</span></h4>
     
 
     
@@ -2099,7 +2102,10 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Branch.html">Branch</a>|null)></span>
+<span class="param-type"><a href="Branch.html">Branch</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -2117,7 +2123,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="getDateNote"><span class="type-signature"></span>getDateNote<span class="signature">(date)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getDateNote"><span class="type-signature"></span>getDateNote<span class="signature">(date)</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -2218,7 +2224,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line315">line 315</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line320">line 320</a>
     </li></ul></dd>
     
 
@@ -2254,7 +2260,10 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -2272,7 +2281,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="getEntities"><span class="type-signature"></span>getEntities<span class="signature">(SQL, array)</span><span class="type-signature"> &rarr; {Promise.&lt;Array.&lt;<a href="Entity.html">Entity</a>>>}</span></h4>
+    <h4 class="name" id="getEntities"><span class="type-signature"></span>getEntities<span class="signature">(SQL, array)</span><span class="type-signature"> &rarr; {Array.&lt;<a href="Entity.html">Entity</a>>}</span></h4>
     
 
     
@@ -2392,7 +2401,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line94">line 94</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line87">line 87</a>
     </li></ul></dd>
     
 
@@ -2428,7 +2437,7 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;Array.&lt;<a href="Entity.html">Entity</a>>></span>
+<span class="param-type">Array.&lt;<a href="Entity.html">Entity</a>></span>
 
 
     </dd>
@@ -2446,7 +2455,7 @@ JSON MIME type. See also createNewNote() for more options.
     
 
     
-    <h4 class="name" id="getEntity"><span class="type-signature"></span>getEntity<span class="signature">(SQL, array)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Entity.html">Entity</a>|null)>}</span></h4>
+    <h4 class="name" id="getEntity"><span class="type-signature"></span>getEntity<span class="signature">(SQL, array)</span><span class="type-signature"> &rarr; {<a href="Entity.html">Entity</a>|null}</span></h4>
     
 
     
@@ -2570,7 +2579,7 @@ JSON MIME type. See also createNewNote() for more options.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line86">line 86</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line79">line 79</a>
     </li></ul></dd>
     
 
@@ -2606,158 +2615,10 @@ JSON MIME type. See also createNewNote() for more options.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Entity.html">Entity</a>|null)></span>
+<span class="param-type"><a href="Entity.html">Entity</a></span>
+|
 
-
-    </dd>
-</dl>
-
-    
-
-
-
-
-
-        
-            
-
-    
-
-    
-    <h4 class="name" id="getImage"><span class="type-signature"></span>getImage<span class="signature">(imageId)</span><span class="type-signature"> &rarr; {Promise.&lt;(Image|null)>}</span></h4>
-    
-
-    
-
-
-
-
-
-
-
-
-
-
-
-    <h5>Parameters:</h5>
-    
-
-<table class="params">
-    <thead>
-    <tr>
-        
-        <th>Name</th>
-        
-
-        <th>Type</th>
-
-        
-
-        
-
-        <th class="last">Description</th>
-    </tr>
-    </thead>
-
-    <tbody>
-    
-
-        <tr>
-            
-                <td class="name"><code>imageId</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">string</span>
-
-
-            
-            </td>
-
-            
-
-            
-
-            <td class="description last"></td>
-        </tr>
-
-    
-    </tbody>
-</table>
-
-
-
-
-
-
-<dl class="details">
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-    <dt class="tag-source">Source:</dt>
-    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line76">line 76</a>
-    </li></ul></dd>
-    
-
-    
-
-    
-
-    
-</dl>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h5>Returns:</h5>
-
-        
-
-
-<dl>
-    <dt>
-        Type
-    </dt>
-    <dd>
-        
-<span class="param-type">Promise.&lt;(Image|null)></span>
+<span class="param-type">null</span>
 
 
     </dd>
@@ -2885,7 +2746,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="getMonthNote"><span class="type-signature"></span>getMonthNote<span class="signature">(date)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getMonthNote"><span class="type-signature"></span>getMonthNote<span class="signature">(date)</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -2986,7 +2847,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line342">line 342</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line347">line 347</a>
     </li></ul></dd>
     
 
@@ -3022,7 +2883,10 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -3040,7 +2904,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">(noteId)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">(noteId)</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -3173,7 +3037,10 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -3191,7 +3058,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="getNotesWithLabel"><span class="type-signature"></span>getNotesWithLabel<span class="signature">(name, value<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Promise.&lt;Array.&lt;<a href="Note.html">Note</a>>>}</span></h4>
+    <h4 class="name" id="getNotesWithLabel"><span class="type-signature"></span>getNotesWithLabel<span class="signature">(name, value<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Array.&lt;<a href="Note.html">Note</a>>}</span></h4>
     
 
     
@@ -3335,7 +3202,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line128">line 128</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line131">line 131</a>
     </li></ul></dd>
     
 
@@ -3371,7 +3238,7 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;Array.&lt;<a href="Note.html">Note</a>>></span>
+<span class="param-type">Array.&lt;<a href="Note.html">Note</a>></span>
 
 
     </dd>
@@ -3389,7 +3256,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="getNoteWithLabel"><span class="type-signature"></span>getNoteWithLabel<span class="signature">(name, value<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getNoteWithLabel"><span class="type-signature"></span>getNoteWithLabel<span class="signature">(name, value<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -3533,7 +3400,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line138">line 138</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line141">line 141</a>
     </li></ul></dd>
     
 
@@ -3569,7 +3436,10 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -3587,7 +3457,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="getRootCalendarNote"><span class="type-signature"></span>getRootCalendarNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getRootCalendarNote"><span class="type-signature"></span>getRootCalendarNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -3639,7 +3509,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line306">line 306</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line311">line 311</a>
     </li></ul></dd>
     
 
@@ -3675,7 +3545,10 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -3693,7 +3566,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="getTodayNote"><span class="type-signature"></span>getTodayNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getTodayNote"><span class="type-signature"></span>getTodayNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -3745,7 +3618,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line323">line 323</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line328">line 328</a>
     </li></ul></dd>
     
 
@@ -3781,7 +3654,10 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -3799,7 +3675,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="getWeekNote"><span class="type-signature"></span>getWeekNote<span class="signature">(date, options)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getWeekNote"><span class="type-signature"></span>getWeekNote<span class="signature">(date, options)</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -3923,7 +3799,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line333">line 333</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line338">line 338</a>
     </li></ul></dd>
     
 
@@ -3959,7 +3835,10 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -3977,7 +3856,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="getYearNote"><span class="type-signature"></span>getYearNote<span class="signature">(year)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getYearNote"><span class="type-signature"></span>getYearNote<span class="signature">(year)</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -4078,7 +3957,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line351">line 351</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line356">line 356</a>
     </li></ul></dd>
     
 
@@ -4114,7 +3993,10 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -4228,7 +4110,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line298">line 298</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line303">line 303</a>
     </li></ul></dd>
     
 
@@ -4314,7 +4196,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line393">line 393</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line394">line 394</a>
     </li></ul></dd>
     
 
@@ -4350,7 +4232,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="searchForNote"><span class="type-signature"></span>searchForNote<span class="signature">(searchString)</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="searchForNote"><span class="type-signature"></span>searchForNote<span class="signature">(searchString)</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -4359,7 +4241,7 @@ if some action needs to happen on only one specific instance.
 
 <div class="description">
     This is a powerful search method - you can search by attributes and their values, e.g.:
-"@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
+"#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
 </div>
 
 
@@ -4452,7 +4334,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line114">line 114</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line117">line 117</a>
     </li></ul></dd>
     
 
@@ -4488,7 +4370,10 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -4506,7 +4391,7 @@ if some action needs to happen on only one specific instance.
     
 
     
-    <h4 class="name" id="searchForNotes"><span class="type-signature"></span>searchForNotes<span class="signature">(searchString)</span><span class="type-signature"> &rarr; {Promise.&lt;Array.&lt;<a href="Note.html">Note</a>>>}</span></h4>
+    <h4 class="name" id="searchForNotes"><span class="type-signature"></span>searchForNotes<span class="signature">(query, searchParams<span class="signature-attributes">opt</span>)</span><span class="type-signature"> &rarr; {Array.&lt;<a href="Note.html">Note</a>>}</span></h4>
     
 
     
@@ -4515,7 +4400,7 @@ if some action needs to happen on only one specific instance.
 
 <div class="description">
     This is a powerful search method - you can search by attributes and their values, e.g.:
-"@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
+"#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
 </div>
 
 
@@ -4539,6 +4424,8 @@ if some action needs to happen on only one specific instance.
         <th>Type</th>
 
         
+        <th>Attributes</th>
+        
 
         
 
@@ -4551,7 +4438,7 @@ if some action needs to happen on only one specific instance.
 
         <tr>
             
-                <td class="name"><code>searchString</code></td>
+                <td class="name"><code>query</code></td>
             
 
             <td class="type">
@@ -4564,6 +4451,47 @@ if some action needs to happen on only one specific instance.
             </td>
 
             
+                <td class="attributes">
+                
+
+                
+
+                
+                </td>
+            
+
+            
+
+            <td class="description last"></td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>searchParams</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">Object</span>
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
 
             
 
@@ -4608,7 +4536,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line104">line 104</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line98">line 98</a>
     </li></ul></dd>
     
 
@@ -4644,7 +4572,7 @@ if some action needs to happen on only one specific instance.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;Array.&lt;<a href="Note.html">Note</a>>></span>
+<span class="param-type">Array.&lt;<a href="Note.html">Note</a>></span>
 
 
     </dd>
@@ -4817,7 +4745,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line372">line 372</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line376">line 376</a>
     </li></ul></dd>
     
 
@@ -4950,7 +4878,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line358">line 358</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line362">line 362</a>
     </li></ul></dd>
     
 
@@ -4975,16 +4903,6 @@ This method looks similar to toggleNoteInParent() but differs because we're look
 
 
 
-<h5>Returns:</h5>
-
-        
-<div class="param-desc">
-    Promise<void>
-</div>
-
-
-
-    
 
 
 
@@ -4996,7 +4914,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
     
 
     
-    <h4 class="name" id="toggleNoteInParent"><span class="type-signature"></span>toggleNoteInParent<span class="signature">(present, noteId, parentNoteId, prefix)</span><span class="type-signature"> &rarr; {Promise.&lt;void>}</span></h4>
+    <h4 class="name" id="toggleNoteInParent"><span class="type-signature"></span>toggleNoteInParent<span class="signature">(present, noteId, parentNoteId, prefix)</span><span class="type-signature"> &rarr; {void}</span></h4>
     
 
     
@@ -5166,7 +5084,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line171">line 171</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line174">line 174</a>
     </li></ul></dd>
     
 
@@ -5202,7 +5120,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;void></span>
+<span class="param-type">void</span>
 
 
     </dd>
@@ -5220,7 +5138,7 @@ This method looks similar to toggleNoteInParent() but differs because we're look
     
 
     
-    <h4 class="name" id="transactional"><span class="type-signature"></span>transactional<span class="signature">(func)</span><span class="type-signature"> &rarr; {Promise.&lt;?>}</span></h4>
+    <h4 class="name" id="transactional"><span class="type-signature"></span>transactional<span class="signature">(func)</span><span class="type-signature"> &rarr; {?}</span></h4>
     
 
     
@@ -5230,9 +5148,6 @@ This method looks similar to toggleNoteInParent() but differs because we're look
 <div class="description">
     This functions wraps code which is supposed to be running in transaction. If transaction already
 exists, then we'll use that transaction.
-
-This method is required only when script has label manualTransactionHandling, all other scripts are
-transactional by default.
 </div>
 
 
@@ -5325,7 +5240,7 @@ transactional by default.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line385">line 385</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line386">line 386</a>
     </li></ul></dd>
     
 
@@ -5365,7 +5280,7 @@ transactional by default.
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;?></span>
+<span class="param-type">?</span>
 
 
     </dd>
@@ -5399,7 +5314,7 @@ transactional by default.
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/Branch.html

@@ -107,7 +107,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 
             
 
-            <td class="description last">primary key</td>
+            <td class="description last">primary key, immutable</td>
         </tr>
 
     
@@ -130,7 +130,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 
             
 
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
         </tr>
 
     
@@ -153,7 +153,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 
             
 
-            <td class="description last"></td>
+            <td class="description last">immutable</td>
         </tr>
 
     
@@ -356,7 +356,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line25">line 25</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line24">line 24</a>
     </li></ul></dd>
     
 
@@ -423,7 +423,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     
 
     
-    <h4 class="name" id="getNote"><span class="type-signature">(async) </span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getNote"><span class="type-signature"></span>getNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -471,7 +471,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line32">line 32</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line31">line 31</a>
     </li></ul></dd>
     
 
@@ -507,7 +507,10 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -525,7 +528,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     
 
     
-    <h4 class="name" id="getParentNote"><span class="type-signature">(async) </span>getParentNote<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;(<a href="Note.html">Note</a>|null)>}</span></h4>
+    <h4 class="name" id="getParentNote"><span class="type-signature"></span>getParentNote<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="Note.html">Note</a>|null}</span></h4>
     
 
     
@@ -573,7 +576,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line37">line 37</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line36">line 36</a>
     </li></ul></dd>
     
 
@@ -609,7 +612,10 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;(<a href="Note.html">Note</a>|null)></span>
+<span class="param-type"><a href="Note.html">Note</a></span>
+|
+
+<span class="param-type">null</span>
 
 
     </dd>
@@ -643,7 +649,7 @@ Each note can have multiple (at least one) branches, meaning it can be placed in
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/Entity.html

@@ -150,7 +150,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_entity.js.html">entities/entity.js</a>, <a href="entities_entity.js.html#line9">line 9</a>
+        <a href="entities_entity.js.html">entities/entity.js</a>, <a href="entities_entity.js.html#line10">line 10</a>
     </li></ul></dd>
     
 
@@ -218,7 +218,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/NoteRevision.html

@@ -198,52 +198,6 @@
 
             
 
-            <td class="description last"></td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>contentLength</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">int</span>
-
-
-            
-            </td>
-
-            
-
-            
-
-            <td class="description last"></td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>isErased</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">boolean</span>
-
-
-            
-            </td>
-
-            
-
-            
-
             <td class="description last"></td>
         </tr>
 
@@ -421,7 +375,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line35">line 35</a>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line27">line 27</a>
     </li></ul></dd>
     
 
@@ -488,7 +442,7 @@
     
 
     
-    <h4 class="name" id="getContent"><span class="type-signature">(async) </span>getContent<span class="signature">()</span><span class="type-signature"> &rarr; {Promise.&lt;*>}</span></h4>
+    <h4 class="name" id="getContent"><span class="type-signature"></span>getContent<span class="signature">()</span><span class="type-signature"> &rarr; {*}</span></h4>
     
 
     
@@ -536,7 +490,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line69">line 69</a>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line66">line 66</a>
     </li></ul></dd>
     
 
@@ -572,7 +526,7 @@
     </dt>
     <dd>
         
-<span class="param-type">Promise.&lt;*></span>
+<span class="param-type">*</span>
 
 
     </dd>
@@ -638,7 +592,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line55">line 55</a>
+        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line52">line 52</a>
     </li></ul></dd>
     
 
@@ -691,108 +645,6 @@
 
 
         
-            
-
-    
-
-    
-    <h4 class="name" id="setContent"><span class="type-signature">(async) </span>setContent<span class="signature">()</span><span class="type-signature"> &rarr; {Promise}</span></h4>
-    
-
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<dl class="details">
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-
-    
-    <dt class="tag-source">Source:</dt>
-    <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_revision.js.html">entities/note_revision.js</a>, <a href="entities_note_revision.js.html#line105">line 105</a>
-    </li></ul></dd>
-    
-
-    
-
-    
-
-    
-</dl>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<h5>Returns:</h5>
-
-        
-
-
-<dl>
-    <dt>
-        Type
-    </dt>
-    <dd>
-        
-<span class="param-type">Promise</span>
-
-
-    </dd>
-</dl>
-
-    
-
-
-
-
-
-        
     
 
     
@@ -814,7 +666,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/Option.html

@@ -237,7 +237,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_option.js.html">entities/option.js</a>, <a href="entities_option.js.html#line22">line 22</a>
+        <a href="entities_option.js.html">entities/option.js</a>, <a href="entities_option.js.html#line17">line 17</a>
     </li></ul></dd>
     
 
@@ -316,7 +316,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/RecentNote.html

@@ -136,30 +136,7 @@
 
         <tr>
             
-                <td class="name"><code>isDeleted</code></td>
-            
-
-            <td class="type">
-            
-                
-<span class="param-type">boolean</span>
-
-
-            
-            </td>
-
-            
-
-            
-
-            <td class="description last"></td>
-        </tr>
-
-    
-
-        <tr>
-            
-                <td class="name"><code>utcDateModified</code></td>
+                <td class="name"><code>utcDateCreated</code></td>
             
 
             <td class="type">
@@ -214,7 +191,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_recent_note.js.html">entities/recent_note.js</a>, <a href="entities_recent_note.js.html#line16">line 16</a>
+        <a href="entities_recent_note.js.html">entities/recent_note.js</a>, <a href="entities_recent_note.js.html#line15">line 15</a>
     </li></ul></dd>
     
 
@@ -293,7 +270,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_api_token.js.html

@@ -75,7 +75,7 @@ module.exports = ApiToken;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_attribute.js.html

@@ -28,24 +28,24 @@
         <article>
             <pre class="prettyprint source linenums"><code>"use strict";
 
+
 const Entity = require('./entity');
-const repository = require('../services/repository');
 const dateUtils = require('../services/date_utils');
 const sql = require('../services/sql');
+const promotedAttributeDefinitionParser = require("../services/promoted_attribute_definition_parser");
 
 /**
  * Attribute is key value pair owned by a note.
  *
- * @property {string} attributeId
- * @property {string} noteId
- * @property {string} type
- * @property {string} name
+ * @property {string} attributeId - immutable
+ * @property {string} noteId - immutable
+ * @property {string} type - immutable
+ * @property {string} name - immutable
  * @property {string} value
  * @property {int} position
- * @property {boolean} isInheritable
+ * @property {boolean} isInheritable - immutable
  * @property {boolean} isDeleted
  * @property {string|null} deleteId - ID identifying delete transaction
- * @property {string} utcDateCreated
  * @property {string} utcDateModified
  *
  * @extends Entity
@@ -53,33 +53,29 @@ const sql = require('../services/sql');
 class Attribute extends Entity {
     static get entityName() { return "attributes"; }
     static get primaryKeyName() { return "attributeId"; }
-    static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "isDeleted", "utcDateCreated"]; }
+    static get hashedProperties() { return ["attributeId", "noteId", "type", "name", "value", "isInheritable", "isDeleted"]; }
 
     constructor(row) {
         super(row);
 
         this.isInheritable = !!this.isInheritable;
+    }
 
-        if (this.isDefinition()) {
-            try {
-                this.value = JSON.parse(this.value);
-            }
-            catch (e) {
-            }
-        }
+    isAutoLink() {
+        return this.type === 'relation' &amp;&amp; ['internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink'].includes(this.name);
     }
 
     /**
-     * @returns {Promise&lt;Note|null>}
+     * @returns {Note|null}
      */
-    async getNote() {
-        return await repository.getNote(this.noteId);
+    getNote() {
+        return this.repository.getNote(this.noteId);
     }
 
     /**
-     * @returns {Promise&lt;Note|null>}
+     * @returns {Note|null}
      */
-    async getTargetNote() {
+    getTargetNote() {
         if (this.type !== 'relation') {
             throw new Error(`Attribute ${this.attributeId} is not relation`);
         }
@@ -88,17 +84,31 @@ class Attribute extends Entity {
             return null;
         }
 
-        return await repository.getNote(this.value);
+        return this.repository.getNote(this.value);
     }
 
     /**
      * @return {boolean}
      */
     isDefinition() {
-        return this.type === 'label-definition' || this.type === 'relation-definition';
+        return this.type === 'label' &amp;&amp; (this.name.startsWith('label:') || this.name.startsWith('relation:'));
     }
 
-    async beforeSaving() {
+    getDefinition() {
+        return promotedAttributeDefinitionParser.parse(this.value);
+    }
+
+    getDefinedName() {
+        if (this.type === 'label' &amp;&amp; this.name.startsWith('label:')) {
+            return this.name.substr(6);
+        } else if (this.type === 'label' &amp;&amp; this.name.startsWith('relation:')) {
+            return this.name.substr(9);
+        } else {
+            return this.name;
+        }
+    }
+
+    beforeSaving() {
         if (!this.value) {
             if (this.type === 'relation') {
                 throw new Error(`Cannot save relation ${this.name} since it does not target any note.`);
@@ -109,7 +119,7 @@ class Attribute extends Entity {
         }
 
         if (this.position === undefined) {
-            this.position = 1 + await sql.getValue(`SELECT COALESCE(MAX(position), 0) FROM attributes WHERE noteId = ?`, [this.noteId]);
+            this.position = 1 + sql.getValue(`SELECT COALESCE(MAX(position), 0) FROM attributes WHERE noteId = ?`, [this.noteId]);
         }
 
         if (!this.isInheritable) {
@@ -120,39 +130,27 @@ class Attribute extends Entity {
             this.isDeleted = false;
         }
 
-        if (!this.utcDateCreated) {
-            this.utcDateCreated = dateUtils.utcNowDateTime();
-        }
-
         super.beforeSaving();
 
-        if (this.isChanged) {
-            this.utcDateModified = dateUtils.utcNowDateTime();
-        }
+        this.utcDateModified = dateUtils.utcNowDateTime();
     }
 
-    // cannot be static!
-    updatePojo(pojo) {
-        delete pojo.isOwned;
-        delete pojo.__note;
-    }
-
-    createClone(type, name, value) {
+    createClone(type, name, value, isInheritable) {
         return new Attribute({
             noteId: this.noteId,
             type: type,
             name: name,
             value: value,
             position: this.position,
-            isInheritable: this.isInheritable,
+            isInheritable: isInheritable,
             isDeleted: false,
-            utcDateCreated: this.utcDateCreated,
             utcDateModified: this.utcDateModified
         });
     }
 }
 
-module.exports = Attribute;</code></pre>
+module.exports = Attribute;
+</code></pre>
         </article>
     </section>
 
@@ -168,7 +166,7 @@ module.exports = Attribute;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_branch.js.html

@@ -30,16 +30,15 @@
 
 const Entity = require('./entity');
 const dateUtils = require('../services/date_utils');
-const repository = require('../services/repository');
 const sql = require('../services/sql');
 
 /**
  * Branch represents note's placement in the tree - it's essentially pair of noteId and parentNoteId.
  * Each note can have multiple (at least one) branches, meaning it can be placed into multiple places in the tree.
  *
- * @property {string} branchId - primary key
- * @property {string} noteId
- * @property {string} parentNoteId
+ * @property {string} branchId - primary key, immutable
+ * @property {string} noteId - immutable
+ * @property {string} parentNoteId - immutable
  * @property {int} notePosition
  * @property {string} prefix
  * @property {boolean} isExpanded
@@ -56,19 +55,19 @@ class Branch extends Entity {
     // notePosition is not part of hash because it would produce a lot of updates in case of reordering
     static get hashedProperties() { return ["branchId", "noteId", "parentNoteId", "isDeleted", "deleteId", "prefix"]; }
 
-    /** @returns {Promise<Note|null>} */
-    async getNote() {
-        return await repository.getNote(this.noteId);
+    /** @returns {Note|null} */
+    getNote() {
+        return this.repository.getNote(this.noteId);
     }
 
-    /** @returns {Promise<Note|null>} */
-    async getParentNote() {
-        return await repository.getNote(this.parentNoteId);
+    /** @returns {Note|null} */
+    getParentNote() {
+        return this.repository.getNote(this.parentNoteId);
     }
 
-    async beforeSaving() {
-        if (this.notePosition === undefined) {
-            const maxNotePos = await sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [this.parentNoteId]);
+    beforeSaving() {
+        if (this.notePosition === undefined || this.notePosition === null) {
+            const maxNotePos = sql.getValue('SELECT MAX(notePosition) FROM branches WHERE parentNoteId = ? AND isDeleted = 0', [this.parentNoteId]);
             this.notePosition = maxNotePos === null ? 0 : maxNotePos + 10;
         }
 
@@ -86,9 +85,7 @@ class Branch extends Entity {
 
         super.beforeSaving();
 
-        if (this.isChanged) {
-            this.utcDateModified = dateUtils.utcNowDateTime();
-        }
+        this.utcDateModified = dateUtils.utcNowDateTime();
     }
 
     createClone(parentNoteId, notePosition) {
@@ -105,7 +102,8 @@ class Branch extends Entity {
     }
 }
 
-module.exports = Branch;</code></pre>
+module.exports = Branch;
+</code></pre>
         </article>
     </section>
 
@@ -121,7 +119,7 @@ module.exports = Branch;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_entity.js.html

@@ -29,6 +29,7 @@
             <pre class="prettyprint source linenums"><code>"use strict";
 
 const utils = require('../services/utils');
+let repo = null;
 
 class Entity {
     /**
@@ -42,25 +43,13 @@ class Entity {
             }
         }
 
-        if ('isDeleted' in this) {
+        if ('isDeleted' in this &amp;&amp; this.constructor.entityName !== 'recent_notes') {
             this.isDeleted = !!this.isDeleted;
         }
     }
 
     beforeSaving() {
         this.generateIdIfNecessary();
-
-        const origHash = this.hash;
-
-        this.hash = this.generateHash();
-
-        if (this.forcedChange) {
-            this.isChanged = true;
-            delete this.forcedChange;
-        }
-        else {
-            this.isChanged = origHash !== this.hash;
-        }
     }
 
     generateIdIfNecessary() {
@@ -79,14 +68,27 @@ class Entity {
         return utils.hash(contentToHash).substr(0, 10);
     }
 
-    async save() {
-        await require('../services/repository').updateEntity(this);
+    getUtcDateChanged() {
+        return this.utcDateModified;
+    }
+
+    get repository() {
+        if (!repo) {
+            repo = require('../services/repository');
+        }
+
+        return repo;
+    }
+
+    save() {
+        this.repository.updateEntity(this);
 
         return this;
     }
 }
 
-module.exports = Entity;</code></pre>
+module.exports = Entity;
+</code></pre>
         </article>
     </section>
 
@@ -102,7 +104,7 @@ module.exports = Entity;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_note.js.html

@@ -31,16 +31,13 @@
 const Entity = require('./entity');
 const Attribute = require('./attribute');
 const protectedSessionService = require('../services/protected_session');
-const repository = require('../services/repository');
 const sql = require('../services/sql');
 const utils = require('../services/utils');
 const dateUtils = require('../services/date_utils');
-const syncTableService = require('../services/sync_table');
+const entityChangesService = require('../services/entity_changes.js');
 
 const LABEL = 'label';
-const LABEL_DEFINITION = 'label-definition';
 const RELATION = 'relation';
-const RELATION_DEFINITION = 'relation-definition';
 
 /**
  * This represents a Note which is a central object in the Trilium Notes project.
@@ -49,11 +46,9 @@ const RELATION_DEFINITION = 'relation-definition';
  * @property {string} type - one of "text", "code", "file" or "render"
  * @property {string} mime - MIME type, e.g. "text/html"
  * @property {string} title - note title
- * @property {int} contentLength - length of content
  * @property {boolean} isProtected - true if note is protected
  * @property {boolean} isDeleted - true if note is deleted
  * @property {string|null} deleteId - ID identifying delete transaction
- * @property {boolean} isErased - true if note's content is erased after it has been deleted
  * @property {string} dateCreated - local date time (with offset)
  * @property {string} dateModified - local date time (with offset)
  * @property {string} utcDateCreated
@@ -95,16 +90,16 @@ class Note extends Entity {
      * part of Note entity with it's own sync. Reasons behind this hybrid design has been:
      *
      * - content can be quite large and it's not necessary to load it / fill memory for any note access even if we don't need a content, especially for bulk operations like search
-     * - changes in the note metadata or title should not trigger note content sync (so we keep separate utcDateModified and sync rows)
+     * - changes in the note metadata or title should not trigger note content sync (so we keep separate utcDateModified and entity changes records)
      * - but to the user note content and title changes are one and the same - single dateModified (so all changes must go through Note and content is not a separate entity)
      */
 
-    /** @returns {Promise<*>} */
-    async getContent(silentNotFoundError = false) {
+    /** @returns {*} */
+    getContent(silentNotFoundError = false) {
         if (this.content === undefined) {
-            const res = await sql.getRow(`SELECT content, hash FROM note_contents WHERE noteId = ?`, [this.noteId]);
+            const row = sql.getRow(`SELECT content FROM note_contents WHERE noteId = ?`, [this.noteId]);
 
-            if (!res) {
+            if (!row) {
                 if (silentNotFoundError) {
                     return undefined;
                 }
@@ -113,7 +108,7 @@ class Note extends Entity {
                 }
             }
 
-            this.content = res.content;
+            this.content = row.content;
 
             if (this.isProtected) {
                 if (this.isContentAvailable) {
@@ -135,9 +130,20 @@ class Note extends Entity {
         }
     }
 
-    /** @returns {Promise<*>} */
-    async getJsonContent() {
-        const content = await this.getContent();
+    /** @returns {{contentLength, dateModified, utcDateModified}} */
+    getContentMetadata() {
+        return sql.getRow(`
+            SELECT 
+                LENGTH(content) AS contentLength, 
+                dateModified,
+                utcDateModified 
+            FROM note_contents 
+            WHERE noteId = ?`, [this.noteId]);
+    }
+
+    /** @returns {*} */
+    getJsonContent() {
+        const content = this.getContent();
 
         if (!content || !content.trim()) {
             return null;
@@ -146,26 +152,25 @@ class Note extends Entity {
         return JSON.parse(content);
     }
 
-    /** @returns {Promise} */
-    async setContent(content) {
+    setContent(content) {
         if (content === null || content === undefined) {
             throw new Error(`Cannot set null content to note ${this.noteId}`);
         }
 
-        content = Buffer.isBuffer(content) ? content : Buffer.from(content);
-
-        // force updating note itself so that dateModified is represented correctly even for the content
-        this.forcedChange = true;
-        this.contentLength = content.byteLength;
-        await this.save();
+        if (this.isStringNote()) {
+            content = content.toString();
+        }
+        else {
+            content = Buffer.isBuffer(content) ? content : Buffer.from(content);
+        }
 
         this.content = content;
 
         const pojo = {
             noteId: this.noteId,
             content: content,
-            utcDateModified: dateUtils.utcNowDateTime(),
-            hash: utils.hash(this.noteId + "|" + content.toString())
+            dateModified: dateUtils.localNowDateTime(),
+            utcDateModified: dateUtils.utcNowDateTime()
         };
 
         if (this.isProtected) {
@@ -177,14 +182,21 @@ class Note extends Entity {
             }
         }
 
-        await sql.upsert("note_contents", "noteId", pojo);
+        sql.upsert("note_contents", "noteId", pojo);
 
-        await syncTableService.addNoteContentSync(this.noteId);
+        const hash = utils.hash(this.noteId + "|" + content.toString());
+
+        entityChangesService.addEntityChange({
+            entityName: 'note_contents',
+            entityId: this.noteId,
+            hash: hash,
+            isErased: false,
+            utcDateChanged: this.getUtcDateChanged()
+        }, null);
     }
 
-    /** @returns {Promise} */
-    async setJsonContent(content) {
-        await this.setContent(JSON.stringify(content, null, '\t'));
+    setJsonContent(content) {
+        this.setContent(JSON.stringify(content, null, '\t'));
     }
 
     /** @returns {boolean} true if this note is the root of the note tree. Root note has "root" noteId */
@@ -232,8 +244,8 @@ class Note extends Entity {
         return null;
     }
 
-    async loadOwnedAttributesToCache() {
-        this.__ownedAttributeCache = await repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
+    loadOwnedAttributesToCache() {
+        this.__ownedAttributeCache = this.repository.getEntities(`SELECT * FROM attributes WHERE isDeleted = 0 AND noteId = ?`, [this.noteId]);
         return this.__ownedAttributeCache;
     }
 
@@ -243,11 +255,11 @@ class Note extends Entity {
      *
      * @param {string} [type] - (optional) attribute type to filter
      * @param {string} [name] - (optional) attribute name to filter
-     * @returns {Promise<Attribute[]>} note's "owned" attributes - excluding inherited ones
+     * @returns {Attribute[]} note's "owned" attributes - excluding inherited ones
      */
-    async getOwnedAttributes(type, name) {
+    getOwnedAttributes(type, name) {
         if (!this.__ownedAttributeCache) {
-            await this.loadOwnedAttributesToCache();
+            this.loadOwnedAttributesToCache();
         }
 
         if (type && name) {
@@ -265,31 +277,31 @@ class Note extends Entity {
     }
 
     /**
-     * @returns {Promise<Attribute>} attribute belonging to this specific note (excludes inherited attributes)
+     * @returns {Attribute} attribute belonging to this specific note (excludes inherited attributes)
      *
      * This method can be significantly faster than the getAttribute()
      */
-    async getOwnedAttribute(type, name) {
-        const attrs = await this.getOwnedAttributes(type, name);
+    getOwnedAttribute(type, name) {
+        const attrs = this.getOwnedAttributes(type, name);
 
         return attrs.length > 0 ? attrs[0] : null;
     }
 
     /**
-     * @returns {Promise<Attribute[]>} relations targetting this specific note
+     * @returns {Attribute[]} relations targetting this specific note
      */
-    async getTargetRelations() {
-        return await repository.getEntities("SELECT * FROM attributes WHERE type = 'relation' AND isDeleted = 0 AND value = ?", [this.noteId]);
+    getTargetRelations() {
+        return this.repository.getEntities("SELECT * FROM attributes WHERE type = 'relation' AND isDeleted = 0 AND value = ?", [this.noteId]);
     }
 
     /**
      * @param {string} [type] - (optional) attribute type to filter
      * @param {string} [name] - (optional) attribute name to filter
-     * @returns {Promise<Attribute[]>} all note's attributes, including inherited ones
+     * @returns {Attribute[]} all note's attributes, including inherited ones
      */
-    async getAttributes(type, name) {
+    getAttributes(type, name) {
         if (!this.__attributeCache) {
-            await this.loadAttributesToCache();
+            this.loadAttributesToCache();
         }
 
         if (type && name) {
@@ -308,67 +320,51 @@ class Note extends Entity {
 
     /**
      * @param {string} [name] - label name to filter
-     * @returns {Promise<Attribute[]>} all note's labels (attributes with type label), including inherited ones
+     * @returns {Attribute[]} all note's labels (attributes with type label), including inherited ones
      */
-    async getLabels(name) {
-        return await this.getAttributes(LABEL, name);
+    getLabels(name) {
+        return this.getAttributes(LABEL, name);
     }
 
     /**
      * @param {string} [name] - label name to filter
-     * @returns {Promise<Attribute[]>} all note's labels (attributes with type label), excluding inherited ones
+     * @returns {Attribute[]} all note's labels (attributes with type label), excluding inherited ones
      */
-    async getOwnedLabels(name) {
-        return await this.getOwnedAttributes(LABEL, name);
-    }
-
-    /**
-     * @param {string} [name] - label name to filter
-     * @returns {Promise<Attribute[]>} all note's label definitions, including inherited ones
-     */
-    async getLabelDefinitions(name) {
-        return await this.getAttributes(LABEL_DEFINITION, name);
+    getOwnedLabels(name) {
+        return this.getOwnedAttributes(LABEL, name);
     }
 
     /**
      * @param {string} [name] - relation name to filter
-     * @returns {Promise<Attribute[]>} all note's relations (attributes with type relation), including inherited ones
+     * @returns {Attribute[]} all note's relations (attributes with type relation), including inherited ones
      */
-    async getRelations(name) {
-        return await this.getAttributes(RELATION, name);
+    getRelations(name) {
+        return this.getAttributes(RELATION, name);
     }
 
     /**
      * @param {string} [name] - relation name to filter
-     * @returns {Promise<Attribute[]>} all note's relations (attributes with type relation), excluding inherited ones
+     * @returns {Attribute[]} all note's relations (attributes with type relation), excluding inherited ones
      */
-    async getOwnedRelations(name) {
-        return await this.getOwnedAttributes(RELATION, name);
+    getOwnedRelations(name) {
+        return this.getOwnedAttributes(RELATION, name);
     }
 
     /**
      * @param {string} [name] - relation name to filter
-     * @returns {Promise<Note[]>}
+     * @returns {Note[]}
      */
-    async getRelationTargets(name) {
-        const relations = await this.getRelations(name);
+    getRelationTargets(name) {
+        const relations = this.getRelations(name);
         const targets = [];
 
         for (const relation of relations) {
-            targets.push(await relation.getTargetNote());
+            targets.push(relation.getTargetNote());
         }
 
         return targets;
     }
 
-    /**
-     * @param {string} [name] - relation name to filter
-     * @returns {Promise<Attribute[]>} all note's relation definitions including inherited ones
-     */
-    async getRelationDefinitions(name) {
-        return await this.getAttributes(RELATION_DEFINITION, name);
-    }
-
     /**
      * Clear note's attributes cache to force fresh reload for next attribute request.
      * Cache is note instance scoped.
@@ -378,9 +374,8 @@ class Note extends Entity {
         this.__ownedAttributeCache = null;
     }
 
-    /** @returns {Promise<void>} */
-    async loadAttributesToCache() {
-        const attributes = await repository.getEntities(`
+    loadAttributesToCache() {
+        const attributes = this.repository.getEntities(`
             WITH RECURSIVE
             tree(noteId, level) AS (
                 SELECT ?, 0
@@ -412,6 +407,7 @@ class Note extends Entity {
                 return false;
             }
 
+            // FIXME: this code is quite questionable, one problem is that other caches (TreeCache, NoteCache) have nothing like that
             if (attr.isDefinition()) {
                 const firstDefinitionIndex = attributes.findIndex(el => el.type === attr.type && el.name === attr.name);
 
@@ -419,15 +415,15 @@ class Note extends Entity {
                 return firstDefinitionIndex === index;
             }
             else {
-                const definitionAttr = attributes.find(el => el.type === attr.type + '-definition' && el.name === attr.name);
+                const definitionAttr = attributes.find(el => el.type === 'label' && el.name === attr.type + ':' + attr.name);
 
                 if (!definitionAttr) {
                     return true;
                 }
 
-                const definition = definitionAttr.value;
+                const definition = definitionAttr.getDefinition();
 
-                if (definition.multiplicityType === 'multivalue') {
+                if (definition.multiplicity === 'multi') {
                     return true;
                 }
                 else {
@@ -439,38 +435,34 @@ class Note extends Entity {
             }
         });
 
-        for (const attr of filteredAttributes) {
-            attr.isOwned = attr.noteId === this.noteId;
-        }
-
         this.__attributeCache = filteredAttributes;
     }
 
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
-     * @returns {Promise<boolean>} true if note has an attribute with given type and name (including inherited)
+     * @returns {boolean} true if note has an attribute with given type and name (including inherited)
      */
-    async hasAttribute(type, name) {
-        return !!await this.getAttribute(type, name);
+    hasAttribute(type, name) {
+        return !!this.getAttribute(type, name);
     }
 
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
-     * @returns {Promise<boolean>} true if note has an attribute with given type and name (excluding inherited)
+     * @returns {boolean} true if note has an attribute with given type and name (excluding inherited)
      */
-    async hasOwnedAttribute(type, name) {
-        return !!await this.getOwnedAttribute(type, name);
+    hasOwnedAttribute(type, name) {
+        return !!this.getOwnedAttribute(type, name);
     }
 
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
-     * @returns {Promise<Attribute>} attribute of given type and name. If there's more such attributes, first is  returned. Returns null if there's no such attribute belonging to this note.
+     * @returns {Attribute} attribute of given type and name. If there's more such attributes, first is  returned. Returns null if there's no such attribute belonging to this note.
      */
-    async getAttribute(type, name) {
-        const attributes = await this.getAttributes();
+    getAttribute(type, name) {
+        const attributes = this.getAttributes();
 
         return attributes.find(attr => attr.type === type && attr.name === name);
     }
@@ -478,10 +470,10 @@ class Note extends Entity {
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
-     * @returns {Promise<string|null>} attribute value of given type and name or null if no such attribute exists.
+     * @returns {string|null} attribute value of given type and name or null if no such attribute exists.
      */
-    async getAttributeValue(type, name) {
-        const attr = await this.getAttribute(type, name);
+    getAttributeValue(type, name) {
+        const attr = this.getAttribute(type, name);
 
         return attr ? attr.value : null;
     }
@@ -489,10 +481,10 @@ class Note extends Entity {
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
-     * @returns {Promise<string|null>} attribute value of given type and name or null if no such attribute exists.
+     * @returns {string|null} attribute value of given type and name or null if no such attribute exists.
      */
-    async getOwnedAttributeValue(type, name) {
-        const attr = await this.getOwnedAttribute(type, name);
+    getOwnedAttributeValue(type, name) {
+        const attr = this.getOwnedAttribute(type, name);
 
         return attr ? attr.value : null;
     }
@@ -504,14 +496,13 @@ class Note extends Entity {
      * @param {boolean} enabled - toggle On or Off
      * @param {string} name - attribute name
      * @param {string} [value] - attribute value (optional)
-     * @returns {Promise<void>}
      */
-    async toggleAttribute(type, enabled, name, value) {
+    toggleAttribute(type, enabled, name, value) {
         if (enabled) {
-            await this.setAttribute(type, name, value);
+            this.setAttribute(type, name, value);
         }
         else {
-            await this.removeAttribute(type, name, value);
+            this.removeAttribute(type, name, value);
         }
     }
 
@@ -521,16 +512,15 @@ class Note extends Entity {
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
      * @param {string} [value] - attribute value (optional)
-     * @returns {Promise<void>}
      */
-    async setAttribute(type, name, value) {
-        const attributes = await this.loadOwnedAttributesToCache();
+    setAttribute(type, name, value) {
+        const attributes = this.loadOwnedAttributesToCache();
         let attr = attributes.find(attr => attr.type === type && attr.name === name);
 
         if (attr) {
             if (attr.value !== value) {
                 attr.value = value;
-                await attr.save();
+                attr.save();
 
                 this.invalidateAttributeCache();
             }
@@ -543,7 +533,7 @@ class Note extends Entity {
                 value: value !== undefined ? value : ""
             });
 
-            await attr.save();
+            attr.save();
 
             this.invalidateAttributeCache();
         }
@@ -555,15 +545,14 @@ class Note extends Entity {
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
      * @param {string} [value] - attribute value (optional)
-     * @returns {Promise<void>}
      */
-    async removeAttribute(type, name, value) {
-        const attributes = await this.loadOwnedAttributesToCache();
+    removeAttribute(type, name, value) {
+        const attributes = this.loadOwnedAttributesToCache();
 
         for (const attribute of attributes) {
             if (attribute.type === type && attribute.name === name && (value === undefined || value === attribute.value)) {
                 attribute.isDeleted = true;
-                await attribute.save();
+                attribute.save();
 
                 this.invalidateAttributeCache();
             }
@@ -571,121 +560,123 @@ class Note extends Entity {
     }
 
     /**
-     * @return {Promise<Attribute>}
+     * @return {Attribute}
      */
-    async addAttribute(type, name, value = "") {
+    addAttribute(type, name, value = "", isInheritable = false, position = 1000) {
         const attr = new Attribute({
             noteId: this.noteId,
             type: type,
             name: name,
-            value: value
+            value: value,
+            isInheritable: isInheritable,
+            position: position
         });
 
-        await attr.save();
+        attr.save();
 
         this.invalidateAttributeCache();
 
         return attr;
     }
 
-    async addLabel(name, value = "") {
-        return await this.addAttribute(LABEL, name, value);
+    addLabel(name, value = "", isInheritable = false) {
+        return this.addAttribute(LABEL, name, value, isInheritable);
     }
 
-    async addRelation(name, targetNoteId) {
-        return await this.addAttribute(RELATION, name, targetNoteId);
+    addRelation(name, targetNoteId, isInheritable = false) {
+        return this.addAttribute(RELATION, name, targetNoteId, isInheritable);
     }
 
     /**
      * @param {string} name - label name
-     * @returns {Promise<boolean>} true if label exists (including inherited)
+     * @returns {boolean} true if label exists (including inherited)
      */
-    async hasLabel(name) { return await this.hasAttribute(LABEL, name); }
+    hasLabel(name) { return this.hasAttribute(LABEL, name); }
 
     /**
      * @param {string} name - label name
-     * @returns {Promise<boolean>} true if label exists (excluding inherited)
+     * @returns {boolean} true if label exists (excluding inherited)
      */
-    async hasOwnedLabel(name) { return await this.hasOwnedAttribute(LABEL, name); }
+    hasOwnedLabel(name) { return this.hasOwnedAttribute(LABEL, name); }
 
     /**
      * @param {string} name - relation name
-     * @returns {Promise<boolean>} true if relation exists (including inherited)
+     * @returns {boolean} true if relation exists (including inherited)
      */
-    async hasRelation(name) { return await this.hasAttribute(RELATION, name); }
+    hasRelation(name) { return this.hasAttribute(RELATION, name); }
 
     /**
      * @param {string} name - relation name
-     * @returns {Promise<boolean>} true if relation exists (excluding inherited)
+     * @returns {boolean} true if relation exists (excluding inherited)
      */
-    async hasOwnedRelation(name) { return await this.hasOwnedAttribute(RELATION, name); }
+    hasOwnedRelation(name) { return this.hasOwnedAttribute(RELATION, name); }
 
     /**
      * @param {string} name - label name
-     * @returns {Promise<Attribute|null>} label if it exists, null otherwise
+     * @returns {Attribute|null} label if it exists, null otherwise
      */
-    async getLabel(name) { return await this.getAttribute(LABEL, name); }
+    getLabel(name) { return this.getAttribute(LABEL, name); }
 
     /**
      * @param {string} name - label name
-     * @returns {Promise<Attribute|null>} label if it exists, null otherwise
+     * @returns {Attribute|null} label if it exists, null otherwise
      */
-    async getOwnedLabel(name) { return await this.getOwnedAttribute(LABEL, name); }
+    getOwnedLabel(name) { return this.getOwnedAttribute(LABEL, name); }
 
     /**
      * @param {string} name - relation name
-     * @returns {Promise<Attribute|null>} relation if it exists, null otherwise
+     * @returns {Attribute|null} relation if it exists, null otherwise
      */
-    async getRelation(name) { return await this.getAttribute(RELATION, name); }
+    getRelation(name) { return this.getAttribute(RELATION, name); }
 
     /**
      * @param {string} name - relation name
-     * @returns {Promise<Attribute|null>} relation if it exists, null otherwise
+     * @returns {Attribute|null} relation if it exists, null otherwise
      */
-    async getOwnedRelation(name) { return await this.getOwnedAttribute(RELATION, name); }
+    getOwnedRelation(name) { return this.getOwnedAttribute(RELATION, name); }
 
     /**
      * @param {string} name - label name
-     * @returns {Promise<string|null>} label value if label exists, null otherwise
+     * @returns {string|null} label value if label exists, null otherwise
      */
-    async getLabelValue(name) { return await this.getAttributeValue(LABEL, name); }
+    getLabelValue(name) { return this.getAttributeValue(LABEL, name); }
 
     /**
      * @param {string} name - label name
-     * @returns {Promise<string|null>} label value if label exists, null otherwise
+     * @returns {string|null} label value if label exists, null otherwise
      */
-    async getOwnedLabelValue(name) { return await this.getOwnedAttributeValue(LABEL, name); }
+    getOwnedLabelValue(name) { return this.getOwnedAttributeValue(LABEL, name); }
 
     /**
      * @param {string} name - relation name
-     * @returns {Promise<string|null>} relation value if relation exists, null otherwise
+     * @returns {string|null} relation value if relation exists, null otherwise
      */
-    async getRelationValue(name) { return await this.getAttributeValue(RELATION, name); }
+    getRelationValue(name) { return this.getAttributeValue(RELATION, name); }
 
     /**
      * @param {string} name - relation name
-     * @returns {Promise<string|null>} relation value if relation exists, null otherwise
+     * @returns {string|null} relation value if relation exists, null otherwise
      */
-    async getOwnedRelationValue(name) { return await this.getOwnedAttributeValue(RELATION, name); }
+    getOwnedRelationValue(name) { return this.getOwnedAttributeValue(RELATION, name); }
 
     /**
      * @param {string} name
-     * @returns {Promise<Note>|null} target note of the relation or null (if target is empty or note was not found)
+     * @returns {Note|null} target note of the relation or null (if target is empty or note was not found)
      */
-    async getRelationTarget(name) {
-        const relation = await this.getRelation(name);
+    getRelationTarget(name) {
+        const relation = this.getRelation(name);
 
-        return relation ? await repository.getNote(relation.value) : null;
+        return relation ? this.repository.getNote(relation.value) : null;
     }
 
     /**
      * @param {string} name
-     * @returns {Promise<Note>|null} target note of the relation or null (if target is empty or note was not found)
+     * @returns {Note|null} target note of the relation or null (if target is empty or note was not found)
      */
-    async getOwnedRelationTarget(name) {
-        const relation = await this.getOwnedRelation(name);
+    getOwnedRelationTarget(name) {
+        const relation = this.getOwnedRelation(name);
 
-        return relation ? await repository.getNote(relation.value) : null;
+        return relation ? this.repository.getNote(relation.value) : null;
     }
 
     /**
@@ -694,9 +685,8 @@ class Note extends Entity {
      * @param {boolean} enabled - toggle On or Off
      * @param {string} name - label name
      * @param {string} [value] - label value (optional)
-     * @returns {Promise<void>}
      */
-    async toggleLabel(enabled, name, value) { return await this.toggleAttribute(LABEL, enabled, name, value); }
+    toggleLabel(enabled, name, value) { return this.toggleAttribute(LABEL, enabled, name, value); }
 
     /**
      * Based on enabled, relation is either set or removed.
@@ -704,51 +694,46 @@ class Note extends Entity {
      * @param {boolean} enabled - toggle On or Off
      * @param {string} name - relation name
      * @param {string} [value] - relation value (noteId)
-     * @returns {Promise<void>}
      */
-    async toggleRelation(enabled, name, value) { return await this.toggleAttribute(RELATION, enabled, name, value); }
+    toggleRelation(enabled, name, value) { return this.toggleAttribute(RELATION, enabled, name, value); }
 
     /**
      * Update's given label's value or creates it if it doesn't exist
      *
      * @param {string} name - label name
      * @param {string} [value] - label value
-     * @returns {Promise<void>}
      */
-    async setLabel(name, value) { return await this.setAttribute(LABEL, name, value); }
+    setLabel(name, value) { return this.setAttribute(LABEL, name, value); }
 
     /**
      * Update's given relation's value or creates it if it doesn't exist
      *
      * @param {string} name - relation name
      * @param {string} [value] - relation value (noteId)
-     * @returns {Promise<void>}
      */
-    async setRelation(name, value) { return await this.setAttribute(RELATION, name, value); }
+    setRelation(name, value) { return this.setAttribute(RELATION, name, value); }
 
     /**
      * Remove label name-value pair, if it exists.
      *
      * @param {string} name - label name
      * @param {string} [value] - label value
-     * @returns {Promise<void>}
      */
-    async removeLabel(name, value) { return await this.removeAttribute(LABEL, name, value); }
+    removeLabel(name, value) { return this.removeAttribute(LABEL, name, value); }
 
     /**
      * Remove relation name-value pair, if it exists.
      *
      * @param {string} name - relation name
      * @param {string} [value] - relation value (noteId)
-     * @returns {Promise<void>}
      */
-    async removeRelation(name, value) { return await this.removeAttribute(RELATION, name, value); }
+    removeRelation(name, value) { return this.removeAttribute(RELATION, name, value); }
 
     /**
-     * @return {Promise<string[]>} return list of all descendant noteIds of this note. Returning just noteIds because number of notes can be huge. Includes also this note's noteId
+     * @return {string[]} return list of all descendant noteIds of this note. Returning just noteIds because number of notes can be huge. Includes also this note's noteId
      */
-    async getDescendantNoteIds() {
-        return await sql.getColumn(`
+    getDescendantNoteIds() {
+        return sql.getColumn(`
             WITH RECURSIVE
             tree(noteId) AS (
                 SELECT ?
@@ -768,9 +753,9 @@ class Note extends Entity {
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
      * @param {string} [value] - attribute value
-     * @returns {Promise<Note[]>}
+     * @returns {Note[]}
      */
-    async getDescendantNotesWithAttribute(type, name, value) {
+    getDescendantNotesWithAttribute(type, name, value) {
         const params = [this.noteId, name];
         let valueCondition = "";
 
@@ -779,7 +764,7 @@ class Note extends Entity {
             valueCondition = " AND attributes.value = ?";
         }
 
-        const notes = await repository.getEntities(`
+        const notes = this.repository.getEntities(`
             WITH RECURSIVE
             tree(noteId) AS (
                 SELECT ?
@@ -806,36 +791,36 @@ class Note extends Entity {
      *
      * @param {string} name - label name
      * @param {string} [value] - label value
-     * @returns {Promise<Note[]>}
+     * @returns {Note[]}
      */
-    async getDescendantNotesWithLabel(name, value) { return await this.getDescendantNotesWithAttribute(LABEL, name, value); }
+    getDescendantNotesWithLabel(name, value) { return this.getDescendantNotesWithAttribute(LABEL, name, value); }
 
     /**
      * Finds descendant notes with given relation name and value. Only own relations are considered, not inherited ones
      *
      * @param {string} name - relation name
      * @param {string} [value] - relation value
-     * @returns {Promise<Note[]>}
+     * @returns {Note[]}
      */
-    async getDescendantNotesWithRelation(name, value) { return await this.getDescendantNotesWithAttribute(RELATION, name, value); }
+    getDescendantNotesWithRelation(name, value) { return this.getDescendantNotesWithAttribute(RELATION, name, value); }
 
     /**
      * Returns note revisions of this note.
      *
-     * @returns {Promise<NoteRevision[]>}
+     * @returns {NoteRevision[]}
      */
-    async getRevisions() {
-        return await repository.getEntities("SELECT * FROM note_revisions WHERE noteId = ?", [this.noteId]);
+    getRevisions() {
+        return this.repository.getEntities("SELECT * FROM note_revisions WHERE noteId = ?", [this.noteId]);
     }
 
     /**
      * Get list of links coming out of this note.
      *
      * @deprecated - not intended for general use
-     * @returns {Promise<Attribute[]>}
+     * @returns {Attribute[]}
      */
-    async getLinks() {
-        return await repository.getEntities(`
+    getLinks() {
+        return this.repository.getEntities(`
             SELECT * 
             FROM attributes 
             WHERE noteId = ? AND 
@@ -845,24 +830,24 @@ class Note extends Entity {
     }
 
     /**
-     * @returns {Promise<Branch[]>}
+     * @returns {Branch[]}
      */
-    async getBranches() {
-        return await repository.getEntities("SELECT * FROM branches WHERE isDeleted = 0 AND noteId = ?", [this.noteId]);
+    getBranches() {
+        return this.repository.getEntities("SELECT * FROM branches WHERE isDeleted = 0 AND noteId = ?", [this.noteId]);
     }
 
     /**
      * @returns {boolean} - true if note has children
      */
-    async hasChildren() {
-        return (await this.getChildNotes()).length > 0;
+    hasChildren() {
+        return this.getChildNotes().length > 0;
     }
 
     /**
-     * @returns {Promise<Note[]>} child notes of this note
+     * @returns {Note[]} child notes of this note
      */
-    async getChildNotes() {
-        return await repository.getEntities(`
+    getChildNotes() {
+        return this.repository.getEntities(`
           SELECT notes.* 
           FROM branches 
             JOIN notes USING(noteId) 
@@ -873,10 +858,10 @@ class Note extends Entity {
     }
 
     /**
-     * @returns {Promise<Branch[]>} child branches of this note
+     * @returns {Branch[]} child branches of this note
      */
-    async getChildBranches() {
-        return await repository.getEntities(`
+    getChildBranches() {
+        return this.repository.getEntities(`
           SELECT branches.* 
           FROM branches 
           WHERE branches.isDeleted = 0
@@ -885,10 +870,10 @@ class Note extends Entity {
     }
 
     /**
-     * @returns {Promise<Note[]>} parent notes of this note (note can have multiple parents because of cloning)
+     * @returns {Note[]} parent notes of this note (note can have multiple parents because of cloning)
      */
-    async getParentNotes() {
-        return await repository.getEntities(`
+    getParentNotes() {
+        return this.repository.getEntities(`
           SELECT parent_notes.* 
           FROM 
             branches AS child_tree 
@@ -899,17 +884,17 @@ class Note extends Entity {
     }
 
     /**
-     * @return {Promise<string[][]>} - array of notePaths (each represented by array of noteIds constituting the particular note path)
+     * @return {string[][]} - array of notePaths (each represented by array of noteIds constituting the particular note path)
      */
-    async getAllNotePaths() {
+    getAllNotePaths() {
         if (this.noteId === 'root') {
             return [['root']];
         }
 
         const notePaths = [];
 
-        for (const parentNote of await this.getParentNotes()) {
-            for (const parentPath of await parentNote.getAllNotePaths()) {
+        for (const parentNote of this.getParentNotes()) {
+            for (const parentPath of parentNote.getAllNotePaths()) {
                 parentPath.push(this.noteId);
                 notePaths.push(parentPath);
             }
@@ -918,12 +903,22 @@ class Note extends Entity {
         return notePaths;
     }
 
+    getRelationDefinitions() {
+        return this.getLabels()
+            .filter(l => l.name.startsWith("relation:"));
+    }
+
+    getLabelDefinitions() {
+        return this.getLabels()
+            .filter(l => l.name.startsWith("relation:"));
+    }
+
     /**
      * @param ancestorNoteId
-     * @return {Promise<boolean>} - true if ancestorNoteId occurs in at least one of the note's paths
+     * @return {boolean} - true if ancestorNoteId occurs in at least one of the note's paths
      */
-    async isDescendantOfNote(ancestorNoteId) {
-        const notePaths = await this.getAllNotePaths();
+    isDescendantOfNote(ancestorNoteId) {
+        const notePaths = this.getAllNotePaths();
 
         return notePaths.some(path => path.includes(ancestorNoteId));
     }
@@ -941,16 +936,10 @@ class Note extends Entity {
             this.utcDateCreated = dateUtils.utcNowDateTime();
         }
 
-        if (this.contentLength === undefined) {
-            this.contentLength = -1;
-        }
-
         super.beforeSaving();
 
-        if (this.isChanged) {
-            this.dateModified = dateUtils.localNowDateTime();
-            this.utcDateModified = dateUtils.utcNowDateTime();
-        }
+        this.dateModified = dateUtils.localNowDateTime();
+        this.utcDateModified = dateUtils.utcNowDateTime();
     }
 
     // cannot be static!
@@ -974,7 +963,8 @@ class Note extends Entity {
     }
 }
 
-module.exports = Note;</code></pre>
+module.exports = Note;
+</code></pre>
         </article>
     </section>
 
@@ -990,7 +980,7 @@ module.exports = Note;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_note_revision.js.html

@@ -30,11 +30,10 @@
 
 const Entity = require('./entity');
 const protectedSessionService = require('../services/protected_session');
-const repository = require('../services/repository');
 const utils = require('../services/utils');
 const sql = require('../services/sql');
 const dateUtils = require('../services/date_utils');
-const syncTableService = require('../services/sync_table');
+const entityChangesService = require('../services/entity_changes.js');
 
 /**
  * NoteRevision represents snapshot of note's title and content at some point in the past. It's used for seamless note versioning.
@@ -44,8 +43,6 @@ const syncTableService = require('../services/sync_table');
  * @property {string} type
  * @property {string} mime
  * @property {string} title
- * @property {int} contentLength
- * @property {boolean} isErased
  * @property {boolean} isProtected
  * @property {string} dateLastEdited
  * @property {string} dateCreated
@@ -58,7 +55,7 @@ const syncTableService = require('../services/sync_table');
 class NoteRevision extends Entity {
     static get entityName() { return "note_revisions"; }
     static get primaryKeyName() { return "noteRevisionId"; }
-    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "contentLength", "isErased", "isProtected", "dateLastEdited", "dateCreated", "utcDateLastEdited", "utcDateCreated", "utcDateModified"]; }
+    static get hashedProperties() { return ["noteRevisionId", "noteId", "title", "isProtected", "dateLastEdited", "dateCreated", "utcDateLastEdited", "utcDateCreated", "utcDateModified"]; }
 
     constructor(row) {
         super(row);
@@ -75,8 +72,8 @@ class NoteRevision extends Entity {
         }
     }
 
-    async getNote() {
-        return await repository.getNote(this.noteId);
+    getNote() {
+        return this.repository.getNote(this.noteId);
     }
 
     /** @returns {boolean} true if the note has string content (not binary) */
@@ -93,10 +90,10 @@ class NoteRevision extends Entity {
      * This is the same approach as is used for Note's content.
      */
 
-    /** @returns {Promise<*>} */
-    async getContent(silentNotFoundError = false) {
+    /** @returns {*} */
+    getContent(silentNotFoundError = false) {
         if (this.content === undefined) {
-            const res = await sql.getRow(`SELECT content, hash FROM note_revision_contents WHERE noteRevisionId = ?`, [this.noteRevisionId]);
+            const res = sql.getRow(`SELECT content FROM note_revision_contents WHERE noteRevisionId = ?`, [this.noteRevisionId]);
 
             if (!res) {
                 if (silentNotFoundError) {
@@ -108,7 +105,6 @@ class NoteRevision extends Entity {
             }
 
             this.content = res.content;
-
             if (this.isProtected) {
                 if (protectedSessionService.isProtectedSessionAvailable()) {
                     this.content = protectedSessionService.decrypt(this.content);
@@ -129,20 +125,13 @@ class NoteRevision extends Entity {
         }
     }
 
-    /** @returns {Promise} */
-    async setContent(content) {
-        // force updating note itself so that utcDateModified is represented correctly even for the content
-        this.forcedChange = true;
-        this.contentLength = content === null ? 0 : content.length;
-        await this.save();
-
+    setContent(content) {
         this.content = content;
 
         const pojo = {
             noteRevisionId: this.noteRevisionId,
             content: content,
-            utcDateModified: dateUtils.utcNowDateTime(),
-            hash: utils.hash(this.noteRevisionId + "|" + content)
+            utcDateModified: dateUtils.utcNowDateTime()
         };
 
         if (this.isProtected) {
@@ -154,17 +143,23 @@ class NoteRevision extends Entity {
             }
         }
 
-        await sql.upsert("note_revision_contents", "noteRevisionId", pojo);
+        sql.upsert("note_revision_contents", "noteRevisionId", pojo);
 
-        await syncTableService.addNoteRevisionContentSync(this.noteRevisionId);
+        const hash = utils.hash(this.noteRevisionId + "|" + content);
+
+        entityChangesService.addEntityChange({
+            entityName: 'note_revision_contents',
+            entityId: this.noteRevisionId,
+            hash: hash,
+            isErased: false,
+            utcDateChanged: this.getUtcDateChanged()
+        }, null);
     }
 
     beforeSaving() {
         super.beforeSaving();
 
-        if (this.isChanged) {
-            this.utcDateModified = dateUtils.utcNowDateTime();
-        }
+        this.utcDateModified = dateUtils.utcNowDateTime();
     }
 
     // cannot be static!
@@ -183,7 +178,8 @@ class NoteRevision extends Entity {
     }
 }
 
-module.exports = NoteRevision;</code></pre>
+module.exports = NoteRevision;
+</code></pre>
         </article>
     </section>
 
@@ -199,7 +195,7 @@ module.exports = NoteRevision;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_option.js.html

@@ -60,13 +60,12 @@ class Option extends Entity {
 
         super.beforeSaving();
 
-        if (this.isChanged) {
-            this.utcDateModified = dateUtils.utcNowDateTime();
-        }
+        this.utcDateModified = dateUtils.utcNowDateTime();
     }
 }
 
-module.exports = Option;</code></pre>
+module.exports = Option;
+</code></pre>
         </article>
     </section>
 
@@ -82,7 +81,7 @@ module.exports = Option;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/entities_recent_note.js.html

@@ -36,21 +36,15 @@ const dateUtils = require('../services/date_utils');
  *
  * @property {string} noteId
  * @property {string} notePath
- * @property {boolean} isDeleted
- * @property {string} utcDateModified
+ * @property {string} utcDateCreated
  *
  * @extends Entity
  */
 class RecentNote extends Entity {
     static get entityName() { return "recent_notes"; }
     static get primaryKeyName() { return "noteId"; }
-    static get hashedProperties() { return ["noteId", "notePath", "utcDateCreated", "isDeleted"]; }
 
     beforeSaving() {
-        if (!this.isDeleted) {
-            this.isDeleted = false;
-        }
-
         if (!this.utcDateCreated) {
             this.utcDateCreated = dateUtils.utcNowDateTime();
         }
@@ -59,7 +53,8 @@ class RecentNote extends Entity {
     }
 }
 
-module.exports = RecentNote;</code></pre>
+module.exports = RecentNote;
+</code></pre>
         </article>
     </section>
 
@@ -75,7 +70,7 @@ module.exports = RecentNote;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/global.html

@@ -391,7 +391,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line212">line 212</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line215">line 215</a>
     </li></ul></dd>
     
 
@@ -579,7 +579,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line173">line 173</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line176">line 176</a>
     </li></ul></dd>
     
 
@@ -767,7 +767,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line233">line 233</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line236">line 236</a>
     </li></ul></dd>
     
 
@@ -1053,7 +1053,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line240">line 240</a>
+        <a href="services_backend_script_api.js.html">services/backend_script_api.js</a>, <a href="services_backend_script_api.js.html#line243">line 243</a>
     </li></ul></dd>
     
 
@@ -1089,7 +1089,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/index.html

@@ -56,7 +56,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/backend_api/services_backend_script_api.js.html

@@ -38,9 +38,9 @@ const repository = require('./repository');
 const axios = require('axios');
 const dayjs = require('dayjs');
 const cloningService = require('./cloning');
-const ws = require('./ws.js');
 const appInfo = require('./app_info');
-const searchService = require('./search');
+const searchService = require('./search/services/search');
+const SearchContext = require("./search/search_context.js");
 
 /**
  * This is the main backend API interface for scripts. It's published in the local "api" object.
@@ -78,38 +78,31 @@ function BackendScriptApi(currentNote, apiParams) {
     /**
      * @method
      * @param {string} noteId
-     * @returns {Promise<Note|null>}
+     * @returns {Note|null}
      */
     this.getNote = repository.getNote;
 
     /**
      * @method
      * @param {string} branchId
-     * @returns {Promise<Branch|null>}
+     * @returns {Branch|null}
      */
     this.getBranch = repository.getBranch;
 
     /**
      * @method
      * @param {string} attributeId
-     * @returns {Promise<Attribute|null>}
+     * @returns {Attribute|null}
      */
     this.getAttribute = repository.getAttribute;
 
-    /**
-     * @method
-     * @param {string} imageId
-     * @returns {Promise<Image|null>}
-     */
-    this.getImage = repository.getImage;
-
     /**
      * Retrieves first entity from the SQL's result set.
      *
      * @method
      * @param {string} SQL query
      * @param {Array.<?>} array of params
-     * @returns {Promise<Entity|null>}
+     * @returns {Entity|null}
      */
     this.getEntity = repository.getEntity;
 
@@ -117,30 +110,40 @@ function BackendScriptApi(currentNote, apiParams) {
      * @method
      * @param {string} SQL query
      * @param {Array.<?>} array of params
-     * @returns {Promise<Entity[]>}
+     * @returns {Entity[]}
      */
     this.getEntities = repository.getEntities;
 
     /**
      * This is a powerful search method - you can search by attributes and their values, e.g.:
-     * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
+     * "#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
      *
      * @method
-     * @param {string} searchString
-     * @returns {Promise<Note[]>}
+     * @param {string} query
+     * @param {Object} [searchParams]
+     * @returns {Note[]}
      */
-    this.searchForNotes = searchService.searchForNotes;
+    this.searchForNotes = (query, searchParams = {}) => {
+        if (searchParams.includeArchivedNotes === undefined) {
+            searchParams.includeArchivedNotes = true;
+        }
+
+        const noteIds = searchService.findNotesWithQuery(query, new SearchContext(searchParams))
+            .map(sr => sr.noteId);
+
+        return repository.getNotes(noteIds);
+    };
 
     /**
      * This is a powerful search method - you can search by attributes and their values, e.g.:
-     * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
+     * "#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
      *
      * @method
      * @param {string} searchString
-     * @returns {Promise<Note|null>}
+     * @returns {Note|null}
      */
-    this.searchForNote = async searchString => {
-        const notes = await searchService.searchForNotes(searchString);
+    this.searchForNote = searchString => {
+        const notes = searchService.searchNoteEntities(searchString);
 
         return notes.length > 0 ? notes[0] : null;
     };
@@ -151,7 +154,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * @method
      * @param {string} name - attribute name
      * @param {string} [value] - attribute value
-     * @returns {Promise<Note[]>}
+     * @returns {Note[]}
      */
     this.getNotesWithLabel = attributeService.getNotesWithLabel;
 
@@ -161,7 +164,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * @method
      * @param {string} name - attribute name
      * @param {string} [value] - attribute value
-     * @returns {Promise<Note|null>}
+     * @returns {Note|null}
      */
     this.getNoteWithLabel = attributeService.getNoteWithLabel;
 
@@ -172,7 +175,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * @param {string} noteId
      * @param {string} parentNoteId
      * @param {string} prefix - if branch will be create between note and parent note, set this prefix
-     * @returns {Promise<void>}
+     * @returns {void}
      */
     this.ensureNoteIsPresentInParent = cloningService.ensureNoteIsPresentInParent;
 
@@ -182,7 +185,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * @method
      * @param {string} noteId
      * @param {string} parentNoteId
-     * @returns {Promise<void>}
+     * @returns {void}
      */
     this.ensureNoteIsAbsentFromParent = cloningService.ensureNoteIsAbsentFromParent;
 
@@ -194,7 +197,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * @param {string} noteId
      * @param {string} parentNoteId
      * @param {string} prefix - if branch will be create between note and parent note, set this prefix
-     * @returns {Promise<void>}
+     * @returns {void}
      */
     this.toggleNoteInParent = cloningService.toggleNoteInParent;
 
@@ -211,9 +214,9 @@ function BackendScriptApi(currentNote, apiParams) {
      * @param {string} parentNoteId
      * @param {string} title
      * @param {string} content
-     * @return {Promise<{note: Note, branch: Branch}>}
+     * @return {{note: Note, branch: Branch}}
      */
-    this.createTextNote = async (parentNoteId, title, content = '') => await noteService.createNewNote({
+    this.createTextNote = (parentNoteId, title, content = '') => noteService.createNewNote({
         parentNoteId,
         title,
         content,
@@ -227,9 +230,9 @@ function BackendScriptApi(currentNote, apiParams) {
      * @param {string} parentNoteId
      * @param {string} title
      * @param {object} content
-     * @return {Promise<{note: Note, branch: Branch}>}
+     * @return {{note: Note, branch: Branch}}
      */
-    this.createDataNote = async (parentNoteId, title, content = {}) => await noteService.createNewNote({
+    this.createDataNote = (parentNoteId, title, content = {}) => noteService.createNewNote({
         parentNoteId,
         title,
         content: JSON.stringify(content, null, '\t'),
@@ -254,7 +257,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * @method
      *
      * @param {CreateNewNoteParams} [params]
-     * @returns {Promise<{note: Note, branch: Branch}>} object contains newly created entities note and branch
+     * @returns {{note: Note, branch: Branch}} object contains newly created entities note and branch
      */
     this.createNewNote = noteService.createNewNote;
 
@@ -276,19 +279,19 @@ function BackendScriptApi(currentNote, apiParams) {
 
     /**
      * @method
-     * @deprecated please use createNote() API method instead
+     * @deprecated please use createTextNote() with similar API for simpler use cases or createNewNote() for more complex needs
      *
      * @param {string} parentNoteId - create new note under this parent
      * @param {string} title
      * @param {string} [content=""]
      * @param {CreateNoteExtraOptions} [extraOptions={}]
-     * @returns {Promise<{note: Note, branch: Branch}>} object contains newly created entities note and branch
+     * @returns {{note: Note, branch: Branch}} object contains newly created entities note and branch
      */
-    this.createNote = async (parentNoteId, title, content = "", extraOptions= {}) => {
+    this.createNote = (parentNoteId, title, content = "", extraOptions= {}) => {
         extraOptions.parentNoteId = parentNoteId;
         extraOptions.title = title;
 
-        const parentNote = await repository.getNote(parentNoteId);
+        const parentNote = repository.getNote(parentNoteId);
 
         // code note type can be inherited, otherwise text is default
         extraOptions.type = parentNote.type === 'code' ? 'code' : 'text';
@@ -303,19 +306,21 @@ function BackendScriptApi(currentNote, apiParams) {
             extraOptions.content = content;
         }
 
-        const {note, branch} = await noteService.createNewNote(extraOptions);
+        return sql.transactional(() => {
+            const {note, branch} = noteService.createNewNote(extraOptions);
 
-        for (const attr of extraOptions.attributes || []) {
-            await attributeService.createAttribute({
-                noteId: note.noteId,
-                type: attr.type,
-                name: attr.name,
-                value: attr.value,
-                isInheritable: !!attr.isInheritable
-            });
-        }
+            for (const attr of extraOptions.attributes || []) {
+                attributeService.createAttribute({
+                    noteId: note.noteId,
+                    type: attr.type,
+                    name: attr.name,
+                    value: attr.value,
+                    isInheritable: !!attr.isInheritable
+                });
+            }
 
-        return {note, branch};
+            return {note, branch};
+        });
     };
 
     /**
@@ -329,7 +334,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * Returns root note of the calendar.
      *
      * @method
-     * @returns {Promise<Note|null>}
+     * @returns {Note|null}
      */
     this.getRootCalendarNote = dateNoteService.getRootCalendarNote;
 
@@ -338,7 +343,7 @@ function BackendScriptApi(currentNote, apiParams) {
      *
      * @method
      * @param {string} date in YYYY-MM-DD format
-     * @returns {Promise<Note|null>}
+     * @returns {Note|null}
      */
     this.getDateNote = dateNoteService.getDateNote;
 
@@ -346,7 +351,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * Returns today's day note. If such note doesn't exist, it is created.
      *
      * @method
-     * @returns {Promise<Note|null>}
+     * @returns {Note|null}
      */
     this.getTodayNote = dateNoteService.getTodayNote;
 
@@ -356,7 +361,7 @@ function BackendScriptApi(currentNote, apiParams) {
      * @method
      * @param {string} date in YYYY-MM-DD format
      * @param {object} options - "startOfTheWeek" - either "monday" (default) or "sunday"
-     * @returns {Promise<Note|null>}
+     * @returns {Note|null}
      */
     this.getWeekNote = dateNoteService.getWeekNote;
 
@@ -365,7 +370,7 @@ function BackendScriptApi(currentNote, apiParams) {
      *
      * @method
      * @param {string} date in YYYY-MM format
-     * @returns {Promise<Note|null>}
+     * @returns {Note|null}
      */
     this.getMonthNote = dateNoteService.getMonthNote;
 
@@ -374,14 +379,13 @@ function BackendScriptApi(currentNote, apiParams) {
      *
      * @method
      * @param {string} year in YYYY format
-     * @returns {Promise<Note|null>}
+     * @returns {Note|null}
      */
     this.getYearNote = dateNoteService.getYearNote;
 
     /**
      * @method
      * @param {string} parentNoteId - this note's child notes will be sorted
-     * @returns Promise<void>
      */
     this.sortNotesAlphabetically = treeService.sortNotesAlphabetically;
 
@@ -403,12 +407,9 @@ function BackendScriptApi(currentNote, apiParams) {
      * This functions wraps code which is supposed to be running in transaction. If transaction already
      * exists, then we'll use that transaction.
      *
-     * This method is required only when script has label manualTransactionHandling, all other scripts are
-     * transactional by default.
-     *
      * @method
      * @param {function} func
-     * @returns {Promise<?>} result of func callback
+     * @returns {?} result of func callback
      */
     this.transactional = sql.transactional;
 
@@ -443,7 +444,7 @@ module.exports = BackendScriptApi;
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/Branch.html

@@ -93,7 +93,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line3">line 3</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line2">line 2</a>
     </li></ul></dd>
     
 
@@ -201,7 +201,7 @@
 
         
             
-<h4 class="name" id="isDeleted"><span class="type-signature"></span>isDeleted<span class="type-signature"></span></h4>
+<h4 class="name" id="fromSearchNote"><span class="type-signature"></span>fromSearchNote<span class="type-signature"></span></h4>
 
 
 
@@ -259,6 +259,64 @@
 
         
             
+<h4 class="name" id="isDeleted"><span class="type-signature"></span>isDeleted<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line25">line 25</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
 <h4 class="name" id="isExpanded"><span class="type-signature"></span>isExpanded<span class="type-signature"></span></h4>
 
 
@@ -607,7 +665,109 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line27">line 27</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line29">line 29</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type"><a href="NoteShort.html">NoteShort</a></span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="getNoteFromCache"><span class="type-signature"></span>getNoteFromCache<span class="signature">()</span><span class="type-signature"> &rarr; {<a href="NoteShort.html">NoteShort</a>}</span></h4>
+    
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line34">line 34</a>
     </li></ul></dd>
     
 
@@ -709,7 +869,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line32">line 32</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line39">line 39</a>
     </li></ul></dd>
     
 
@@ -811,7 +971,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line37">line 37</a>
+        <a href="entities_branch.js.html">entities/branch.js</a>, <a href="entities_branch.js.html#line44">line 44</a>
     </li></ul></dd>
     
 
@@ -885,7 +1045,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/FrontendScriptApi.html

@@ -81,7 +81,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line24">line 24</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line22">line 22</a>
     </li></ul></dd>
     
 
@@ -223,7 +223,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line28">line 28</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line26">line 26</a>
     </li></ul></dd>
     
 
@@ -329,7 +329,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line50">line 50</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line48">line 48</a>
     </li></ul></dd>
     
 
@@ -435,7 +435,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line41">line 41</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line39">line 39</a>
     </li></ul></dd>
     
 
@@ -545,7 +545,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line33">line 33</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line31">line 31</a>
     </li></ul></dd>
     
 
@@ -658,7 +658,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line35">line 35</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line33">line 33</a>
     </li></ul></dd>
     
 
@@ -768,7 +768,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line31">line 31</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line29">line 29</a>
     </li></ul></dd>
     
 
@@ -874,7 +874,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line44">line 44</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line42">line 42</a>
     </li></ul></dd>
     
 
@@ -980,7 +980,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line47">line 47</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line45">line 45</a>
     </li></ul></dd>
     
 
@@ -1109,7 +1109,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line69">line 69</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line67">line 67</a>
     </li></ul></dd>
     
 
@@ -1264,7 +1264,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line59">line 59</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line57">line 57</a>
     </li></ul></dd>
     
 
@@ -1419,7 +1419,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line89">line 89</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line101">line 101</a>
     </li></ul></dd>
     
 
@@ -1556,7 +1556,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line289">line 289</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line302">line 302</a>
     </li></ul></dd>
     
 
@@ -1712,7 +1712,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line394">line 394</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line413">line 413</a>
     </li></ul></dd>
     
 
@@ -1748,7 +1748,7 @@
     
 
     
-    <h4 class="name" id="createNoteLink"><span class="type-signature"></span>createNoteLink<span class="signature">(notePath, noteTitle<span class="signature-attributes">opt</span>)</span><span class="type-signature"></span></h4>
+    <h4 class="name" id="createNoteLink"><span class="type-signature"></span>createNoteLink<span class="signature">(notePath, params<span class="signature-attributes">opt</span>, title=<span class="signature-attributes">opt</span>)</span><span class="type-signature"></span></h4>
     
 
     
@@ -1825,7 +1825,148 @@
 
         <tr>
             
-                <td class="name"><code>noteTitle</code></td>
+                <td class="name"><code>params</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">object</span>
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+
+            <td class="description last">
+                <h6>Properties</h6>
+                
+
+<table class="params">
+    <thead>
+    <tr>
+        
+        <th>Name</th>
+        
+
+        <th>Type</th>
+
+        
+        <th>Attributes</th>
+        
+
+        
+        <th>Default</th>
+        
+
+        <th class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+                <td class="name"><code>showTooltip</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">boolean</span>
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    true
+                
+                </td>
+            
+
+            <td class="description last">enable/disable tooltip on the link</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>showNotePath</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">boolean</span>
+
+
+            
+            </td>
+
+            
+                <td class="attributes">
+                
+                    &lt;optional><br>
+                
+
+                
+
+                
+                </td>
+            
+
+            
+                <td class="default">
+                
+                    false
+                
+                </td>
+            
+
+            <td class="description last">show also whole note's path as part of the link</td>
+        </tr>
+
+    
+    </tbody>
+</table>
+
+            </td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>title=</code></td>
             
 
             <td class="type">
@@ -1851,7 +1992,7 @@
 
             
 
-            <td class="description last">if not present we'll use note title</td>
+            <td class="description last">custom link tile with note's title as default</td>
         </tr>
 
     
@@ -1892,7 +2033,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line281">line 281</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line294">line 294</a>
     </li></ul></dd>
     
 
@@ -2025,7 +2166,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line243">line 243</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line253">line 253</a>
     </li></ul></dd>
     
 
@@ -2131,7 +2272,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line295">line 295</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line308">line 308</a>
     </li></ul></dd>
     
 
@@ -2237,7 +2378,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line309">line 309</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line322">line 322</a>
     </li></ul></dd>
     
 
@@ -2391,7 +2532,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line303">line 303</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line316">line 316</a>
     </li></ul></dd>
     
 
@@ -2528,7 +2669,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line360">line 360</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line373">line 373</a>
     </li></ul></dd>
     
 
@@ -2635,7 +2776,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line236">line 236</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line246">line 246</a>
     </li></ul></dd>
     
 
@@ -2790,7 +2931,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line369">line 369</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line382">line 382</a>
     </li></ul></dd>
     
 
@@ -2946,7 +3087,7 @@ if some action needs to happen on only one specific instance.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line208">line 208</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line218">line 218</a>
     </li></ul></dd>
     
 
@@ -3147,7 +3288,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line220">line 220</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line230">line 230</a>
     </li></ul></dd>
     
 
@@ -3253,7 +3394,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line351">line 351</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line364">line 364</a>
     </li></ul></dd>
     
 
@@ -3408,7 +3549,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line378">line 378</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line391">line 391</a>
     </li></ul></dd>
     
 
@@ -3462,6 +3603,184 @@ otherwise (by e.g. createNoteLink())
     
 
     
+    <h4 class="name" id="openTabWithNote"><span class="type-signature"></span>openTabWithNote<span class="signature">(notePath, activate)</span><span class="type-signature"> &rarr; {Promise.&lt;void>}</span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    Open a note in a new tab.
+</div>
+
+
+
+
+
+
+
+
+
+    <h5>Parameters:</h5>
+    
+
+<table class="params">
+    <thead>
+    <tr>
+        
+        <th>Name</th>
+        
+
+        <th>Type</th>
+
+        
+
+        
+
+        <th class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+                <td class="name"><code>notePath</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">string</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">(or noteId)</td>
+        </tr>
+
+    
+
+        <tr>
+            
+                <td class="name"><code>activate</code></td>
+            
+
+            <td class="type">
+            
+                
+<span class="param-type">boolean</span>
+
+
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">set to true to activate the new tab, false to stay on the current tab</td>
+        </tr>
+
+    
+    </tbody>
+</table>
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line81">line 81</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+<h5>Returns:</h5>
+
+        
+
+
+<dl>
+    <dt>
+        Type
+    </dt>
+    <dd>
+        
+<span class="param-type">Promise.&lt;void></span>
+
+
+    </dd>
+</dl>
+
+    
+
+
+
+
+
+        
+            
+
+    
+
+    
     <h4 class="name" id="parseDate"><span class="type-signature"></span>parseDate<span class="signature">(str)</span><span class="type-signature"> &rarr; {Date}</span></h4>
     
 
@@ -3559,7 +3878,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line250">line 250</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line260">line 260</a>
     </li></ul></dd>
     
 
@@ -3667,7 +3986,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line321">line 321</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line334">line 334</a>
     </li></ul></dd>
     
 
@@ -3823,7 +4142,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line332">line 332</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line345">line 345</a>
     </li></ul></dd>
     
 
@@ -3979,7 +4298,139 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line341">line 341</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line354">line 354</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+        
+            
+
+    
+
+    
+    <h4 class="name" id="refreshIncludedNote"><span class="type-signature"></span>refreshIncludedNote<span class="signature">(includedNoteId)</span><span class="type-signature"></span></h4>
+    
+
+    
+
+
+
+<div class="description">
+    This will refresh all currently opened notes which have included note specified in the parameter
+</div>
+
+
+
+
+
+
+
+
+
+    <h5>Parameters:</h5>
+    
+
+<table class="params">
+    <thead>
+    <tr>
+        
+        <th>Name</th>
+        
+
+        <th>Type</th>
+
+        
+
+        
+
+        <th class="last">Description</th>
+    </tr>
+    </thead>
+
+    <tbody>
+    
+
+        <tr>
+            
+                <td class="name"><code>includedNoteId</code></td>
+            
+
+            <td class="type">
+            
+            </td>
+
+            
+
+            
+
+            <td class="description last">noteId of the included note</td>
+        </tr>
+
+    
+    </tbody>
+</table>
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line431">line 431</a>
     </li></ul></dd>
     
 
@@ -4065,7 +4516,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line272">line 272</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line282">line 282</a>
     </li></ul></dd>
     
 
@@ -4202,7 +4653,7 @@ otherwise (by e.g. createNoteLink())
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line228">line 228</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line238">line 238</a>
     </li></ul></dd>
     
 
@@ -4363,7 +4814,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line139">line 139</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line151">line 151</a>
     </li></ul></dd>
     
 
@@ -4471,7 +4922,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line168">line 168</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line180">line 180</a>
     </li></ul></dd>
     
 
@@ -4516,7 +4967,7 @@ Internally this serializes the anonymous function into string and sends it to ba
 
 <div class="description">
     This is a powerful search method - you can search by attributes and their values, e.g.:
-"@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
+"#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
 </div>
 
 
@@ -4609,7 +5060,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line196">line 196</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line206">line 206</a>
     </li></ul></dd>
     
 
@@ -4672,7 +5123,7 @@ Internally this serializes the anonymous function into string and sends it to ba
 
 <div class="description">
     This is a powerful search method - you can search by attributes and their values, e.g.:
-"@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
+"#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
 </div>
 
 
@@ -4765,7 +5216,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line178">line 178</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line190">line 190</a>
     </li></ul></dd>
     
 
@@ -4827,7 +5278,7 @@ Internally this serializes the anonymous function into string and sends it to ba
 
 
 <div class="description">
-    Hoist note. See https://github.com/zadam/trilium/wiki/Note-hoisting
+    Hoist note in the current tab. See https://github.com/zadam/trilium/wiki/Note-hoisting
 </div>
 
 
@@ -4920,7 +5371,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line387">line 387</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line400">line 400</a>
     </li></ul></dd>
     
 
@@ -5071,7 +5522,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line315">line 315</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line328">line 328</a>
     </li></ul></dd>
     
 
@@ -5208,7 +5659,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line266">line 266</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line276">line 276</a>
     </li></ul></dd>
     
 
@@ -5345,7 +5796,7 @@ Internally this serializes the anonymous function into string and sends it to ba
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line258">line 258</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line268">line 268</a>
     </li></ul></dd>
     
 
@@ -5437,7 +5888,7 @@ Typical use case is when new note has been created, we should wait until it is s
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line405">line 405</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line424">line 424</a>
     </li></ul></dd>
     
 
@@ -5489,7 +5940,7 @@ Typical use case is when new note has been created, we should wait until it is s
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/NoteComplement.html

@@ -93,7 +93,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line5">line 5</a>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line4">line 4</a>
     </li></ul></dd>
     
 
@@ -143,6 +143,122 @@
 
         
             
+<h4 class="name" id="combinedDateModified"><span class="type-signature"></span>combinedDateModified<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line32">line 32</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="combinedUtcDateModified"><span class="type-signature"></span>combinedUtcDateModified<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line35">line 35</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
 <h4 class="name" id="content"><span class="type-signature"></span>content<span class="type-signature"></span></h4>
 
 
@@ -183,7 +299,65 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line10">line 10</a>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line12">line 12</a>
+    </li></ul></dd>
+    
+
+    
+
+    
+
+    
+</dl>
+
+
+
+
+
+
+        
+            
+<h4 class="name" id="contentLength"><span class="type-signature"></span>contentLength<span class="type-signature"></span></h4>
+
+
+
+
+
+
+
+
+
+
+<dl class="details">
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+
+    
+    <dt class="tag-source">Source:</dt>
+    <dd class="tag-source"><ul class="dummy"><li>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line15">line 15</a>
     </li></ul></dd>
     
 
@@ -241,7 +415,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line13">line 13</a>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line18">line 18</a>
     </li></ul></dd>
     
 
@@ -299,7 +473,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line16">line 16</a>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line21">line 21</a>
     </li></ul></dd>
     
 
@@ -415,7 +589,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line19">line 19</a>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line24">line 24</a>
     </li></ul></dd>
     
 
@@ -473,7 +647,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line22">line 22</a>
+        <a href="entities_note_complement.js.html">entities/note_complement.js</a>, <a href="entities_note_complement.js.html#line27">line 27</a>
     </li></ul></dd>
     
 
@@ -513,7 +687,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_attribute.js.html

@@ -26,7 +26,9 @@
     
     <section>
         <article>
-            <pre class="prettyprint source linenums"><code>class Attribute {
+            <pre class="prettyprint source linenums"><code>import promotedAttributeDefinitionParser from '../services/promoted_attribute_definition_parser.js';
+
+class Attribute {
     constructor(treeCache, row) {
         this.treeCache = treeCache;
 
@@ -47,29 +49,88 @@
         /** @param {int} position */
         this.position = row.position;
         /** @param {boolean} isInheritable */
-        this.isInheritable = row.isInheritable;
+        this.isInheritable = !!row.isInheritable;
+        /** @param {boolean} */
+        this.isDeleted = !!row.isDeleted;
     }
 
     /** @returns {NoteShort} */
-    async getNote() {
-        return await this.treeCache.getNote(this.noteId);
+    getNote() {
+        return this.treeCache.notes[this.noteId];
     }
 
-    get jsonValue() {
-        try {
-            return JSON.parse(this.value);
-        }
-        catch (e) {
-            return null;
-        }
+    get targetNoteId() { // alias
+        return this.type === 'relation' ? this.value : undefined;
+    }
+
+    get isAutoLink() {
+        return this.type === 'relation' &amp;&amp; ['internalLink', 'imageLink', 'relationMapLink', 'includeNoteLink'].includes(this.name);
     }
 
     get toString() {
         return `Attribute(attributeId=${this.attributeId}, type=${this.type}, name=${this.name}, value=${this.value})`;
     }
+
+    /**
+     * @return {boolean} - returns true if this attribute has the potential to influence the note in the argument.
+     *         That can happen in multiple ways:
+     *         1. attribute is owned by the note
+     *         2. attribute is owned by the template of the note
+     *         3. attribute is owned by some note's ancestor and is inheritable
+     */
+    isAffecting(affectedNote) {
+        if (!affectedNote) {
+            return false;
+        }
+
+        const attrNote = this.getNote();
+
+        if (!attrNote) {
+            // the note (owner of the attribute) is not even loaded into the cache so it should not affect anything else
+            return false;
+        }
+
+        const owningNotes = [affectedNote, ...affectedNote.getTemplateNotes()];
+
+        for (const owningNote of owningNotes) {
+            if (owningNote.noteId === attrNote.noteId) {
+                return true;
+            }
+        }
+
+        if (this.isInheritable) {
+            for (const owningNote of owningNotes) {
+                if (owningNote.hasAncestor(attrNote)) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    isDefinition() {
+        return this.type === 'label' &amp;&amp; (this.name.startsWith('label:') || this.name.startsWith('relation:'));
+    }
+
+    getDefinition() {
+        return promotedAttributeDefinitionParser.parse(this.value);
+    }
+
+    isDefinitionFor(attr) {
+        return this.type === 'label' &amp;&amp; this.name === `${attr.type}:${attr.name}`;
+    }
+
+    get dto() {
+        const dto = Object.assign({}, this);
+        delete dto.treeCache;
+
+        return dto;
+    }
 }
 
-export default Attribute;</code></pre>
+export default Attribute;
+</code></pre>
         </article>
     </section>
 
@@ -85,7 +146,7 @@ export default Attribute;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_branch.js.html

@@ -48,6 +48,8 @@ class Branch {
         /** @param {boolean} */
         this.isExpanded = !!row.isExpanded;
         /** @param {boolean} */
+        this.fromSearchNote = !!row.fromSearchNote;
+        /** @param {boolean} */
         this.isDeleted = !!row.isDeleted;
     }
 
@@ -56,6 +58,11 @@ class Branch {
         return this.treeCache.getNote(this.noteId);
     }
 
+    /** @returns {NoteShort} */
+    getNoteFromCache() {
+        return this.treeCache.getNoteFromCache(this.noteId);
+    }
+
     /** @returns {NoteShort} */
     async getParentNote() {
         return this.treeCache.getNote(this.parentNoteId);
@@ -71,7 +78,8 @@ class Branch {
     }
 }
 
-export default Branch;</code></pre>
+export default Branch;
+</code></pre>
         </article>
     </section>
 
@@ -87,7 +95,7 @@ export default Branch;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_note_complement.js.html

@@ -34,9 +34,14 @@ class NoteComplement {
         /** @param {string} */
         this.noteId = row.noteId;
 
-        /** @param {string} */
+        /**
+         * @param {string} - can either contain the whole content (in e.g. string notes), only part (large text notes) or nothing at all (binary notes, images)
+         */
         this.content = row.content;
 
+        /** @param {int} */
+        this.contentLength = row.contentLength;
+
         /** @param {string} */
         this.dateCreated = row.dateCreated;
 
@@ -48,10 +53,19 @@ class NoteComplement {
 
         /** @param {string} */
         this.utcDateModified = row.utcDateModified;
+
+        // "combined" date modified give larger out of note's and note_content's dateModified
+
+        /** @param {string} */
+        this.combinedDateModified = row.combinedDateModified;
+
+        /** @param {string} */
+        this.combinedUtcDateModified = row.combinedUtcDateModified;
     }
 }
 
-export default NoteComplement;</code></pre>
+export default NoteComplement;
+</code></pre>
         </article>
     </section>
 
@@ -67,7 +81,7 @@ export default NoteComplement;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/entities_note_short.js.html

@@ -27,14 +27,26 @@
     <section>
         <article>
             <pre class="prettyprint source linenums"><code>import server from '../services/server.js';
-import Attribute from './attribute.js';
+import noteAttributeCache from "../services/note_attribute_cache.js";
+import ws from "../services/ws.js";
+import options from "../services/options.js";
 
 const LABEL = 'label';
-const LABEL_DEFINITION = 'label-definition';
 const RELATION = 'relation';
-const RELATION_DEFINITION = 'relation-definition';
+
+const NOTE_TYPE_ICONS = {
+    "file": "bx bx-file",
+    "image": "bx bx-image",
+    "code": "bx bx-code",
+    "render": "bx bx-extension",
+    "search": "bx bx-file-find",
+    "relation-map": "bx bx-map-alt",
+    "book": "bx bx-book"
+};
 
 /**
+ * FIXME: since there's no "full note" anymore we can rename this to Note
+ *
  * This note's representation is used in note tree and is kept in TreeCache.
  */
 class NoteShort {
@@ -70,8 +82,6 @@ class NoteShort {
         this.noteId = row.noteId;
         /** @param {string} */
         this.title = row.title;
-        /** @param {int} */
-        this.contentLength = row.contentLength;
         /** @param {boolean} */
         this.isProtected = !!row.isProtected;
         /** @param {string} one of 'text', 'code', 'file' or 'render' */
@@ -79,10 +89,14 @@ class NoteShort {
         /** @param {string} content-type, e.g. "application/json" */
         this.mime = row.mime;
         /** @param {boolean} */
-        this.isDeleted = row.isDeleted;
+        this.isDeleted = !!row.isDeleted;
     }
 
     addParent(parentNoteId, branchId) {
+        if (parentNoteId === 'none') {
+            return;
+        }
+
         if (!this.parents.includes(parentNoteId)) {
             this.parents.push(parentNoteId);
         }
@@ -90,13 +104,19 @@ class NoteShort {
         this.parentToBranch[parentNoteId] = branchId;
     }
 
-    addChild(childNoteId, branchId) {
-        if (!this.children.includes(childNoteId)) {
+    addChild(childNoteId, branchId, sort = true) {
+        if (!(childNoteId in this.childToBranch)) {
             this.children.push(childNoteId);
         }
 
         this.childToBranch[childNoteId] = branchId;
 
+        if (sort) {
+            this.sortChildren();
+        }
+    }
+
+    sortChildren() {
         const branchIdPos = {};
 
         for (const branchId of Object.values(this.childToBranch)) {
@@ -184,9 +204,9 @@ class NoteShort {
     getOwnedAttributes(type, name) {
         const attrs = this.attributes
             .map(attributeId => this.treeCache.attributes[attributeId])
-            .filter(attr => !!attr);
+            .filter(Boolean); // filter out nulls;
 
-        return this.__filterAttrs(attrs, type, name)
+        return this.__filterAttrs(attrs, type, name);
     }
 
     /**
@@ -195,48 +215,66 @@ class NoteShort {
      * @returns {Attribute[]} all note's attributes, including inherited ones
      */
     getAttributes(type, name) {
-        const ownedAttributes = this.getOwnedAttributes();
+        return this.__filterAttrs(this.__getCachedAttributes([]), type, name);
+    }
 
-        const attrArrs = [
-            ownedAttributes
-        ];
-
-        for (const templateAttr of ownedAttributes.filter(oa => oa.type === 'relation' &amp;&amp; oa.name === 'template')) {
-            const templateNote = this.treeCache.getNoteFromCache(templateAttr.value);
-
-            if (templateNote) {
-                attrArrs.push(templateNote.getAttributes());
-            }
+    __getCachedAttributes(path) {
+        // notes/clones cannot form tree cycles, it is possible to create attribute inheritance cycle via templates
+        // when template instance is a parent of template itself
+        if (path.includes(this.noteId)) {
+            return [];
         }
 
-        if (this.noteId !== 'root') {
-            for (const parentNote of this.getParentNotes()) {
-                // these virtual parent-child relationships are also loaded into frontend tree cache
-                if (parentNote.type !== 'search') {
-                    attrArrs.push(parentNote.getInheritableAttributes());
+        if (!(this.noteId in noteAttributeCache.attributes)) {
+            const newPath = [...path, this.noteId];
+            const attrArrs = [ this.getOwnedAttributes() ];
+
+            if (this.noteId !== 'root') {
+                for (const parentNote of this.getParentNotes()) {
+                    // these virtual parent-child relationships are also loaded into frontend tree cache
+                    if (parentNote.type !== 'search') {
+                        attrArrs.push(parentNote.__getInheritableAttributes(newPath));
+                    }
+                }
+            }
+
+            for (const templateAttr of attrArrs.flat().filter(attr => attr.type === 'relation' &amp;&amp; attr.name === 'template')) {
+                const templateNote = this.treeCache.notes[templateAttr.value];
+
+                if (templateNote &amp;&amp; templateNote.noteId !== this.noteId) {
+                    attrArrs.push(templateNote.__getCachedAttributes(newPath));
+                }
+            }
+
+            noteAttributeCache.attributes[this.noteId] = [];
+            const addedAttributeIds = new Set();
+
+            for (const attr of attrArrs.flat()) {
+                if (!addedAttributeIds.has(attr.attributeId)) {
+                    addedAttributeIds.add(attr.attributeId);
+
+                    noteAttributeCache.attributes[this.noteId].push(attr);
                 }
             }
         }
 
-        const attributes = attrArrs.flat();
-
-        return this.__filterAttrs(attributes, type, name);
+        return noteAttributeCache.attributes[this.noteId];
     }
 
     __filterAttrs(attributes, type, name) {
-        if (type &amp;&amp; name) {
+        if (!type &amp;&amp; !name) {
+            return attributes;
+        } else if (type &amp;&amp; name) {
             return attributes.filter(attr => attr.type === type &amp;&amp; attr.name === name);
         } else if (type) {
             return attributes.filter(attr => attr.type === type);
         } else if (name) {
             return attributes.filter(attr => attr.name === name);
-        } else {
-            return attributes;
         }
     }
 
-    getInheritableAttributes() {
-        const attrs = this.getAttributes();
+    __getInheritableAttributes(path) {
+        const attrs = this.__getCachedAttributes(path);
 
         return attrs.filter(attr => attr.isInheritable);
     }
@@ -257,12 +295,61 @@ class NoteShort {
         return this.getAttributes(LABEL, name);
     }
 
-    /**
-     * @param {string} [name] - label name to filter
-     * @returns {Attribute[]} all note's label definitions, including inherited ones
-     */
-    getLabelDefinitions(name) {
-        return this.getAttributes(LABEL_DEFINITION, name);
+    getIcon() {
+        const iconClassLabels = this.getLabels('iconClass');
+        const workspaceIconClass = this.getWorkspaceIconClass();
+
+        if (iconClassLabels.length > 0) {
+            return iconClassLabels.map(l => l.value).join(' ');
+        }
+        else if (workspaceIconClass) {
+            return workspaceIconClass;
+        }
+        else if (this.noteId === 'root') {
+            return "bx bx-chevrons-right";
+        }
+        else if (this.type === 'text') {
+            if (this.isFolder()) {
+                return "bx bx-folder";
+            }
+            else {
+                return "bx bx-note";
+            }
+        }
+        else if (this.type === 'code' &amp;&amp; this.mime.startsWith('text/x-sql')) {
+            return "bx bx-data";
+        }
+        else {
+            return NOTE_TYPE_ICONS[this.type];
+        }
+    }
+
+    isFolder() {
+        return this.type === 'search'
+            || this.getFilteredChildBranches().length > 0;
+    }
+
+    getFilteredChildBranches() {
+        let childBranches = this.getChildBranches();
+
+        if (!childBranches) {
+            ws.logError(`No children for ${parentNote}. This shouldn't happen.`);
+            return;
+        }
+
+        if (options.is("hideIncludedImages_main")) {
+            const imageLinks = this.getRelations('imageLink');
+
+            // image is already visible in the parent note so no need to display it separately in the book
+            childBranches = childBranches.filter(branch => !imageLinks.find(rel => rel.value === branch.noteId));
+        }
+
+        // we're not checking hideArchivedNotes since that would mean we need to lazy load the child notes
+        // which would seriously slow down everything.
+        // we check this flag only once user chooses to expand the parent. This has the negative consequence that
+        // note may appear as folder but not contain any children when all of them are archived
+
+        return childBranches;
     }
 
     /**
@@ -281,14 +368,6 @@ class NoteShort {
         return this.getAttributes(RELATION, name);
     }
 
-    /**
-     * @param {string} [name] - relation name to filter
-     * @returns {Attribute[]} all note's relation definitions including inherited ones
-     */
-    getRelationDefinitions(name) {
-        return this.getAttributes(RELATION_DEFINITION, name);
-    }
-
     /**
      * @param {string} type - attribute type (label, relation, etc.)
      * @param {string} name - attribute name
@@ -326,7 +405,7 @@ class NoteShort {
     getAttribute(type, name) {
         const attributes = this.getAttributes(type, name);
 
-        return attributes.length > 0 ? attributes[0] : 0;
+        return attributes.length > 0 ? attributes[0] : null;
     }
 
     /**
@@ -448,6 +527,58 @@ class NoteShort {
         return targets;
     }
 
+    /**
+     * @returns {NoteShort[]}
+     */
+    getTemplateNotes() {
+        const relations = this.getRelations('template');
+
+        return relations.map(rel => this.treeCache.notes[rel.value]);
+    }
+
+    getPromotedDefinitionAttributes() {
+        if (this.hasLabel('hidePromotedAttributes')) {
+            return [];
+        }
+
+        return this.getAttributes()
+            .filter(attr => attr.isDefinition())
+            .filter(attr => {
+                const def = attr.getDefinition();
+
+                return def &amp;&amp; def.isPromoted;
+            });
+    }
+
+    hasAncestor(ancestorNote, visitedNoteIds) {
+        if (this.noteId === ancestorNote.noteId) {
+            return true;
+        }
+
+        if (!visitedNoteIds) {
+            visitedNoteIds = new Set();
+        } else if (visitedNoteIds.has(this.noteId)) {
+            // to avoid infinite cycle when template is descendent of the instance
+            return false;
+        }
+
+        visitedNoteIds.add(this.noteId);
+
+        for (const templateNote of this.getTemplateNotes()) {
+            if (templateNote.hasAncestor(ancestorNote, visitedNoteIds)) {
+                return true;
+            }
+        }
+
+        for (const parentNote of this.getParentNotes()) {
+            if (parentNote.hasAncestor(ancestorNote, visitedNoteIds)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     /**
      * Clear note's attributes cache to force fresh reload for next attribute request.
      * Cache is note instance scoped.
@@ -466,6 +597,26 @@ class NoteShort {
             .map(attributeId => this.treeCache.attributes[attributeId]);
     }
 
+    /**
+     * Get relations which target this note
+     *
+     * @returns {NoteShort[]}
+     */
+    async getTargetRelationSourceNotes() {
+        const targetRelations = this.getTargetRelations();
+
+        return await this.treeCache.getNotes(targetRelations.map(tr => tr.noteId));
+    }
+
+    /**
+     * Return note complement which is most importantly note's content
+     *
+     * @return {Promise&lt;NoteComplement>}
+     */
+    async getNoteComplement() {
+        return await this.treeCache.getNoteComplement(this.noteId);
+    }
+
     get toString() {
         return `Note(noteId=${this.noteId}, title=${this.title})`;
     }
@@ -481,9 +632,20 @@ class NoteShort {
         const labels = this.getLabels('cssClass');
         return labels.map(l => l.value).join(' ');
     }
+
+    getWorkspaceIconClass() {
+        const labels = this.getLabels('workspaceIconClass');
+        return labels.length > 0 ? labels[0].value : "";
+    }
+
+    getWorkspaceTabBackgroundColor() {
+        const labels = this.getLabels('workspaceTabBackgroundColor');
+        return labels.length > 0 ? labels[0].value : "";
+    }
 }
 
-export default NoteShort;</code></pre>
+export default NoteShort;
+</code></pre>
         </article>
     </section>
 
@@ -499,7 +661,7 @@ export default NoteShort;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/global.html

@@ -156,7 +156,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widgets_collapsible_widget.js.html">widgets/collapsible_widget.js</a>, <a href="widgets_collapsible_widget.js.html#line93">line 93</a>
+        <a href="widgets_collapsible_widget.js.html">widgets/collapsible_widget.js</a>, <a href="widgets_collapsible_widget.js.html#line124">line 124</a>
     </li></ul></dd>
     
 
@@ -244,7 +244,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widgets_collapsible_widget.js.html">widgets/collapsible_widget.js</a>, <a href="widgets_collapsible_widget.js.html#line96">line 96</a>
+        <a href="widgets_collapsible_widget.js.html">widgets/collapsible_widget.js</a>, <a href="widgets_collapsible_widget.js.html#line127">line 127</a>
     </li></ul></dd>
     
 
@@ -333,7 +333,7 @@ separately but should behave uniformly for the user.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="widgets_collapsible_widget.js.html">widgets/collapsible_widget.js</a>, <a href="widgets_collapsible_widget.js.html#line86">line 86</a>
+        <a href="widgets_collapsible_widget.js.html">widgets/collapsible_widget.js</a>, <a href="widgets_collapsible_widget.js.html#line117">line 117</a>
     </li></ul></dd>
     
 
@@ -572,7 +572,7 @@ separately but should behave uniformly for the user.
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line76">line 76</a>
+        <a href="services_frontend_script_api.js.html">services/frontend_script_api.js</a>, <a href="services_frontend_script_api.js.html#line88">line 88</a>
     </li></ul></dd>
     
 
@@ -608,7 +608,7 @@ separately but should behave uniformly for the user.
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/index.html

@@ -56,7 +56,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/services_frontend_script_api.js.html

@@ -26,8 +26,7 @@
     
     <section>
         <article>
-            <pre class="prettyprint source linenums"><code>import treeService from './tree.js';
-import server from './server.js';
+            <pre class="prettyprint source linenums"><code>import server from './server.js';
 import utils from './utils.js';
 import toastService from './toast.js';
 import linkService from './link.js';
@@ -37,7 +36,6 @@ import protectedSessionService from './protected_session.js';
 import dateNotesService from './date_notes.js';
 import CollapsibleWidget from '../widgets/collapsible_widget.js';
 import ws from "./ws.js";
-import hoistedNoteService from "./hoisted_note.js";
 import appContext from "./app_context.js";
 import TabAwareWidget from "../widgets/tab_aware_widget.js";
 import TabCachingWidget from "../widgets/tab_caching_widget.js";
@@ -95,12 +93,26 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
      * @return {Promise&lt;void>}
      */
     this.activateNewNote = async notePath => {
-        await ws.waitForMaxKnownSyncId();
+        await ws.waitForMaxKnownEntityChangeId();
 
         await appContext.tabManager.getActiveTabContext().setNote(notePath);
         appContext.triggerEvent('focusAndSelectTitle');
     };
 
+    /**
+     * Open a note in a new tab.
+     *
+     * @param {string} notePath (or noteId)
+     * @param {boolean} activate - set to true to activate the new tab, false to stay on the current tab
+     * @return {Promise&lt;void>}
+     */
+    this.openTabWithNote = async (notePath, activate) => {
+        await ws.waitForMaxKnownEntityChangeId();
+
+        await appContext.tabManager.openTabWithNote(notePath, activate);
+        appContext.triggerEvent('focusAndSelectTitle');
+    };
+
     /**
      * @typedef {Object} ToolbarButtonOptions
      * @property {string} title
@@ -115,9 +127,9 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
      * @param {ToolbarButtonOptions} opts
      */
     this.addButtonToToolbar = opts => {
-        const buttonId = "toolbar-button-" + opts.title.replace(/[^a-zA-Z0-9]/g, "-");
+        const buttonId = "toolbar-button-" + opts.title.replace(/\s/g, "-");
 
-        const button = $('&lt;button>')
+        const button = $('&lt;button class="noborder">')
             .addClass("btn btn-sm")
             .on('click', opts.action);
 
@@ -180,7 +192,7 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
 
         if (ret.success) {
             // wait until all the changes done in the script has been synced to frontend before continuing
-            await ws.waitForSyncId(ret.maxSyncId);
+            await ws.waitForEntityChangeId(ret.maxEntityChangeId);
 
             return ret.executionResult;
         }
@@ -197,25 +209,23 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
 
     /**
      * This is a powerful search method - you can search by attributes and their values, e.g.:
-     * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
+     * "#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
      *
      * @method
      * @param {string} searchString
      * @returns {Promise&lt;NoteShort[]>}
      */
     this.searchForNotes = async searchString => {
-        const noteIds = await this.runOnServer(async searchString => {
-            const notes = await api.searchForNotes(searchString);
-
-            return notes.map(note => note.noteId);
-        }, [searchString]);
+        const noteIds = await this.runOnBackend(
+            searchString => api.searchForNotes(searchString).map(note => note.noteId),
+            [searchString]);
 
         return await treeCache.getNotes(noteIds);
     };
 
     /**
      * This is a powerful search method - you can search by attributes and their values, e.g.:
-     * "@dateModified =* MONTH AND @log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
+     * "#dateModified =* MONTH AND #log". See full documentation for all options at: https://github.com/zadam/trilium/wiki/Search
      *
      * @method
      * @param {string} searchString
@@ -304,7 +314,10 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
      *
      * @method
      * @param {string} notePath (or noteId)
-     * @param {string} [noteTitle] - if not present we'll use note title
+     * @param {object} [params]
+     * @param {boolean} [params.showTooltip=true] - enable/disable tooltip on the link
+     * @param {boolean} [params.showNotePath=false] - show also whole note's path as part of the link
+     * @param {string} [title=] - custom link tile with note's title as default
      */
     this.createNoteLink = linkService.createNoteLink;
 
@@ -406,13 +419,19 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
     this.getYearNote = dateNotesService.getYearNote;
 
     /**
-     * Hoist note. See https://github.com/zadam/trilium/wiki/Note-hoisting
+     * Hoist note in the current tab. See https://github.com/zadam/trilium/wiki/Note-hoisting
      *
      * @method
      * @param {string} noteId - set hoisted note. 'root' will effectively unhoist
      * @return {Promise}
      */
-    this.setHoistedNoteId = hoistedNoteService.setHoistedNoteId;
+    this.setHoistedNoteId = (noteId) => {
+        const activeTabContext = appContext.tabManager.getActiveTabContext();
+
+        if (activeTabContext) {
+            activeTabContext.setHoistedNoteId(noteId);
+        }
+    };
 
     /**
      * @method
@@ -430,10 +449,18 @@ function FrontendScriptApi(startNote, currentNote, originEntity = null, $contain
      *
      * @method
      */
-    this.waitUntilSynced = ws.waitForMaxKnownSyncId;
+    this.waitUntilSynced = ws.waitForMaxKnownEntityChangeId;
+
+    /**
+     * This will refresh all currently opened notes which have included note specified in the parameter
+     *
+     * @param includedNoteId - noteId of the included note
+     */
+    this.refreshIncludedNote = includedNoteId => appContext.triggerEvent('refreshIncludedNote', {noteId: includedNoteId});
 }
 
-export default FrontendScriptApi;</code></pre>
+export default FrontendScriptApi;
+</code></pre>
         </article>
     </section>
 
@@ -449,7 +476,7 @@ export default FrontendScriptApi;</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

docs/frontend_api/widgets_collapsible_widget.js.html

@@ -31,16 +31,25 @@ import options from "../services/options.js";
 
 const WIDGET_TPL = `
 <div class="card widget">
-    <div class="card-header">
+    <div class="card-header">    
         <div>           
-            <button class="btn btn-sm widget-title" data-toggle="collapse" data-target="#[to be set]">
-                Collapsible Group Item
-            </button>
-            
-            <a class="widget-help external no-arrow bx bx-info-circle"></a>
+            <a class="widget-toggle-button no-arrow" 
+                title="Minimize/maximize widget"
+                data-toggle="collapse" data-target="#[to be set]">
+                
+                <span class="widget-toggle-icon bx"></span>
+                
+                <span class="widget-title">
+                    Collapsible Group Item
+                </span>    
+            </a>
+        
+            <span class="widget-header-actions"></span>
         </div>
         
-        <div class="widget-header-actions"></div>
+        <div>
+            <a class="widget-help external no-arrow bx bx-info-circle"></a>
+        </div>
     </div>
 
     <div id="[to be set]" class="collapse body-wrapper" style="transition: none; ">
@@ -57,20 +66,28 @@ export default class CollapsibleWidget extends TabAwareWidget {
 
     doRender() {
         this.$widget = $(WIDGET_TPL);
+        this.contentSized();
         this.$widget.find('[data-target]').attr('data-target', "#" + this.componentId);
 
         this.$bodyWrapper = this.$widget.find('.body-wrapper');
         this.$bodyWrapper.attr('id', this.componentId); // for toggle to work we need id
 
-        this.widgetName = this.constructor.name;
+        // not using constructor name because of webpack mangling class names ...
+        this.widgetName = this.widgetTitle.replace(/[^[a-zA-Z0-9]/g, "_");
 
-        if (!options.is(this.widgetName + 'Collapsed')) {
+        this.$toggleButton = this.$widget.find('.widget-toggle-button');
+        this.$toggleIcon = this.$widget.find('.widget-toggle-icon');
+
+        const collapsed = options.is(this.widgetName + 'Collapsed');
+        if (!collapsed) {
             this.$bodyWrapper.collapse("show");
         }
 
+        this.updateToggleIcon(collapsed);
+
         // using immediate variants of the event so that the previous collapse is not caught
-        this.$bodyWrapper.on('hide.bs.collapse', () => this.saveCollapsed(true));
-        this.$bodyWrapper.on('show.bs.collapse', () => this.saveCollapsed(false));
+        this.$bodyWrapper.on('hide.bs.collapse', () => this.toggleCollapsed(true));
+        this.$bodyWrapper.on('show.bs.collapse', () => this.toggleCollapsed(false));
 
         this.$body = this.$bodyWrapper.find('.card-body');
 
@@ -92,21 +109,35 @@ export default class CollapsibleWidget extends TabAwareWidget {
         }
 
         this.$headerActions = this.$widget.find('.widget-header-actions');
-        this.$headerActions.append(...this.headerActions);
+        this.$headerActions.append(this.headerActions);
 
         this.initialized = this.doRenderBody();
 
         this.decorateWidget();
-
-        return this.$widget;
     }
 
-    saveCollapsed(collapse) {
+    toggleCollapsed(collapse) {
+        this.updateToggleIcon(collapse);
+
         options.save(this.widgetName + 'Collapsed', collapse.toString());
 
         this.triggerEvent(`widgetCollapsedStateChanged`, {widgetName: this.widgetName, collapse});
     }
 
+    updateToggleIcon(collapse) {
+        if (collapse) {
+            this.$toggleIcon
+                .addClass("bx-chevron-right")
+                .removeClass("bx-chevron-down")
+                .attr("title", "Show");
+        } else {
+            this.$toggleIcon
+                .addClass("bx-chevron-down")
+                .removeClass("bx-chevron-right")
+                .attr("title", "Hide");
+        }
+    }
+
     /**
      * This event is used to synchronize collapsed state of all the tab-cached widgets since they are all rendered
      * separately but should behave uniformly for the user.
@@ -126,7 +157,8 @@ export default class CollapsibleWidget extends TabAwareWidget {
     isExpanded() {
         return this.$bodyWrapper.hasClass("show");
     }
-}</code></pre>
+}
+</code></pre>
         </article>
     </section>
 
@@ -142,7 +174,7 @@ export default class CollapsibleWidget extends TabAwareWidget {
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.4</a>
+    Documentation generated by <a href="https://github.com/jsdoc/jsdoc">JSDoc 3.6.6</a>
 </footer>
 
 <script> prettyPrint(); </script>

libraries/ckeditor/ckeditor-content.css

@@ -1,12 +1,12 @@
 /* !!!!!! TRILIUM CUSTOM CHANGES !!!!!! */
 
-.ck-widget__type-around { /* gets rid of triangles: https://github.com/zadam/trilium/issues/1129 */
+.printed-content .ck-widget__selection-handle, .printed-content .ck-widget__type-around { /* gets rid of triangles: https://github.com/zadam/trilium/issues/1129 */
     display: none;
 }
 
 /*
- * CKEditor 5 (v22.0.0) content styles.
- * Generated on Thu, 27 Aug 2020 12:13:06 GMT.
+ * CKEditor 5 (v24.0.0) content styles.
+ * Generated on Thu, 10 Dec 2020 08:15:26 GMT.
  * For more information, check out https://ckeditor.com/docs/ckeditor5/latest/builds/guides/integration/content-styles.html
  */
 
@@ -23,31 +23,19 @@
     --ck-todo-list-checkmark-size: 16px;
 }
 
-/* ckeditor5-highlight/theme/highlight.css */
-.ck-content .marker-yellow {
-    background-color: var(--ck-highlight-marker-yellow);
+/* ckeditor5-image/theme/imageresize.css */
+.ck-content .image.image_resized {
+    max-width: 100%;
+    display: block;
+    box-sizing: border-box;
 }
-/* ckeditor5-highlight/theme/highlight.css */
-.ck-content .marker-green {
-    background-color: var(--ck-highlight-marker-green);
+/* ckeditor5-image/theme/imageresize.css */
+.ck-content .image.image_resized img {
+    width: 100%;
 }
-/* ckeditor5-highlight/theme/highlight.css */
-.ck-content .marker-pink {
-    background-color: var(--ck-highlight-marker-pink);
-}
-/* ckeditor5-highlight/theme/highlight.css */
-.ck-content .marker-blue {
-    background-color: var(--ck-highlight-marker-blue);
-}
-/* ckeditor5-highlight/theme/highlight.css */
-.ck-content .pen-red {
-    color: var(--ck-highlight-pen-red);
-    background-color: transparent;
-}
-/* ckeditor5-highlight/theme/highlight.css */
-.ck-content .pen-green {
-    color: var(--ck-highlight-pen-green);
-    background-color: transparent;
+/* ckeditor5-image/theme/imageresize.css */
+.ck-content .image.image_resized > figcaption {
+    display: block;
 }
 /* ckeditor5-image/theme/imagestyle.css */
 .ck-content .image-style-side {
@@ -84,20 +72,6 @@
     max-width: 100%;
     min-width: 50px;
 }
-/* ckeditor5-image/theme/imageresize.css */
-.ck-content .image.image_resized {
-    max-width: 100%;
-    display: block;
-    box-sizing: border-box;
-}
-/* ckeditor5-image/theme/imageresize.css */
-.ck-content .image.image_resized img {
-    width: 100%;
-}
-/* ckeditor5-image/theme/imageresize.css */
-.ck-content .image.image_resized > figcaption {
-    display: block;
-}
 /* ckeditor5-image/theme/imagecaption.css */
 .ck-content .image > figcaption {
     display: table-caption;
@@ -109,11 +83,31 @@
     font-size: .75em;
     outline-offset: -1px;
 }
-/* ckeditor5-basic-styles/theme/code.css */
-.ck-content code {
-    background-color: hsla(0, 0%, 78%, 0.3);
-    padding: .15em;
-    border-radius: 2px;
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-yellow {
+    background-color: var(--ck-highlight-marker-yellow);
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-green {
+    background-color: var(--ck-highlight-marker-green);
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-pink {
+    background-color: var(--ck-highlight-marker-pink);
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .marker-blue {
+    background-color: var(--ck-highlight-marker-blue);
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .pen-red {
+    color: var(--ck-highlight-pen-red);
+    background-color: transparent;
+}
+/* ckeditor5-highlight/theme/highlight.css */
+.ck-content .pen-green {
+    color: var(--ck-highlight-pen-green);
+    background-color: transparent;
 }
 /* ckeditor5-font/theme/fontsize.css */
 .ck-content .text-tiny {
@@ -146,6 +140,12 @@
     border-left: 0;
     border-right: solid 5px hsl(0, 0%, 80%);
 }
+/* ckeditor5-basic-styles/theme/code.css */
+.ck-content code {
+    background-color: hsla(0, 0%, 78%, 0.3);
+    padding: .15em;
+    border-radius: 2px;
+}
 /* ckeditor5-table/theme/table.css */
 .ck-content .table {
     margin: 1em auto;
@@ -289,6 +289,12 @@
 .ck-content .todo-list .todo-list__label .todo-list__label__description {
     vertical-align: middle;
 }
+/* ckeditor5-html-embed/theme/htmlembed.css */
+.ck-content .raw-html-embed {
+    margin: 1em auto;
+    min-width: 15em;
+    font-style: normal;
+}
 /* ckeditor5-horizontal-line/theme/horizontalline.css */
 .ck-content hr {
     margin: 15px 0;
@@ -330,4 +336,4 @@
     .ck-content .page-break::after {
         display: none;
     }
-}
+}

libraries/codemirror/addon/edit/matchbrackets.js

@@ -118,16 +118,24 @@
   }
 
   CodeMirror.defineOption("matchBrackets", false, function(cm, val, old) {
-    if (old && old != CodeMirror.Init) {
-      cm.off("cursorActivity", doMatchBrackets);
+    function clear(cm) {
       if (cm.state.matchBrackets && cm.state.matchBrackets.currentlyHighlighted) {
         cm.state.matchBrackets.currentlyHighlighted();
         cm.state.matchBrackets.currentlyHighlighted = null;
       }
     }
+
+    if (old && old != CodeMirror.Init) {
+      cm.off("cursorActivity", doMatchBrackets);
+      cm.off("focus", doMatchBrackets)
+      cm.off("blur", clear)
+      clear(cm);
+    }
     if (val) {
       cm.state.matchBrackets = typeof val == "object" ? val : {};
       cm.on("cursorActivity", doMatchBrackets);
+      cm.on("focus", doMatchBrackets)
+      cm.on("blur", clear)
     }
   });
 

libraries/codemirror/addon/lint/lint.js

@@ -12,11 +12,14 @@
   "use strict";
   var GUTTER_ID = "CodeMirror-lint-markers";
 
-  function showTooltip(e, content) {
+  function showTooltip(cm, e, content) {
     var tt = document.createElement("div");
-    tt.className = "CodeMirror-lint-tooltip";
+    tt.className = "CodeMirror-lint-tooltip cm-s-" + cm.options.theme;
     tt.appendChild(content.cloneNode(true));
-    document.body.appendChild(tt);
+    if (cm.state.lint.options.selfContain)
+      cm.getWrapperElement().appendChild(tt);
+    else
+      document.body.appendChild(tt);
 
     function position(e) {
       if (!tt.parentNode) return CodeMirror.off(document, "mousemove", position);
@@ -38,8 +41,8 @@
     setTimeout(function() { rm(tt); }, 600);
   }
 
-  function showTooltipFor(e, content, node) {
-    var tooltip = showTooltip(e, content);
+  function showTooltipFor(cm, e, content, node) {
+    var tooltip = showTooltip(cm, e, content);
     function hide() {
       CodeMirror.off(node, "mouseout", hide);
       if (tooltip) { hideTooltip(tooltip); tooltip = null; }
@@ -78,7 +81,7 @@
     state.marked.length = 0;
   }
 
-  function makeMarker(labels, severity, multiple, tooltips) {
+  function makeMarker(cm, labels, severity, multiple, tooltips) {
     var marker = document.createElement("div"), inner = marker;
     marker.className = "CodeMirror-lint-marker-" + severity;
     if (multiple) {
@@ -87,7 +90,7 @@
     }
 
     if (tooltips != false) CodeMirror.on(inner, "mouseover", function(e) {
-      showTooltipFor(e, labels, inner);
+      showTooltipFor(cm, e, labels, inner);
     });
 
     return marker;
@@ -113,9 +116,9 @@
     var tip = document.createElement("div");
     tip.className = "CodeMirror-lint-message-" + severity;
     if (typeof ann.messageHTML != 'undefined') {
-        tip.innerHTML = ann.messageHTML;
+      tip.innerHTML = ann.messageHTML;
     } else {
-        tip.appendChild(document.createTextNode(ann.message));
+      tip.appendChild(document.createTextNode(ann.message));
     }
     return tip;
   }
@@ -186,7 +189,7 @@
       }
 
       if (state.hasGutter)
-        cm.setGutterMarker(line, GUTTER_ID, makeMarker(tipLabel, maxSeverity, anns.length > 1,
+        cm.setGutterMarker(line, GUTTER_ID, makeMarker(cm, tipLabel, maxSeverity, anns.length > 1,
                                                        state.options.tooltips));
     }
     if (options.onUpdateLinting) options.onUpdateLinting(annotationsNotSorted, annotations, cm);
@@ -199,14 +202,14 @@
     state.timeout = setTimeout(function(){startLinting(cm);}, state.options.delay || 500);
   }
 
-  function popupTooltips(annotations, e) {
+  function popupTooltips(cm, annotations, e) {
     var target = e.target || e.srcElement;
     var tooltip = document.createDocumentFragment();
     for (var i = 0; i < annotations.length; i++) {
       var ann = annotations[i];
       tooltip.appendChild(annotationTooltip(ann));
     }
-    showTooltipFor(e, tooltip, target);
+    showTooltipFor(cm, e, tooltip, target);
   }
 
   function onMouseOver(cm, e) {
@@ -220,7 +223,7 @@
       var ann = spans[i].__annotation;
       if (ann) annotations.push(ann);
     }
-    if (annotations.length) popupTooltips(annotations, e);
+    if (annotations.length) popupTooltips(cm, annotations, e);
   }
 
   CodeMirror.defineOption("lint", false, function(cm, val, old) {

libraries/codemirror/addon/mode/loadmode.js

@@ -16,8 +16,8 @@
     var countDown = n;
     return function() { if (--countDown == 0) cont(); };
   }
-  function ensureDeps(mode, cont) {
-    var deps = CodeMirror.modes[mode].dependencies;
+  function ensureDeps(mode, cont, options) {
+    var modeObj = CodeMirror.modes[mode], deps = modeObj && modeObj.dependencies;
     if (!deps) return cont();
     var missing = [];
     for (var i = 0; i < deps.length; ++i) {
@@ -27,16 +27,18 @@
     if (!missing.length) return cont();
     var split = splitCallback(cont, missing.length);
     for (var i = 0; i < missing.length; ++i)
-      CodeMirror.requireMode(missing[i], split);
+      CodeMirror.requireMode(missing[i], split, options);
   }
 
-  CodeMirror.requireMode = function(mode, cont) {
+  CodeMirror.requireMode = function(mode, cont, options) {
     if (typeof mode != "string") mode = mode.name;
-    if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont);
+    if (CodeMirror.modes.hasOwnProperty(mode)) return ensureDeps(mode, cont, options);
     if (loading.hasOwnProperty(mode)) return loading[mode].push(cont);
 
-    var file = CodeMirror.modeURL.replace(/%N/g, mode);
-    if (env == "plain") {
+    var file = options && options.path ? options.path(mode) : CodeMirror.modeURL.replace(/%N/g, mode);
+    if (options && options.loadMode) {
+      options.loadMode(file, function() { ensureDeps(mode, cont, options) })
+    } else if (env == "plain") {
       var script = document.createElement("script");
       script.src = file;
       var others = document.getElementsByTagName("script")[0];
@@ -44,7 +46,7 @@
       CodeMirror.on(script, "load", function() {
         ensureDeps(mode, function() {
           for (var i = 0; i < list.length; ++i) list[i]();
-        });
+        }, options);
       });
       others.parentNode.insertBefore(script, others);
     } else if (env == "cjs") {
@@ -55,10 +57,10 @@
     }
   };
 
-  CodeMirror.autoLoadMode = function(instance, mode) {
+  CodeMirror.autoLoadMode = function(instance, mode, options) {
     if (!CodeMirror.modes.hasOwnProperty(mode))
       CodeMirror.requireMode(mode, function() {
         instance.setOption("mode", instance.getOption("mode"));
-      });
+      }, options);
   };
 });

libraries/codemirror/addon/mode/simple.js

@@ -0,0 +1,216 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: https://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineSimpleMode = function(name, states) {
+    CodeMirror.defineMode(name, function(config) {
+      return CodeMirror.simpleMode(config, states);
+    });
+  };
+
+  CodeMirror.simpleMode = function(config, states) {
+    ensureState(states, "start");
+    var states_ = {}, meta = states.meta || {}, hasIndentation = false;
+    for (var state in states) if (state != meta && states.hasOwnProperty(state)) {
+      var list = states_[state] = [], orig = states[state];
+      for (var i = 0; i < orig.length; i++) {
+        var data = orig[i];
+        list.push(new Rule(data, states));
+        if (data.indent || data.dedent) hasIndentation = true;
+      }
+    }
+    var mode = {
+      startState: function() {
+        return {state: "start", pending: null,
+                local: null, localState: null,
+                indent: hasIndentation ? [] : null};
+      },
+      copyState: function(state) {
+        var s = {state: state.state, pending: state.pending,
+                 local: state.local, localState: null,
+                 indent: state.indent && state.indent.slice(0)};
+        if (state.localState)
+          s.localState = CodeMirror.copyState(state.local.mode, state.localState);
+        if (state.stack)
+          s.stack = state.stack.slice(0);
+        for (var pers = state.persistentStates; pers; pers = pers.next)
+          s.persistentStates = {mode: pers.mode,
+                                spec: pers.spec,
+                                state: pers.state == state.localState ? s.localState : CodeMirror.copyState(pers.mode, pers.state),
+                                next: s.persistentStates};
+        return s;
+      },
+      token: tokenFunction(states_, config),
+      innerMode: function(state) { return state.local && {mode: state.local.mode, state: state.localState}; },
+      indent: indentFunction(states_, meta)
+    };
+    if (meta) for (var prop in meta) if (meta.hasOwnProperty(prop))
+      mode[prop] = meta[prop];
+    return mode;
+  };
+
+  function ensureState(states, name) {
+    if (!states.hasOwnProperty(name))
+      throw new Error("Undefined state " + name + " in simple mode");
+  }
+
+  function toRegex(val, caret) {
+    if (!val) return /(?:)/;
+    var flags = "";
+    if (val instanceof RegExp) {
+      if (val.ignoreCase) flags = "i";
+      val = val.source;
+    } else {
+      val = String(val);
+    }
+    return new RegExp((caret === false ? "" : "^") + "(?:" + val + ")", flags);
+  }
+
+  function asToken(val) {
+    if (!val) return null;
+    if (val.apply) return val
+    if (typeof val == "string") return val.replace(/\./g, " ");
+    var result = [];
+    for (var i = 0; i < val.length; i++)
+      result.push(val[i] && val[i].replace(/\./g, " "));
+    return result;
+  }
+
+  function Rule(data, states) {
+    if (data.next || data.push) ensureState(states, data.next || data.push);
+    this.regex = toRegex(data.regex);
+    this.token = asToken(data.token);
+    this.data = data;
+  }
+
+  function tokenFunction(states, config) {
+    return function(stream, state) {
+      if (state.pending) {
+        var pend = state.pending.shift();
+        if (state.pending.length == 0) state.pending = null;
+        stream.pos += pend.text.length;
+        return pend.token;
+      }
+
+      if (state.local) {
+        if (state.local.end && stream.match(state.local.end)) {
+          var tok = state.local.endToken || null;
+          state.local = state.localState = null;
+          return tok;
+        } else {
+          var tok = state.local.mode.token(stream, state.localState), m;
+          if (state.local.endScan && (m = state.local.endScan.exec(stream.current())))
+            stream.pos = stream.start + m.index;
+          return tok;
+        }
+      }
+
+      var curState = states[state.state];
+      for (var i = 0; i < curState.length; i++) {
+        var rule = curState[i];
+        var matches = (!rule.data.sol || stream.sol()) && stream.match(rule.regex);
+        if (matches) {
+          if (rule.data.next) {
+            state.state = rule.data.next;
+          } else if (rule.data.push) {
+            (state.stack || (state.stack = [])).push(state.state);
+            state.state = rule.data.push;
+          } else if (rule.data.pop && state.stack && state.stack.length) {
+            state.state = state.stack.pop();
+          }
+
+          if (rule.data.mode)
+            enterLocalMode(config, state, rule.data.mode, rule.token);
+          if (rule.data.indent)
+            state.indent.push(stream.indentation() + config.indentUnit);
+          if (rule.data.dedent)
+            state.indent.pop();
+          var token = rule.token
+          if (token && token.apply) token = token(matches)
+          if (matches.length > 2 && rule.token && typeof rule.token != "string") {
+            state.pending = [];
+            for (var j = 2; j < matches.length; j++)
+              if (matches[j])
+                state.pending.push({text: matches[j], token: rule.token[j - 1]});
+            stream.backUp(matches[0].length - (matches[1] ? matches[1].length : 0));
+            return token[0];
+          } else if (token && token.join) {
+            return token[0];
+          } else {
+            return token;
+          }
+        }
+      }
+      stream.next();
+      return null;
+    };
+  }
+
+  function cmp(a, b) {
+    if (a === b) return true;
+    if (!a || typeof a != "object" || !b || typeof b != "object") return false;
+    var props = 0;
+    for (var prop in a) if (a.hasOwnProperty(prop)) {
+      if (!b.hasOwnProperty(prop) || !cmp(a[prop], b[prop])) return false;
+      props++;
+    }
+    for (var prop in b) if (b.hasOwnProperty(prop)) props--;
+    return props == 0;
+  }
+
+  function enterLocalMode(config, state, spec, token) {
+    var pers;
+    if (spec.persistent) for (var p = state.persistentStates; p && !pers; p = p.next)
+      if (spec.spec ? cmp(spec.spec, p.spec) : spec.mode == p.mode) pers = p;
+    var mode = pers ? pers.mode : spec.mode || CodeMirror.getMode(config, spec.spec);
+    var lState = pers ? pers.state : CodeMirror.startState(mode);
+    if (spec.persistent && !pers)
+      state.persistentStates = {mode: mode, spec: spec.spec, state: lState, next: state.persistentStates};
+
+    state.localState = lState;
+    state.local = {mode: mode,
+                   end: spec.end && toRegex(spec.end),
+                   endScan: spec.end && spec.forceEnd !== false && toRegex(spec.end, false),
+                   endToken: token && token.join ? token[token.length - 1] : token};
+  }
+
+  function indexOf(val, arr) {
+    for (var i = 0; i < arr.length; i++) if (arr[i] === val) return true;
+  }
+
+  function indentFunction(states, meta) {
+    return function(state, textAfter, line) {
+      if (state.local && state.local.mode.indent)
+        return state.local.mode.indent(state.localState, textAfter, line);
+      if (state.indent == null || state.local || meta.dontIndentStates && indexOf(state.state, meta.dontIndentStates) > -1)
+        return CodeMirror.Pass;
+
+      var pos = state.indent.length - 1, rules = states[state.state];
+      scan: for (;;) {
+        for (var i = 0; i < rules.length; i++) {
+          var rule = rules[i];
+          if (rule.data.dedent && rule.data.dedentIfLineStart !== false) {
+            var m = rule.regex.exec(textAfter);
+            if (m && m[0]) {
+              pos--;
+              if (rule.next || rule.push) rules = states[rule.next || rule.push];
+              textAfter = textAfter.slice(m[0].length);
+              continue scan;
+            }
+          }
+        }
+        break;
+      }
+      return pos < 0 ? 0 : state.indent[pos];
+    };
+  }
+});

libraries/codemirror/addon/search/match-highlighter.js

@@ -90,7 +90,9 @@
     var state = cm.state.matchHighlighter;
     cm.addOverlay(state.overlay = makeOverlay(query, hasBoundary, style));
     if (state.options.annotateScrollbar && cm.showMatchesOnScrollbar) {
-      var searchFor = hasBoundary ? new RegExp("\\b" + query.replace(/[\\\[.+*?(){|^$]/g, "\\$&") + "\\b") : query;
+      var searchFor = hasBoundary ? new RegExp((/\w/.test(query.charAt(0)) ? "\\b" : "") +
+                                               query.replace(/[\\\[.+*?(){|^$]/g, "\\$&") +
+                                               (/\w/.test(query.charAt(query.length - 1)) ? "\\b" : "")) : query;
       state.matchesonscroll = cm.showMatchesOnScrollbar(searchFor, false,
         {className: "CodeMirror-selection-highlight-scrollbar"});
     }

libraries/codemirror/codemirror.css

@@ -3,7 +3,7 @@
 .CodeMirror {
   /* Set height, width, borders, and global font properties here */
   font-family: monospace;
-  height: auto;
+  height: 300px;
   color: black;
   direction: ltr;
 }
@@ -164,17 +164,17 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 
 .CodeMirror-scroll {
   overflow: scroll !important; /* Things will break if this is overridden */
-  /* 30px is the magic margin used to hide the element's real scrollbars */
+  /* 50px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
+  margin-bottom: -50px; margin-right: -50px;
+  padding-bottom: 50px;
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
 }
 .CodeMirror-sizer {
   position: relative;
-  border-right: 30px solid transparent;
+  border-right: 50px solid transparent;
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
@@ -212,7 +212,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   height: 100%;
   display: inline-block;
   vertical-align: top;
-  margin-bottom: -30px;
+  margin-bottom: -50px;
 }
 .CodeMirror-gutter-wrapper {
   position: absolute;

libraries/codemirror/mode/apl/index.html

@@ -1,72 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: APL mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="./apl.js"></script>
-<style>
-	.CodeMirror { border: 2px inset #dee; }
-    </style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">APL</a>
-  </ul>
-</div>
-
-<article>
-<h2>APL mode</h2>
-<form><textarea id="code" name="code">
-⍝ Conway's game of life
-
-⍝ This example was inspired by the impressive demo at
-⍝ http://www.youtube.com/watch?v=a9xAKttWgP4
-
-⍝ Create a matrix:
-⍝     0 1 1
-⍝     1 1 0
-⍝     0 1 0
-creature ← (3 3 ⍴ ⍳ 9) ∈ 1 2 3 4 7   ⍝ Original creature from demo
-creature ← (3 3 ⍴ ⍳ 9) ∈ 1 3 6 7 8   ⍝ Glider
-
-⍝ Place the creature on a larger board, near the centre
-board ← ¯1 ⊖ ¯2 ⌽ 5 7 ↑ creature
-
-⍝ A function to move from one generation to the next
-life ← {∨/ 1 ⍵ ∧ 3 4 = ⊂+/ +⌿ 1 0 ¯1 ∘.⊖ 1 0 ¯1 ⌽¨ ⊂⍵}
-
-⍝ Compute n-th generation and format it as a
-⍝ character matrix
-gen ← {' #'[(life ⍣ ⍵) board]}
-
-⍝ Show first three generations
-(gen 1) (gen 2) (gen 3)
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/apl"
-      });
-    </script>
-
-    <p>Simple mode that tries to handle APL as well as it can.</p>
-    <p>It attempts to label functions/operators based upon
-    monadic/dyadic usage (but this is far from fully fleshed out).
-    This means there are meaningful classnames so hover states can
-    have popups etc.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/apl</code> (APL code)</p>
-  </article>

libraries/codemirror/mode/asciiarmor/index.html

@@ -1,46 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: ASCII Armor (PGP) mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="asciiarmor.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">ASCII Armor</a>
-  </ul>
-</div>
-
-<article>
-<h2>ASCII Armor (PGP) mode</h2>
-<form><textarea id="code" name="code">
------BEGIN PGP MESSAGE-----
-Version: OpenPrivacy 0.99
-
-yDgBO22WxBHv7O8X7O/jygAEzol56iUKiXmV+XmpCtmpqQUKiQrFqclFqUDBovzS
-vBSFjNSiVHsuAA==
-=njUN
------END PGP MESSAGE-----
-</textarea></form>
-
-<script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-  lineNumbers: true
-});
-</script>
-
-<p><strong>MIME types
-defined:</strong> <code>application/pgp</code>, <code>application/pgp-encrypted</code>, <code>application/pgp-keys</code>, <code>application/pgp-signature</code></p>
-
-</article>

libraries/codemirror/mode/asn.1/index.html

@@ -1,78 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: ASN.1 mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="asn.1.js"></script>
-<style>
-    .CodeMirror {
-        border-top: 1px solid black;
-        border-bottom: 1px solid black;
-    }
-</style>
-<div id=nav>
-    <a href="https://codemirror.net"><h1>CodeMirror</h1>
-        <img id=logo src="../../doc/logo.png">
-    </a>
-
-    <ul>
-        <li><a href="../../index.html">Home</a>
-        <li><a href="../../doc/manual.html">Manual</a>
-        <li><a href="https://github.com/codemirror/codemirror">Code</a>
-    </ul>
-    <ul>
-        <li><a href="../index.html">Language modes</a>
-        <li><a class=active href="http://en.wikipedia.org/wiki/Abstract_Syntax_Notation_One">ASN.1</a>
-    </ul>
-</div>
-<article>
-    <h2>ASN.1 example</h2>
-    <div>
-        <textarea id="ttcn-asn-code">
- --
- -- Sample ASN.1 Code
- --
- MyModule DEFINITIONS ::=
- BEGIN
-
- MyTypes ::= SEQUENCE {
-     myObjectId   OBJECT IDENTIFIER,
-     mySeqOf      SEQUENCE OF MyInt,
-     myBitString  BIT STRING {
-                         muxToken(0),
-                         modemToken(1)
-                  }
- }
-
- MyInt ::= INTEGER (0..65535)
-
- END
-        </textarea>
-    </div>
-
-    <script>
-        var ttcnEditor = CodeMirror.fromTextArea(document.getElementById("ttcn-asn-code"), {
-            lineNumbers: true,
-            matchBrackets: true,
-            mode: "text/x-ttcn-asn"
-        });
-        ttcnEditor.setSize(400, 400);
-        var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
-        CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
-    </script>
-    <br/>
-    <p><strong>Language:</strong> Abstract Syntax Notation One
-        (<a href="http://www.itu.int/en/ITU-T/asn1/Pages/introduction.aspx">ASN.1</a>)
-    </p>
-    <p><strong>MIME types defined:</strong> <code>text/x-ttcn-asn</code></p>
-
-    <br/>
-    <p>The development of this mode has been sponsored by <a href="http://www.ericsson.com/">Ericsson
-    </a>.</p>
-    <p>Coded by Asmelash Tsegay Gebretsadkan </p>
-</article>
-

libraries/codemirror/mode/asterisk/index.html

@@ -1,155 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Asterisk dialplan mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="asterisk.js"></script>
-<style>
-      .CodeMirror {border: 1px solid #999;}
-      .cm-s-default span.cm-arrow { color: red; }
-    </style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Asterisk dialplan</a>
-  </ul>
-</div>
-
-<article>
-<h2>Asterisk dialplan mode</h2>
-<form><textarea id="code" name="code">
-; extensions.conf - the Asterisk dial plan
-;
-
-[general]
-;
-; If static is set to no, or omitted, then the pbx_config will rewrite
-; this file when extensions are modified.  Remember that all comments
-; made in the file will be lost when that happens.
-static=yes
-
-#include "/etc/asterisk/additional_general.conf
-
-[iaxprovider]
-switch => IAX2/user:[key]@myserver/mycontext
-
-[dynamic]
-#exec /usr/bin/dynamic-peers.pl
-
-[trunkint]
-;
-; International long distance through trunk
-;
-exten => _9011.,1,Macro(dundi-e164,${EXTEN:4})
-exten => _9011.,n,Dial(${GLOBAL(TRUNK)}/${FILTER(0-9,${EXTEN:${GLOBAL(TRUNKMSD)}})})
-
-[local]
-;
-; Master context for local, toll-free, and iaxtel calls only
-;
-ignorepat => 9
-include => default
-
-[demo]
-include => stdexten
-;
-; We start with what to do when a call first comes in.
-;
-exten => s,1,Wait(1)			; Wait a second, just for fun
-same  => n,Answer			; Answer the line
-same  => n,Set(TIMEOUT(digit)=5)	; Set Digit Timeout to 5 seconds
-same  => n,Set(TIMEOUT(response)=10)	; Set Response Timeout to 10 seconds
-same  => n(restart),BackGround(demo-congrats)	; Play a congratulatory message
-same  => n(instruct),BackGround(demo-instruct)	; Play some instructions
-same  => n,WaitExten			; Wait for an extension to be dialed.
-
-exten => 2,1,BackGround(demo-moreinfo)	; Give some more information.
-exten => 2,n,Goto(s,instruct)
-
-exten => 3,1,Set(LANGUAGE()=fr)		; Set language to french
-exten => 3,n,Goto(s,restart)		; Start with the congratulations
-
-exten => 1000,1,Goto(default,s,1)
-;
-; We also create an example user, 1234, who is on the console and has
-; voicemail, etc.
-;
-exten => 1234,1,Playback(transfer,skip)		; "Please hold while..."
-					; (but skip if channel is not up)
-exten => 1234,n,Gosub(${EXTEN},stdexten(${GLOBAL(CONSOLE)}))
-exten => 1234,n,Goto(default,s,1)		; exited Voicemail
-
-exten => 1235,1,Voicemail(1234,u)		; Right to voicemail
-
-exten => 1236,1,Dial(Console/dsp)		; Ring forever
-exten => 1236,n,Voicemail(1234,b)		; Unless busy
-
-;
-; # for when they're done with the demo
-;
-exten => #,1,Playback(demo-thanks)	; "Thanks for trying the demo"
-exten => #,n,Hangup			; Hang them up.
-
-;
-; A timeout and "invalid extension rule"
-;
-exten => t,1,Goto(#,1)			; If they take too long, give up
-exten => i,1,Playback(invalid)		; "That's not valid, try again"
-
-;
-; Create an extension, 500, for dialing the
-; Asterisk demo.
-;
-exten => 500,1,Playback(demo-abouttotry); Let them know what's going on
-exten => 500,n,Dial(IAX2/guest@pbx.digium.com/s@default)	; Call the Asterisk demo
-exten => 500,n,Playback(demo-nogo)	; Couldn't connect to the demo site
-exten => 500,n,Goto(s,6)		; Return to the start over message.
-
-;
-; Create an extension, 600, for evaluating echo latency.
-;
-exten => 600,1,Playback(demo-echotest)	; Let them know what's going on
-exten => 600,n,Echo			; Do the echo test
-exten => 600,n,Playback(demo-echodone)	; Let them know it's over
-exten => 600,n,Goto(s,6)		; Start over
-
-;
-;	You can use the Macro Page to intercom a individual user
-exten => 76245,1,Macro(page,SIP/Grandstream1)
-; or if your peernames are the same as extensions
-exten => _7XXX,1,Macro(page,SIP/${EXTEN})
-;
-;
-; System Wide Page at extension 7999
-;
-exten => 7999,1,Set(TIMEOUT(absolute)=60)
-exten => 7999,2,Page(Local/Grandstream1@page&Local/Xlite1@page&Local/1234@page/n,d)
-
-; Give voicemail at extension 8500
-;
-exten => 8500,1,VoicemailMain
-exten => 8500,n,Goto(s,6)
-
-    </textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "text/x-asterisk",
-        matchBrackets: true,
-        lineNumbers: true
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-asterisk</code>.</p>
-
-  </article>

libraries/codemirror/mode/brainfuck/index.html

@@ -1,85 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Brainfuck mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="./brainfuck.js"></script>
-<style>
-	.CodeMirror { border: 2px inset #dee; }
-    </style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#"></a>
-  </ul>
-</div>
-
-<article>
-<h2>Brainfuck mode</h2>
-<form><textarea id="code" name="code">
-[ This program prints "Hello World!" and a newline to the screen, its
-  length is 106 active command characters [it is not the shortest.]
-
-  This loop is a "comment loop", it's a simple way of adding a comment
-  to a BF program such that you don't have to worry about any command
-  characters. Any ".", ",", "+", "-", "&lt;" and "&gt;" characters are simply
-  ignored, the "[" and "]" characters just have to be balanced.
-]
-+++++ +++               Set Cell #0 to 8
-[
-    &gt;++++               Add 4 to Cell #1; this will always set Cell #1 to 4
-    [                   as the cell will be cleared by the loop
-        &gt;++             Add 2 to Cell #2
-        &gt;+++            Add 3 to Cell #3
-        &gt;+++            Add 3 to Cell #4
-        &gt;+              Add 1 to Cell #5
-        &lt;&lt;&lt;&lt;-           Decrement the loop counter in Cell #1
-    ]                   Loop till Cell #1 is zero; number of iterations is 4
-    &gt;+                  Add 1 to Cell #2
-    &gt;+                  Add 1 to Cell #3
-    &gt;-                  Subtract 1 from Cell #4
-    &gt;&gt;+                 Add 1 to Cell #6
-    [&lt;]                 Move back to the first zero cell you find; this will
-                        be Cell #1 which was cleared by the previous loop
-    &lt;-                  Decrement the loop Counter in Cell #0
-]                       Loop till Cell #0 is zero; number of iterations is 8
-
-The result of this is:
-Cell No :   0   1   2   3   4   5   6
-Contents:   0   0  72 104  88  32   8
-Pointer :   ^
-
-&gt;&gt;.                     Cell #2 has value 72 which is 'H'
-&gt;---.                   Subtract 3 from Cell #3 to get 101 which is 'e'
-+++++++..+++.           Likewise for 'llo' from Cell #3
-&gt;&gt;.                     Cell #5 is 32 for the space
-&lt;-.                     Subtract 1 from Cell #4 for 87 to give a 'W'
-&lt;.                      Cell #3 was set to 'o' from the end of 'Hello'
-+++.------.--------.    Cell #3 for 'rl' and 'd'
-&gt;&gt;+.                    Add 1 to Cell #5 gives us an exclamation point
-&gt;++.                    And finally a newline from Cell #6
-</textarea></form>
-
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-brainfuck"
-      });
-    </script>
-
-    <p>A mode for Brainfuck</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-brainfuck</code></p>
-  </article>

libraries/codemirror/mode/clike/clike.js

@@ -270,6 +270,25 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     "static else struct switch extern typedef union for goto while enum const " +
     "volatile inline restrict asm fortran";
 
+  // Keywords from https://en.cppreference.com/w/cpp/keyword includes C++20.
+  var cppKeywords = "alignas alignof and and_eq audit axiom bitand bitor catch " +
+  "class compl concept constexpr const_cast decltype delete dynamic_cast " +
+  "explicit export final friend import module mutable namespace new noexcept " +
+  "not not_eq operator or or_eq override private protected public " +
+  "reinterpret_cast requires static_assert static_cast template this " +
+  "thread_local throw try typeid typename using virtual xor xor_eq";
+
+  var objCKeywords = "bycopy byref in inout oneway out self super atomic nonatomic retain copy " +
+  "readwrite readonly strong weak assign typeof nullable nonnull null_resettable _cmd " +
+  "@interface @implementation @end @protocol @encode @property @synthesize @dynamic @class " +
+  "@public @package @private @protected @required @optional @try @catch @finally @import " +
+  "@selector @encode @defs @synchronized @autoreleasepool @compatibility_alias @available";
+
+  var objCBuiltins = "FOUNDATION_EXPORT FOUNDATION_EXTERN NS_INLINE NS_FORMAT_FUNCTION " +
+  " NS_RETURNS_RETAINEDNS_ERROR_ENUM NS_RETURNS_NOT_RETAINED NS_RETURNS_INNER_POINTER " +
+  "NS_DESIGNATED_INITIALIZER NS_ENUM NS_OPTIONS NS_REQUIRES_NIL_TERMINATION " +
+  "NS_ASSUME_NONNULL_BEGIN NS_ASSUME_NONNULL_END NS_SWIFT_NAME NS_REFINED_FOR_SWIFT"
+
   // Do not use this. Use the cTypes function below. This is global just to avoid
   // excessive calls when cTypes is being called multiple times during a parse.
   var basicCTypes = words("int long char short double float unsigned signed " +
@@ -420,13 +439,7 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def(["text/x-c++src", "text/x-c++hdr"], {
     name: "clike",
-    // Keywords from https://en.cppreference.com/w/cpp/keyword includes C++20.
-    keywords: words(cKeywords + "alignas alignof and and_eq audit axiom bitand bitor catch " +
-                    "class compl concept constexpr const_cast decltype delete dynamic_cast " +
-                    "explicit export final friend import module mutable namespace new noexcept " +
-                    "not not_eq operator or or_eq override private protected public " +
-                    "reinterpret_cast requires static_assert static_cast template this " +
-                    "thread_local throw try typeid typename using virtual xor xor_eq"),
+    keywords: words(cKeywords + " " + cppKeywords),
     types: cTypes,
     blockKeywords: words(cBlockKeywords + " class try catch"),
     defKeywords: words(cDefKeywords + " class namespace"),
@@ -676,11 +689,16 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
         state.tokenize = tokenKotlinString(stream.match('""'));
         return state.tokenize(stream, state);
       },
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenNestedComment(1);
+        return state.tokenize(stream, state)
+      },
       indent: function(state, ctx, textAfter, indentUnit) {
         var firstChar = textAfter && textAfter.charAt(0);
         if ((state.prevToken == "}" || state.prevToken == ")") && textAfter == "")
           return state.indented;
-        if (state.prevToken == "operator" && textAfter != "}" ||
+        if ((state.prevToken == "operator" && textAfter != "}" && state.context.type != "}") ||
           state.prevToken == "variable" && firstChar == "." ||
           (state.prevToken == "}" || state.prevToken == ")") && firstChar == ".")
           return indentUnit * 2 + ctx.indented;
@@ -764,16 +782,9 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
 
   def("text/x-objectivec", {
     name: "clike",
-    keywords: words(cKeywords + " bycopy byref in inout oneway out self super atomic nonatomic retain copy " +
-                    "readwrite readonly strong weak assign typeof nullable nonnull null_resettable _cmd " +
-                    "@interface @implementation @end @protocol @encode @property @synthesize @dynamic @class " +
-                    "@public @package @private @protected @required @optional @try @catch @finally @import " +
-                    "@selector @encode @defs @synchronized @autoreleasepool @compatibility_alias @available"),
+    keywords: words(cKeywords + " " + objCKeywords),
     types: objCTypes,
-    builtin: words("FOUNDATION_EXPORT FOUNDATION_EXTERN NS_INLINE NS_FORMAT_FUNCTION NS_RETURNS_RETAINED " +
-                   "NS_ERROR_ENUM NS_RETURNS_NOT_RETAINED NS_RETURNS_INNER_POINTER NS_DESIGNATED_INITIALIZER " +
-                   "NS_ENUM NS_OPTIONS NS_REQUIRES_NIL_TERMINATION NS_ASSUME_NONNULL_BEGIN " +
-                   "NS_ASSUME_NONNULL_END NS_SWIFT_NAME NS_REFINED_FOR_SWIFT"),
+    builtin: words(objCBuiltins),
     blockKeywords: words(cBlockKeywords + " @synthesize @try @catch @finally @autoreleasepool @synchronized"),
     defKeywords: words(cDefKeywords + " @interface @implementation @protocol @class"),
     dontIndentStatements: /^@.*$/,
@@ -787,6 +798,46 @@ CodeMirror.defineMode("clike", function(config, parserConfig) {
     modeProps: {fold: ["brace", "include"]}
   });
 
+  def("text/x-objectivec++", {
+    name: "clike",
+    keywords: words(cKeywords + " " + objCKeywords + " " + cppKeywords),
+    types: objCTypes,
+    builtin: words(objCBuiltins),
+    blockKeywords: words(cBlockKeywords + " @synthesize @try @catch @finally @autoreleasepool @synchronized class try catch"),
+    defKeywords: words(cDefKeywords + " @interface @implementation @protocol @class class namespace"),
+    dontIndentStatements: /^@.*$|^template$/,
+    typeFirstDefinitions: true,
+    atoms: words("YES NO NULL Nil nil true false nullptr"),
+    isReservedIdentifier: cIsReservedIdentifier,
+    hooks: {
+      "#": cppHook,
+      "*": pointerHook,
+      "u": cpp11StringHook,
+      "U": cpp11StringHook,
+      "L": cpp11StringHook,
+      "R": cpp11StringHook,
+      "0": cpp14Literal,
+      "1": cpp14Literal,
+      "2": cpp14Literal,
+      "3": cpp14Literal,
+      "4": cpp14Literal,
+      "5": cpp14Literal,
+      "6": cpp14Literal,
+      "7": cpp14Literal,
+      "8": cpp14Literal,
+      "9": cpp14Literal,
+      token: function(stream, state, style) {
+        if (style == "variable" && stream.peek() == "(" &&
+            (state.prevToken == ";" || state.prevToken == null ||
+             state.prevToken == "}") &&
+            cppLooksLikeConstructor(stream.current()))
+          return "def";
+      }
+    },
+    namespaceSeparator: "::",
+    modeProps: {fold: ["brace", "include"]}
+  });
+
   def("text/x-squirrel", {
     name: "clike",
     keywords: words("base break clone continue const default delete enum extends function in class" +

libraries/codemirror/mode/clike/index.html

@@ -1,380 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: C-like mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<link rel="stylesheet" href="../../addon/hint/show-hint.css">
-<script src="../../addon/hint/show-hint.js"></script>
-<script src="clike.js"></script>
-<style>.CodeMirror {border: 2px inset #dee;}</style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">C-like</a>
-  </ul>
-</div>
-
-<article>
-<h2>C-like mode</h2>
-
-<div><textarea id="c-code">
-/* C demo code */
-
-#include <zmq.h>
-#include <pthread.h>
-#include <semaphore.h>
-#include <time.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <malloc.h>
-
-typedef struct {
-  void* arg_socket;
-  zmq_msg_t* arg_msg;
-  char* arg_string;
-  unsigned long arg_len;
-  int arg_int, arg_command;
-
-  int signal_fd;
-  int pad;
-  void* context;
-  sem_t sem;
-} acl_zmq_context;
-
-#define p(X) (context->arg_##X)
-
-void* zmq_thread(void* context_pointer) {
-  acl_zmq_context* context = (acl_zmq_context*)context_pointer;
-  char ok = 'K', err = 'X';
-  int res;
-
-  while (1) {
-    while ((res = sem_wait(&amp;context->sem)) == EINTR);
-    if (res) {write(context->signal_fd, &amp;err, 1); goto cleanup;}
-    switch(p(command)) {
-    case 0: goto cleanup;
-    case 1: p(socket) = zmq_socket(context->context, p(int)); break;
-    case 2: p(int) = zmq_close(p(socket)); break;
-    case 3: p(int) = zmq_bind(p(socket), p(string)); break;
-    case 4: p(int) = zmq_connect(p(socket), p(string)); break;
-    case 5: p(int) = zmq_getsockopt(p(socket), p(int), (void*)p(string), &amp;p(len)); break;
-    case 6: p(int) = zmq_setsockopt(p(socket), p(int), (void*)p(string), p(len)); break;
-    case 7: p(int) = zmq_send(p(socket), p(msg), p(int)); break;
-    case 8: p(int) = zmq_recv(p(socket), p(msg), p(int)); break;
-    case 9: p(int) = zmq_poll(p(socket), p(int), p(len)); break;
-    }
-    p(command) = errno;
-    write(context->signal_fd, &amp;ok, 1);
-  }
- cleanup:
-  close(context->signal_fd);
-  free(context_pointer);
-  return 0;
-}
-
-void* zmq_thread_init(void* zmq_context, int signal_fd) {
-  acl_zmq_context* context = malloc(sizeof(acl_zmq_context));
-  pthread_t thread;
-
-  context->context = zmq_context;
-  context->signal_fd = signal_fd;
-  sem_init(&amp;context->sem, 1, 0);
-  pthread_create(&amp;thread, 0, &amp;zmq_thread, context);
-  pthread_detach(thread);
-  return context;
-}
-</textarea></div>
-
-<h2>C++ example</h2>
-
-<div><textarea id="cpp-code">
-#include <iostream>
-#include "mystuff/util.h"
-
-namespace {
-enum Enum {
-  VAL1, VAL2, VAL3
-};
-
-char32_t unicode_string = U"\U0010FFFF";
-string raw_string = R"delim(anything
-you
-want)delim";
-
-int Helper(const MyType& param) {
-  return 0;
-}
-} // namespace
-
-class ForwardDec;
-
-template <class T, class V>
-class Class : public BaseClass {
-  const MyType<T, V> member_;
-
- public:
-  const MyType<T, V>& Method() const {
-    return member_;
-  }
-
-  void Method2(MyType<T, V>* value);
-}
-
-template <class T, class V>
-void Class::Method2(MyType<T, V>* value) {
-  std::out << 1 >> method();
-  value->Method3(member_);
-  member_ = value;
-}
-</textarea></div>
-
-<h2>Objective-C example</h2>
-
-<div><textarea id="objectivec-code">
-/*
-This is a longer comment
-That spans two lines
-*/
-
-#import "MyClass.h"
-#import <AFramework/AFrameork.h>
-@import BFrameworkModule;
-
-NS_ENUM(SomeValues) {
-  aValue = 1;
-};
-
-// A Class Extension with some properties
-@interface MyClass ()<AProtocol>
-@property(atomic, readwrite, assign) NSInteger anInt;
-@property(nonatomic, strong, nullable) NSString *aString;
-@end
-
-@implementation YourAppDelegate
-
-- (instancetype)initWithString:(NSString *)aStringVar {
-  if ((self = [super init])) {
-    aString = aStringVar;
-  }
-  return self;
-}
-
-- (BOOL)doSomething:(float)progress {
-  NSString *myString = @"This is a ObjC string %f ";
-  myString = [[NSString stringWithFormat:myString, progress] stringByAppendingString:self.aString];
-  return myString.length > 100 ? NO : YES;
-}
-
-@end
-</textarea></div>
-
-<h2>Java example</h2>
-
-<div><textarea id="java-code">
-import com.demo.util.MyType;
-import com.demo.util.MyInterface;
-
-public enum Enum {
-  VAL1, VAL2, VAL3
-}
-
-public class Class<T, V> implements MyInterface {
-  public static final MyType<T, V> member;
-  
-  private class InnerClass {
-    public int zero() {
-      return 0;
-    }
-  }
-
-  @Override
-  public MyType method() {
-    return member;
-  }
-
-  public void method2(MyType<T, V> value) {
-    method();
-    value.method3();
-    member = value;
-  }
-}
-</textarea></div>
-
-<h2>Scala example</h2>
-
-<div><textarea id="scala-code">
-object FilterTest extends App {
-  def filter(xs: List[Int], threshold: Int) = {
-    def process(ys: List[Int]): List[Int] =
-      if (ys.isEmpty) ys
-      else if (ys.head < threshold) ys.head :: process(ys.tail)
-      else process(ys.tail)
-    process(xs)
-  }
-  println(filter(List(1, 9, 2, 8, 3, 7, 4), 5))
-}
-</textarea></div>
-
-<h2>Kotlin mode</h2>
-
-<div><textarea id="kotlin-code">
-package org.wasabi.http
-
-import java.util.concurrent.Executors
-import java.net.InetSocketAddress
-import org.wasabi.app.AppConfiguration
-import io.netty.bootstrap.ServerBootstrap
-import io.netty.channel.nio.NioEventLoopGroup
-import io.netty.channel.socket.nio.NioServerSocketChannel
-import org.wasabi.app.AppServer
-
-public class HttpServer(private val appServer: AppServer) {
-
-    val bootstrap: ServerBootstrap
-    val primaryGroup: NioEventLoopGroup
-    val workerGroup:  NioEventLoopGroup
-
-    init {
-        // Define worker groups
-        primaryGroup = NioEventLoopGroup()
-        workerGroup = NioEventLoopGroup()
-
-        // Initialize bootstrap of server
-        bootstrap = ServerBootstrap()
-
-        bootstrap.group(primaryGroup, workerGroup)
-        bootstrap.channel(javaClass<NioServerSocketChannel>())
-        bootstrap.childHandler(NettyPipelineInitializer(appServer))
-    }
-
-    public fun start(wait: Boolean = true) {
-        val channel = bootstrap.bind(appServer.configuration.port)?.sync()?.channel()
-
-        if (wait) {
-            channel?.closeFuture()?.sync()
-        }
-    }
-
-    public fun stop() {
-        // Shutdown all event loops
-        primaryGroup.shutdownGracefully()
-        workerGroup.shutdownGracefully()
-
-        // Wait till all threads are terminated
-        primaryGroup.terminationFuture().sync()
-        workerGroup.terminationFuture().sync()
-    }
-}
-</textarea></div>
-
-<h2>Ceylon mode</h2>
-
-<div><textarea id="ceylon-code">
-"Produces the [[stream|Iterable]] that results from repeated
- application of the given [[function|next]] to the given
- [[first]] element of the stream, until the function first
- returns [[finished]]. If the given function never returns 
- `finished`, the resulting stream is infinite.
-
- For example:
-
-     loop(0)(2.plus).takeWhile(10.largerThan)
-
- produces the stream `{ 0, 2, 4, 6, 8 }`."
-tagged("Streams")
-shared {Element+} loop&lt;Element&gt;(
-        "The first element of the resulting stream."
-        Element first)(
-        "The function that produces the next element of the
-         stream, given the current element. The function may
-         return [[finished]] to indicate the end of the 
-         stream."
-        Element|Finished next(Element element))
-    =&gt; let (start = first)
-    object satisfies {Element+} {
-        first =&gt; start;
-        empty =&gt; false;
-        function nextElement(Element element)
-                =&gt; next(element);
-        iterator()
-                =&gt; object satisfies Iterator&lt;Element&gt; {
-            variable Element|Finished current = start;
-            shared actual Element|Finished next() {
-                if (!is Finished result = current) {
-                    current = nextElement(result);
-                    return result;
-                }
-                else {
-                    return finished;
-                }
-            }
-        };
-    };
-</textarea></div>
-
-    <script>
-      var cEditor = CodeMirror.fromTextArea(document.getElementById("c-code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-csrc"
-      });
-      var cppEditor = CodeMirror.fromTextArea(document.getElementById("cpp-code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-c++src"
-      });
-      var javaEditor = CodeMirror.fromTextArea(document.getElementById("java-code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-java"
-      });
-      var objectivecEditor = CodeMirror.fromTextArea(document.getElementById("objectivec-code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-objectivec"
-      });
-      var scalaEditor = CodeMirror.fromTextArea(document.getElementById("scala-code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-scala"
-      });
-      var kotlinEditor = CodeMirror.fromTextArea(document.getElementById("kotlin-code"), {
-          lineNumbers: true,
-          matchBrackets: true,
-          mode: "text/x-kotlin"
-      });
-      var ceylonEditor = CodeMirror.fromTextArea(document.getElementById("ceylon-code"), {
-          lineNumbers: true,
-          matchBrackets: true,
-          mode: "text/x-ceylon"
-      });
-      var mac = CodeMirror.keyMap.default == CodeMirror.keyMap.macDefault;
-      CodeMirror.keyMap.default[(mac ? "Cmd" : "Ctrl") + "-Space"] = "autocomplete";
-    </script>
-
-    <p>Simple mode that tries to handle C-like languages as well as it
-    can. Takes two configuration parameters: <code>keywords</code>, an
-    object whose property names are the keywords in the language,
-    and <code>useCPP</code>, which determines whether C preprocessor
-    directives are recognized.</p>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-csrc</code>
-    (C), <code>text/x-c++src</code> (C++), <code>text/x-java</code>
-    (Java), <code>text/x-csharp</code> (C#),
-    <code>text/x-objectivec</code> (Objective-C),
-    <code>text/x-scala</code> (Scala), <code>text/x-vertex</code>
-    <code>x-shader/x-fragment</code> (shader programs),
-    <code>text/x-squirrel</code> (Squirrel) and
-    <code>text/x-ceylon</code> (Ceylon)</p>
-</article>

libraries/codemirror/mode/clike/scala.html

@@ -10,7 +10,7 @@
 <script src="../../addon/edit/matchbrackets.js"></script>
 <script src="clike.js"></script>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>

libraries/codemirror/mode/clike/test.js

@@ -1,165 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
-
-(function() {
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-c");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1)); }
-
-  MT("indent",
-     "[type void] [def foo]([type void*] [variable a], [type int] [variable b]) {",
-     "  [type int] [variable c] [operator =] [variable b] [operator +]",
-     "    [number 1];",
-     "  [keyword return] [operator *][variable a];",
-     "}");
-
-  MT("indent_switch",
-     "[keyword switch] ([variable x]) {",
-     "  [keyword case] [number 10]:",
-     "    [keyword return] [number 20];",
-     "  [keyword default]:",
-     "    [variable printf]([string \"foo %c\"], [variable x]);",
-     "}");
-
-  MT("def",
-     "[type void] [def foo]() {}",
-     "[keyword struct] [def bar]{}",
-     "[keyword enum] [def zot]{}",
-     "[keyword union] [def ugh]{}",
-     "[type int] [type *][def baz]() {}");
-
-  MT("def_new_line",
-     "::[variable std]::[variable SomeTerribleType][operator <][variable T][operator >]",
-     "[def SomeLongMethodNameThatDoesntFitIntoOneLine]([keyword const] [variable MyType][operator &] [variable param]) {}")
-
-  MT("double_block",
-     "[keyword for] (;;)",
-     "  [keyword for] (;;)",
-     "    [variable x][operator ++];",
-     "[keyword return];");
-
-  MT("preprocessor",
-     "[meta #define FOO 3]",
-     "[type int] [variable foo];",
-     "[meta #define BAR\\]",
-     "[meta 4]",
-     "[type unsigned] [type int] [variable bar] [operator =] [number 8];",
-     "[meta #include <baz> ][comment // comment]")
-
-  MT("c_underscores",
-     "[builtin __FOO];",
-     "[builtin _Complex];",
-     "[builtin __aName];",
-     "[variable _aName];");
-
-  MT("c_types",
-    "[type int];",
-    "[type long];",
-    "[type char];",
-    "[type short];",
-    "[type double];",
-    "[type float];",
-    "[type unsigned];",
-    "[type signed];",
-    "[type void];",
-    "[type bool];",
-    "[type foo_t];",
-    "[variable foo_T];",
-    "[variable _t];");
-
-  var mode_cpp = CodeMirror.getMode({indentUnit: 2}, "text/x-c++src");
-  function MTCPP(name) { test.mode(name, mode_cpp, Array.prototype.slice.call(arguments, 1)); }
-
-  MTCPP("cpp14_literal",
-    "[number 10'000];",
-    "[number 0b10'000];",
-    "[number 0x10'000];",
-    "[string '100000'];");
-
-  MTCPP("ctor_dtor",
-     "[def Foo::Foo]() {}",
-     "[def Foo::~Foo]() {}");
-
-  MTCPP("cpp_underscores",
-        "[builtin __FOO];",
-        "[builtin _Complex];",
-        "[builtin __aName];",
-        "[variable _aName];");
-
-  var mode_objc = CodeMirror.getMode({indentUnit: 2}, "text/x-objectivec");
-  function MTOBJC(name) { test.mode(name, mode_objc, Array.prototype.slice.call(arguments, 1)); }
-
-  MTOBJC("objc_underscores",
-         "[builtin __FOO];",
-         "[builtin _Complex];",
-         "[builtin __aName];",
-         "[variable _aName];");
-
-  MTOBJC("objc_interface",
-         "[keyword @interface] [def foo] {",
-         "  [type int] [variable bar];",
-         "}",
-         "[keyword @property] ([keyword atomic], [keyword nullable]) [variable NSString][operator *] [variable a];",
-         "[keyword @property] ([keyword nonatomic], [keyword assign]) [type int] [variable b];",
-         "[operator -]([type instancetype])[variable initWithFoo]:([type int])[variable a] " +
-           "[builtin NS_DESIGNATED_INITIALIZER];",
-         "[keyword @end]");
-
-  MTOBJC("objc_implementation",
-         "[keyword @implementation] [def foo] {",
-         "  [type int] [variable bar];",
-         "}",
-         "[keyword @property] ([keyword readwrite]) [type SEL] [variable a];",
-         "[operator -]([type instancetype])[variable initWithFoo]:([type int])[variable a] {",
-         "  [keyword if](([keyword self] [operator =] [[[keyword super] [variable init] ]])) {}",
-         "  [keyword return] [keyword self];",
-         "}",
-         "[keyword @end]");
-
-  MTOBJC("objc_types",
-         "[type int];",
-         "[type foo_t];",
-         "[variable foo_T];",
-         "[type id];",
-         "[type SEL];",
-         "[type instancetype];",
-         "[type Class];",
-         "[type Protocol];",
-         "[type BOOL];"
-         );
-
-  var mode_scala = CodeMirror.getMode({indentUnit: 2}, "text/x-scala");
-  function MTSCALA(name) { test.mode("scala_" + name, mode_scala, Array.prototype.slice.call(arguments, 1)); }
-  MTSCALA("nested_comments",
-     "[comment /*]",
-     "[comment But wait /* this is a nested comment */ for real]",
-     "[comment /**** let * me * show * you ****/]",
-     "[comment ///// let / me / show / you /////]",
-     "[comment */]");
-
-  var mode_java = CodeMirror.getMode({indentUnit: 2}, "text/x-java");
-  function MTJAVA(name) { test.mode("java_" + name, mode_java, Array.prototype.slice.call(arguments, 1)); }
-  MTJAVA("types",
-         "[type byte];",
-         "[type short];",
-         "[type int];",
-         "[type long];",
-         "[type float];",
-         "[type double];",
-         "[type boolean];",
-         "[type char];",
-         "[type void];",
-         "[type Boolean];",
-         "[type Byte];",
-         "[type Character];",
-         "[type Double];",
-         "[type Float];",
-         "[type Integer];",
-         "[type Long];",
-         "[type Number];",
-         "[type Object];",
-         "[type Short];",
-         "[type String];",
-         "[type StringBuffer];",
-         "[type StringBuilder];",
-         "[type Void];");
-})();

libraries/codemirror/mode/clojure/index.html

@@ -1,95 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Clojure mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/closebrackets.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="clojure.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Clojure</a>
-  </ul>
-</div>
-
-<article>
-<h2>Clojure mode</h2>
-<form><textarea id="code" name="code">
-(ns game-of-life
-  "Conway's Game of Life, based on the work of
-  Christophe Grand (http://clj-me.cgrand.net/2011/08/19/conways-game-of-life)
-  and Laurent Petit (https://gist.github.com/1200343).")
-
-;;; Core game of life's algorithm functions
-
-(defn neighbors
-  "Given a cell's coordinates `[x y]`, returns the coordinates of its
-  neighbors."
-  [[x y]]
-  (for [dx [-1 0 1]
-        dy (if (zero? dx)
-             [-1 1]
-             [-1 0 1])]
-    [(+ dx x) (+ dy y)]))
-
-(defn step
-  "Given a set of living `cells`, computes the new set of living cells."
-  [cells]
-  (set (for [[cell n] (frequencies (mapcat neighbors cells))
-             :when (or (= n 3)
-                       (and (= n 2)
-                            (cells cell)))]
-         cell)))
-
-;;; Utility methods for displaying game on a text terminal
-
-(defn print-grid
-  "Prints a `grid` of `w` columns and `h` rows, on *out*, representing a
-  step in the game."
-  [grid w h]
-  (doseq [x (range (inc w))
-          y (range (inc h))]
-    (when (= y 0) (println))
-    (print (if (grid [x y])
-             "[X]"
-             " . "))))
-
-(defn print-grids
-  "Prints a sequence of `grids` of `w` columns and `h` rows on *out*,
-  representing several steps."
-  [grids w h]
-  (doseq [grid grids]
-    (print-grid grid w h)
-    (println)))
-
-;;; Launches an example grid
-
-(def grid
-  "`grid` represents the initial set of living cells"
-  #{[2 1] [2 2] [2 3]})
-
-(print-grids (take 3 (iterate step grid)) 5 5)</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-          autoCloseBrackets: true,
-          lineNumbers: true,
-          matchBrackets: true,
-          mode: 'text/x-clojure'
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-clojure</code>.</p>
-
-  </article>

libraries/codemirror/mode/clojure/test.js

@@ -1,384 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
-
-(function () {
-    var mode = CodeMirror.getMode({indentUnit: 2}, "clojure");
-
-    function MT(name) {
-        test.mode(name, mode, Array.prototype.slice.call(arguments, 1));
-    }
-
-    MT("atoms",
-        "[atom false]",
-        "[atom nil]",
-        "[atom true]"
-    );
-
-    MT("keywords",
-        "[atom :foo]",
-        "[atom ::bar]",
-        "[atom :foo/bar]",
-        "[atom :foo.bar/baz]"
-    );
-
-    MT("numbers",
-        "[number 42] [number +42] [number -421]",
-        "[number 42N] [number +42N] [number -42N]",
-        "[number 0.42] [number +0.42] [number -0.42]",
-        "[number 42M] [number +42M] [number -42M]",
-        "[number 42.42M] [number +42.42M] [number -42.42M]",
-        "[number 1/42] [number +1/42] [number -1/42]",
-        "[number 0x42af] [number +0x42af] [number -0x42af]",
-        "[number 0x42AF] [number +0x42AF] [number -0x42AF]",
-        "[number 1e2] [number 1e+2] [number 1e-2]",
-        "[number +1e2] [number +1e+2] [number +1e-2]",
-        "[number -1e2] [number -1e+2] [number -1e-2]",
-        "[number -1.0e2] [number -0.1e+2] [number -1.01e-2]",
-        "[number 1E2] [number 1E+2] [number 1E-2]",
-        "[number +1E2] [number +1E+2] [number +1E-2]",
-        "[number -1E2] [number -1E+2] [number -1E-2]",
-        "[number -1.0E2] [number -0.1E+2] [number -1.01E-2]",
-        "[number 2r101010] [number +2r101010] [number -2r101010]",
-        "[number 2r101010] [number +2r101010] [number -2r101010]",
-        "[number 8r52] [number +8r52] [number -8r52]",
-        "[number 36rhello] [number +36rhello] [number -36rhello]",
-        "[number 36rz] [number +36rz] [number -36rz]",
-        "[number 36rZ] [number +36rZ] [number -36rZ]",
-
-        // invalid numbers
-        "[error 42foo]",
-        "[error 42Nfoo]",
-        "[error 42Mfoo]",
-        "[error 42.42Mfoo]",
-        "[error 42.42M!]",
-        "[error 42!]",
-        "[error 0x42afm]"
-    );
-
-    MT("characters",
-        "[string-2 \\1]",
-        "[string-2 \\a]",
-        "[string-2 \\a\\b\\c]",
-        "[string-2 \\#]",
-        "[string-2 \\\\]",
-        "[string-2 \\\"]",
-        "[string-2 \\(]",
-        "[string-2 \\A]",
-        "[string-2 \\backspace]",
-        "[string-2 \\formfeed]",
-        "[string-2 \\newline]",
-        "[string-2 \\space]",
-        "[string-2 \\return]",
-        "[string-2 \\tab]",
-        "[string-2 \\u1000]",
-        "[string-2 \\uAaAa]",
-        "[string-2 \\u9F9F]",
-        "[string-2 \\o123]",
-        "[string-2 \\符]",
-        "[string-2 \\シ]",
-        "[string-2 \\ۇ]",
-        // FIXME
-        // "[string-2 \\🙂]",
-
-        // invalid character literals
-        "[error \\abc]",
-        "[error \\a123]",
-        "[error \\a!]",
-        "[error \\newlines]",
-        "[error \\NEWLINE]",
-        "[error \\u9F9FF]",
-        "[error \\o1234]"
-    );
-
-    MT("strings",
-        "[string \"I'm a teapot.\"]",
-        "[string \"I'm a \\\"teapot\\\".\"]",
-        "[string \"I'm]",       // this is
-        "[string a]",           // a multi-line
-        "[string teapot.\"]"    // string
-
-        // TODO unterminated (multi-line) strings?
-    );
-
-    MT("comments",
-        "[comment ; this is an in-line comment.]",
-        "[comment ;; this is a line comment.]",
-        "[keyword comment]",
-        "[bracket (][comment comment (foo 1 2 3)][bracket )]"
-    );
-
-    MT("reader macro characters",
-        "[meta #][variable _]",
-        "[meta #][variable -Inf]",
-        "[meta ##][variable Inf]",
-        "[meta ##][variable NaN]",
-        "[meta @][variable x]",
-        "[meta ^][bracket {][atom :tag] [variable String][bracket }]",
-        "[meta `][bracket (][builtin f] [variable x][bracket )]",
-        "[meta ~][variable foo#]",
-        "[meta '][number 1]",
-        "[meta '][atom :foo]",
-        "[meta '][string \"foo\"]",
-        "[meta '][variable x]",
-        "[meta '][bracket (][builtin a] [variable b] [variable c][bracket )]",
-        "[meta '][bracket [[][variable a] [variable b] [variable c][bracket ]]]",
-        "[meta '][bracket {][variable a] [number 1] [atom :foo] [number 2] [variable c] [number 3][bracket }]",
-        "[meta '#][bracket {][variable a] [number 1] [atom :foo][bracket }]"
-    );
-
-    MT("symbols",
-      "[variable foo!]",
-      "[variable foo#]",
-      "[variable foo$]",
-      "[variable foo&]",
-      "[variable foo']",
-      "[variable foo*]",
-      "[variable foo+]",
-      "[variable foo-]",
-      "[variable foo.]",
-      "[variable foo/bar]",
-      "[variable foo:bar]",
-      "[variable foo<]",
-      "[variable foo=]",
-      "[variable foo>]",
-      "[variable foo?]",
-      "[variable foo_]",
-      "[variable foo|]",
-      "[variable foobarBaz]",
-      "[variable foo¡]",
-      "[variable 符号]",
-      "[variable シンボル]",
-      "[variable ئۇيغۇر]",
-      "[variable 🙂❤🇺🇸]",
-
-      // invalid symbols
-      "[error 3foo]",
-      "[error 3+]",
-      "[error 3|]",
-      "[error 3_]"
-    );
-
-    MT("numbers and other forms",
-      "[number 42][bracket (][builtin foo][bracket )]",
-      "[number 42][bracket [[][variable foo][bracket ]]]",
-      "[number 42][meta #][bracket {][variable foo][bracket }]",
-      "[number 42][bracket {][atom :foo] [variable bar][bracket }]",
-      "[number 42][meta `][variable foo]",
-      "[number 42][meta ~][variable foo]",
-      "[number 42][meta #][variable foo]"
-    );
-
-    var specialForms = [".", "catch", "def", "do", "if", "monitor-enter",
-        "monitor-exit", "new", "quote", "recur", "set!", "throw", "try", "var"];
-
-    MT("should highlight special forms as keywords",
-        typeTokenPairs("keyword", specialForms)
-    );
-
-    var coreSymbols1 = [
-        "*", "*'", "*1", "*2", "*3", "*agent*", "*allow-unresolved-vars*", "*assert*",
-        "*clojure-version*", "*command-line-args*", "*compile-files*", "*compile-path*", "*compiler-options*",
-        "*data-readers*", "*default-data-reader-fn*", "*e", "*err*", "*file*", "*flush-on-newline*", "*fn-loader*",
-        "*in*", "*math-context*", "*ns*", "*out*", "*print-dup*", "*print-length*", "*print-level*", "*print-meta*",
-        "*print-namespace-maps*", "*print-readably*", "*read-eval*", "*reader-resolver*", "*source-path*",
-        "*suppress-read*", "*unchecked-math*", "*use-context-classloader*", "*verbose-defrecords*",
-        "*warn-on-reflection*", "+", "+'", "-", "-'", "->", "->>", "->ArrayChunk", "->Eduction", "->Vec", "->VecNode",
-        "->VecSeq", "-cache-protocol-fn", "-reset-methods", "..", "/", "<", "<=", "=", "==", ">", ">=",
-        "EMPTY-NODE", "Inst", "StackTraceElement->vec", "Throwable->map", "accessor", "aclone", "add-classpath",
-        "add-watch", "agent", "agent-error", "agent-errors", "aget", "alength", "alias", "all-ns", "alter",
-        "alter-meta!", "alter-var-root", "amap", "ancestors", "and", "any?", "apply", "areduce", "array-map",
-        "as->", "aset", "aset-boolean", "aset-byte", "aset-char", "aset-double", "aset-float", "aset-int",
-        "aset-long", "aset-short", "assert", "assoc", "assoc!", "assoc-in", "associative?", "atom", "await",
-        "await-for", "await1", "bases", "bean", "bigdec", "bigint", "biginteger", "binding", "bit-and", "bit-and-not",
-        "bit-clear", "bit-flip", "bit-not", "bit-or", "bit-set", "bit-shift-left", "bit-shift-right", "bit-test",
-        "bit-xor", "boolean", "boolean-array", "boolean?", "booleans", "bound-fn", "bound-fn*", "bound?",
-        "bounded-count", "butlast", "byte", "byte-array", "bytes", "bytes?", "case", "cast", "cat", "char",
-        "char-array", "char-escape-string", "char-name-string", "char?", "chars", "chunk", "chunk-append",
-        "chunk-buffer", "chunk-cons", "chunk-first", "chunk-next", "chunk-rest", "chunked-seq?", "class", "class?",
-        "clear-agent-errors", "clojure-version", "coll?", "comment", "commute", "comp", "comparator", "compare",
-        "compare-and-set!", "compile", "complement", "completing", "concat", "cond", "cond->", "cond->>", "condp",
-        "conj", "conj!", "cons", "constantly", "construct-proxy", "contains?", "count", "counted?", "create-ns",
-        "create-struct", "cycle", "dec", "dec'", "decimal?", "declare", "dedupe", "default-data-readers", "definline",
-        "definterface", "defmacro", "defmethod", "defmulti", "defn", "defn-", "defonce", "defprotocol", "defrecord",
-        "defstruct", "deftype", "delay", "delay?", "deliver", "denominator", "deref", "derive", "descendants",
-        "destructure", "disj", "disj!", "dissoc", "dissoc!", "distinct", "distinct?", "doall", "dorun", "doseq",
-        "dosync", "dotimes", "doto", "double", "double-array", "double?", "doubles", "drop", "drop-last", "drop-while",
-        "eduction", "empty", "empty?", "ensure", "ensure-reduced", "enumeration-seq", "error-handler", "error-mode",
-        "eval", "even?", "every-pred", "every?", "ex-data", "ex-info", "extend", "extend-protocol", "extend-type",
-        "extenders", "extends?", "false?", "ffirst", "file-seq", "filter", "filterv", "find", "find-keyword", "find-ns",
-        "find-protocol-impl", "find-protocol-method", "find-var", "first", "flatten", "float", "float-array", "float?",
-        "floats", "flush", "fn", "fn?", "fnext", "fnil", "for", "force", "format", "frequencies", "future", "future-call",
-        "future-cancel", "future-cancelled?", "future-done?", "future?", "gen-class", "gen-interface", "gensym", "get",
-        "get-in", "get-method", "get-proxy-class", "get-thread-bindings", "get-validator", "group-by", "halt-when", "hash",
-        "hash-combine", "hash-map", "hash-ordered-coll", "hash-set", "hash-unordered-coll", "ident?", "identical?",
-        "identity", "if-let", "if-not", "if-some", "ifn?", "import", "in-ns", "inc", "inc'", "indexed?", "init-proxy",
-        "inst-ms", "inst-ms*", "inst?", "instance?", "int", "int-array", "int?", "integer?", "interleave", "intern",
-        "interpose", "into", "into-array", "ints", "io!", "isa?", "iterate", "iterator-seq", "juxt", "keep", "keep-indexed",
-        "key", "keys", "keyword", "keyword?", "last", "lazy-cat", "lazy-seq", "let", "letfn", "line-seq", "list", "list*",
-        "list?", "load", "load-file", "load-reader", "load-string", "loaded-libs", "locking", "long", "long-array", "longs",
-        "loop", "macroexpand", "macroexpand-1", "make-array", "make-hierarchy", "map", "map-entry?", "map-indexed", "map?",
-        "mapcat", "mapv", "max", "max-key", "memfn", "memoize", "merge", "merge-with", "meta", "method-sig", "methods"];
-
-    var coreSymbols2 = [
-        "min", "min-key", "mix-collection-hash", "mod", "munge", "name", "namespace", "namespace-munge", "nat-int?",
-        "neg-int?", "neg?", "newline", "next", "nfirst", "nil?", "nnext", "not", "not-any?", "not-empty", "not-every?",
-        "not=", "ns", "ns-aliases", "ns-imports", "ns-interns", "ns-map", "ns-name", "ns-publics", "ns-refers", "ns-resolve",
-        "ns-unalias", "ns-unmap", "nth", "nthnext", "nthrest", "num", "number?", "numerator", "object-array", "odd?", "or",
-        "parents", "partial", "partition", "partition-all", "partition-by", "pcalls", "peek", "persistent!", "pmap", "pop",
-        "pop!", "pop-thread-bindings", "pos-int?", "pos?", "pr", "pr-str", "prefer-method", "prefers",
-        "primitives-classnames", "print", "print-ctor", "print-dup", "print-method", "print-simple", "print-str", "printf",
-        "println", "println-str", "prn", "prn-str", "promise", "proxy", "proxy-call-with-super", "proxy-mappings",
-        "proxy-name", "proxy-super", "push-thread-bindings", "pvalues", "qualified-ident?", "qualified-keyword?",
-        "qualified-symbol?", "quot", "rand", "rand-int", "rand-nth", "random-sample", "range", "ratio?", "rational?",
-        "rationalize", "re-find", "re-groups", "re-matcher", "re-matches", "re-pattern", "re-seq", "read", "read-line",
-        "read-string", "reader-conditional", "reader-conditional?", "realized?", "record?", "reduce", "reduce-kv", "reduced",
-        "reduced?", "reductions", "ref", "ref-history-count", "ref-max-history", "ref-min-history", "ref-set", "refer",
-        "refer-clojure", "reify", "release-pending-sends", "rem", "remove", "remove-all-methods", "remove-method", "remove-ns",
-        "remove-watch", "repeat", "repeatedly", "replace", "replicate", "require", "reset!", "reset-meta!", "reset-vals!",
-        "resolve", "rest", "restart-agent", "resultset-seq", "reverse", "reversible?", "rseq", "rsubseq", "run!", "satisfies?",
-        "second", "select-keys", "send", "send-off", "send-via", "seq", "seq?", "seqable?", "seque", "sequence", "sequential?",
-        "set", "set-agent-send-executor!", "set-agent-send-off-executor!", "set-error-handler!", "set-error-mode!",
-        "set-validator!", "set?", "short", "short-array", "shorts", "shuffle", "shutdown-agents", "simple-ident?",
-        "simple-keyword?", "simple-symbol?", "slurp", "some", "some->", "some->>", "some-fn", "some?", "sort", "sort-by",
-        "sorted-map", "sorted-map-by", "sorted-set", "sorted-set-by", "sorted?", "special-symbol?", "spit", "split-at",
-        "split-with", "str", "string?", "struct", "struct-map", "subs", "subseq", "subvec", "supers", "swap!", "swap-vals!",
-        "symbol", "symbol?", "sync", "tagged-literal", "tagged-literal?", "take", "take-last", "take-nth", "take-while", "test",
-        "the-ns", "thread-bound?", "time", "to-array", "to-array-2d", "trampoline", "transduce", "transient", "tree-seq",
-        "true?", "type", "unchecked-add", "unchecked-add-int", "unchecked-byte", "unchecked-char", "unchecked-dec",
-        "unchecked-dec-int", "unchecked-divide-int", "unchecked-double", "unchecked-float", "unchecked-inc", "unchecked-inc-int",
-        "unchecked-int", "unchecked-long", "unchecked-multiply", "unchecked-multiply-int", "unchecked-negate",
-        "unchecked-negate-int", "unchecked-remainder-int", "unchecked-short", "unchecked-subtract", "unchecked-subtract-int",
-        "underive", "unquote", "unquote-splicing", "unreduced", "unsigned-bit-shift-right", "update", "update-in",
-        "update-proxy", "uri?", "use", "uuid?", "val", "vals", "var-get", "var-set", "var?", "vary-meta", "vec", "vector",
-        "vector-of", "vector?", "volatile!", "volatile?", "vreset!", "vswap!", "when", "when-first", "when-let", "when-not",
-        "when-some", "while", "with-bindings", "with-bindings*", "with-in-str", "with-loading-context", "with-local-vars",
-        "with-meta", "with-open", "with-out-str", "with-precision", "with-redefs", "with-redefs-fn", "xml-seq", "zero?",
-        "zipmap"
-    ];
-
-    MT("should highlight core symbols as keywords (part 1/2)",
-        typeTokenPairs("keyword", coreSymbols1)
-    );
-
-    MT("should highlight core symbols as keywords (part 2/2)",
-        typeTokenPairs("keyword", coreSymbols2)
-    );
-
-    MT("should properly indent forms in list literals",
-        "[bracket (][builtin foo] [atom :a] [number 1] [atom true] [atom nil][bracket )]",
-        "",
-        "[bracket (][builtin foo] [atom :a]",
-        "     [number 1]",
-        "     [atom true]",
-        "     [atom nil][bracket )]",
-        "",
-        "[bracket (][builtin foo] [atom :a] [number 1]",
-        "     [atom true]",
-        "     [atom nil][bracket )]",
-        "",
-        "[bracket (]",
-        " [builtin foo]",
-        " [atom :a]",
-        " [number 1]",
-        " [atom true]",
-        " [atom nil][bracket )]",
-        "",
-        "[bracket (][builtin foo] [bracket [[][atom :a][bracket ]]]",
-        "     [number 1]",
-        "     [atom true]",
-        "     [atom nil][bracket )]"
-    );
-
-    MT("should properly indent forms in vector literals",
-        "[bracket [[][atom :a] [number 1] [atom true] [atom nil][bracket ]]]",
-        "",
-        "[bracket [[][atom :a]",
-        " [number 1]",
-        " [atom true]",
-        " [atom nil][bracket ]]]",
-        "",
-        "[bracket [[][atom :a] [number 1]",
-        " [atom true]",
-        " [atom nil][bracket ]]]",
-        "",
-        "[bracket [[]",
-        " [variable foo]",
-        " [atom :a]",
-        " [number 1]",
-        " [atom true]",
-        " [atom nil][bracket ]]]"
-    );
-
-    MT("should properly indent forms in map literals",
-        "[bracket {][atom :a] [atom :a] [atom :b] [number 1] [atom :c] [atom true] [atom :d] [atom nil] [bracket }]",
-        "",
-        "[bracket {][atom :a] [atom :a]",
-        " [atom :b] [number 1]",
-        " [atom :c] [atom true]",
-        " [atom :d] [atom nil][bracket }]",
-        "",
-        "[bracket {][atom :a]",
-        " [atom :a]",
-        " [atom :b]",
-        " [number 1]",
-        " [atom :c]",
-        " [atom true]",
-        " [atom :d]",
-        " [atom nil][bracket }]",
-        "",
-        "[bracket {]",
-        " [atom :a] [atom :a]",
-        " [atom :b] [number 1]",
-        " [atom :c] [atom true]",
-        " [atom :d] [atom nil][bracket }]"
-    );
-
-    MT("should properly indent forms in set literals",
-        "[meta #][bracket {][atom :a] [number 1] [atom true] [atom nil] [bracket }]",
-        "",
-        "[meta #][bracket {][atom :a]",
-        "  [number 1]",
-        "  [atom true]",
-        "  [atom nil][bracket }]",
-        "",
-        "[meta #][bracket {]",
-        "  [atom :a]",
-        "  [number 1]",
-        "  [atom true]",
-        "  [atom nil][bracket }]"
-    );
-
-    var haveBodyParameter = [
-        "->", "->>", "as->", "binding", "bound-fn", "case", "catch", "cond",
-        "cond->", "cond->>", "condp", "def", "definterface", "defmethod", "defn",
-        "defmacro", "defprotocol", "defrecord", "defstruct", "deftype", "do",
-        "doseq", "dotimes", "doto", "extend", "extend-protocol", "extend-type",
-        "fn", "for", "future", "if", "if-let", "if-not", "if-some", "let",
-        "letfn", "locking", "loop", "ns", "proxy", "reify", "some->", "some->>",
-        "struct-map", "try", "when", "when-first", "when-let", "when-not",
-        "when-some", "while", "with-bindings", "with-bindings*", "with-in-str",
-        "with-loading-context", "with-local-vars", "with-meta", "with-open",
-        "with-out-str", "with-precision", "with-redefs", "with-redefs-fn"];
-
-    function testFormsThatHaveBodyParameter(forms) {
-        for (var i = 0; i < forms.length; i++) {
-            MT("should indent body argument of `" + forms[i] + "` by `options.indentUnit` spaces",
-                "[bracket (][keyword " + forms[i] + "] [variable foo] [variable bar]",
-                "  [variable baz]",
-                "  [variable qux][bracket )]"
-            );
-        }
-    }
-
-    testFormsThatHaveBodyParameter(haveBodyParameter);
-
-    MT("should indent body argument of `comment` by `options.indentUnit` spaces",
-        "[bracket (][comment comment foo bar]",
-        "[comment  baz]",
-        "[comment  qux][bracket )]"
-    );
-
-    function typeTokenPairs(type, tokens) {
-        return "[" + type + " " + tokens.join("] [" + type + " ") + "]";
-    }
-})();

libraries/codemirror/mode/cmake/index.html

@@ -1,129 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: CMake mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="cmake.js"></script>
-<style>
-      .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-      .cm-s-default span.cm-arrow { color: red; }
-    </style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">CMake</a>
-  </ul>
-</div>
-
-<article>
-<h2>CMake mode</h2>
-<form><textarea id="code" name="code">
-# vim: syntax=cmake
-if(NOT CMAKE_BUILD_TYPE)
-    # default to Release build for GCC builds
-    set(CMAKE_BUILD_TYPE Release CACHE STRING
-        "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel."
-        FORCE)
-endif()
-message(STATUS "cmake version ${CMAKE_VERSION}")
-if(POLICY CMP0025)
-    cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
-endif()
-if(POLICY CMP0042)
-    cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
-endif()
-
-project (x265)
-cmake_minimum_required (VERSION 2.8.8) # OBJECT libraries require 2.8.8
-include(CheckIncludeFiles)
-include(CheckFunctionExists)
-include(CheckSymbolExists)
-include(CheckCXXCompilerFlag)
-
-# X265_BUILD must be incremented each time the public API is changed
-set(X265_BUILD 48)
-configure_file("${PROJECT_SOURCE_DIR}/x265.def.in"
-               "${PROJECT_BINARY_DIR}/x265.def")
-configure_file("${PROJECT_SOURCE_DIR}/x265_config.h.in"
-               "${PROJECT_BINARY_DIR}/x265_config.h")
-
-SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
-
-# System architecture detection
-string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC)
-set(X86_ALIASES x86 i386 i686 x86_64 amd64)
-list(FIND X86_ALIASES "${SYSPROC}" X86MATCH)
-if("${SYSPROC}" STREQUAL "" OR X86MATCH GREATER "-1")
-    message(STATUS "Detected x86 target processor")
-    set(X86 1)
-    add_definitions(-DX265_ARCH_X86=1)
-    if("${CMAKE_SIZEOF_VOID_P}" MATCHES 8)
-        set(X64 1)
-        add_definitions(-DX86_64=1)
-    endif()
-elseif(${SYSPROC} STREQUAL "armv6l")
-    message(STATUS "Detected ARM target processor")
-    set(ARM 1)
-    add_definitions(-DX265_ARCH_ARM=1 -DHAVE_ARMV6=1)
-else()
-    message(STATUS "CMAKE_SYSTEM_PROCESSOR value `${CMAKE_SYSTEM_PROCESSOR}` is unknown")
-    message(STATUS "Please add this value near ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE}")
-endif()
-
-if(UNIX)
-    list(APPEND PLATFORM_LIBS pthread)
-    find_library(LIBRT rt)
-    if(LIBRT)
-        list(APPEND PLATFORM_LIBS rt)
-    endif()
-    find_package(Numa)
-    if(NUMA_FOUND)
-        list(APPEND CMAKE_REQUIRED_LIBRARIES ${NUMA_LIBRARY})
-        check_symbol_exists(numa_node_of_cpu numa.h NUMA_V2)
-        if(NUMA_V2)
-            add_definitions(-DHAVE_LIBNUMA)
-            message(STATUS "libnuma found, building with support for NUMA nodes")
-            list(APPEND PLATFORM_LIBS ${NUMA_LIBRARY})
-            link_directories(${NUMA_LIBRARY_DIR})
-            include_directories(${NUMA_INCLUDE_DIR})
-        endif()
-    endif()
-    mark_as_advanced(LIBRT NUMA_FOUND)
-endif(UNIX)
-
-if(X64 AND NOT WIN32)
-    option(ENABLE_PIC "Enable Position Independent Code" ON)
-else()
-    option(ENABLE_PIC "Enable Position Independent Code" OFF)
-endif(X64 AND NOT WIN32)
-
-# Compiler detection
-if(CMAKE_GENERATOR STREQUAL "Xcode")
-  set(XCODE 1)
-endif()
-if (APPLE)
-  add_definitions(-DMACOS)
-endif()
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        mode: "text/x-cmake",
-        matchBrackets: true,
-        indentUnit: 4
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-cmake</code>.</p>
-
-  </article>

libraries/codemirror/mode/cobol/index.html

@@ -1,210 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: COBOL mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../theme/neat.css">
-<link rel="stylesheet" href="../../theme/elegant.css">
-<link rel="stylesheet" href="../../theme/erlang-dark.css">
-<link rel="stylesheet" href="../../theme/night.css">
-<link rel="stylesheet" href="../../theme/monokai.css">
-<link rel="stylesheet" href="../../theme/cobalt.css">
-<link rel="stylesheet" href="../../theme/eclipse.css">
-<link rel="stylesheet" href="../../theme/rubyblue.css">
-<link rel="stylesheet" href="../../theme/lesser-dark.css">
-<link rel="stylesheet" href="../../theme/xq-dark.css">
-<link rel="stylesheet" href="../../theme/xq-light.css">
-<link rel="stylesheet" href="../../theme/ambiance.css">
-<link rel="stylesheet" href="../../theme/blackboard.css">
-<link rel="stylesheet" href="../../theme/vibrant-ink.css">
-<link rel="stylesheet" href="../../theme/solarized.css">
-<link rel="stylesheet" href="../../theme/twilight.css">
-<link rel="stylesheet" href="../../theme/midnight.css">
-<link rel="stylesheet" href="../../addon/dialog/dialog.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="cobol.js"></script>
-<script src="../../addon/selection/active-line.js"></script>
-<script src="../../addon/search/search.js"></script>
-<script src="../../addon/dialog/dialog.js"></script>
-<script src="../../addon/search/searchcursor.js"></script>
-<style>
-        .CodeMirror {
-          border: 1px solid #eee;
-          font-size : 20px;
-          height : auto !important;
-        }
-        .CodeMirror-activeline-background {background: #555555 !important;}
-    </style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">COBOL</a>
-  </ul>
-</div>
-
-<article>
-<h2>COBOL mode</h2>
-
-    <p> Select Theme <select onchange="selectTheme()" id="selectTheme">
-        <option>default</option>
-        <option>ambiance</option>
-        <option>blackboard</option>
-        <option>cobalt</option>
-        <option>eclipse</option>
-        <option>elegant</option>
-        <option>erlang-dark</option>
-        <option>lesser-dark</option>
-        <option>midnight</option>
-        <option>monokai</option>
-        <option>neat</option>
-        <option>night</option>
-        <option>rubyblue</option>
-        <option>solarized dark</option>
-        <option>solarized light</option>
-        <option selected>twilight</option>
-        <option>vibrant-ink</option>
-        <option>xq-dark</option>
-        <option>xq-light</option>
-    </select>    Select Font Size <select onchange="selectFontsize()" id="selectFontSize">
-          <option value="13px">13px</option>
-          <option value="14px">14px</option>
-          <option value="16px">16px</option>
-          <option value="18px">18px</option>
-          <option value="20px" selected="selected">20px</option>
-          <option value="24px">24px</option>
-          <option value="26px">26px</option>
-          <option value="28px">28px</option>
-          <option value="30px">30px</option>
-          <option value="32px">32px</option>
-          <option value="34px">34px</option>
-          <option value="36px">36px</option>
-        </select>
-<label for="checkBoxReadOnly">Read-only</label>
-<input type="checkbox" id="checkBoxReadOnly" onchange="selectReadOnly()">
-<label for="id_tabToIndentSpace">Insert Spaces on Tab</label>
-<input type="checkbox" id="id_tabToIndentSpace" onchange="tabToIndentSpace()">
-</p>
-<textarea id="code" name="code">
----------1---------2---------3---------4---------5---------6---------7---------8
-12345678911234567892123456789312345678941234567895123456789612345678971234567898
-000010 IDENTIFICATION DIVISION.                                        MODTGHERE
-000020 PROGRAM-ID.       SAMPLE.
-000030 AUTHOR.           TEST SAM. 
-000040 DATE-WRITTEN.     5 February 2013
-000041
-000042* A sample program just to show the form.
-000043* The program copies its input to the output,
-000044* and counts the number of records.
-000045* At the end this number is printed.
-000046
-000050 ENVIRONMENT DIVISION.
-000060 INPUT-OUTPUT SECTION.
-000070 FILE-CONTROL.
-000080     SELECT STUDENT-FILE     ASSIGN TO SYSIN
-000090         ORGANIZATION IS LINE SEQUENTIAL.
-000100     SELECT PRINT-FILE       ASSIGN TO SYSOUT
-000110         ORGANIZATION IS LINE SEQUENTIAL.
-000120
-000130 DATA DIVISION.
-000140 FILE SECTION.
-000150 FD  STUDENT-FILE
-000160     RECORD CONTAINS 43 CHARACTERS
-000170     DATA RECORD IS STUDENT-IN.
-000180 01  STUDENT-IN              PIC X(43).
-000190
-000200 FD  PRINT-FILE
-000210     RECORD CONTAINS 80 CHARACTERS
-000220     DATA RECORD IS PRINT-LINE.
-000230 01  PRINT-LINE              PIC X(80).
-000240
-000250 WORKING-STORAGE SECTION.
-000260 01  DATA-REMAINS-SWITCH     PIC X(2)      VALUE SPACES.
-000261 01  RECORDS-WRITTEN         PIC 99.
-000270
-000280 01  DETAIL-LINE.
-000290     05  FILLER              PIC X(7)      VALUE SPACES.
-000300     05  RECORD-IMAGE        PIC X(43).
-000310     05  FILLER              PIC X(30)     VALUE SPACES.
-000311 
-000312 01  SUMMARY-LINE.
-000313     05  FILLER              PIC X(7)      VALUE SPACES.
-000314     05  TOTAL-READ          PIC 99.
-000315     05  FILLER              PIC X         VALUE SPACE.
-000316     05  FILLER              PIC X(17)     
-000317                 VALUE  'Records were read'.
-000318     05  FILLER              PIC X(53)     VALUE SPACES.
-000319
-000320 PROCEDURE DIVISION.
-000321
-000330 PREPARE-SENIOR-REPORT.
-000340     OPEN INPUT  STUDENT-FILE
-000350          OUTPUT PRINT-FILE.
-000351     MOVE ZERO TO RECORDS-WRITTEN.
-000360     READ STUDENT-FILE
-000370         AT END MOVE 'NO' TO DATA-REMAINS-SWITCH
-000380     END-READ.
-000390     PERFORM PROCESS-RECORDS
-000410         UNTIL DATA-REMAINS-SWITCH = 'NO'.
-000411     PERFORM PRINT-SUMMARY.
-000420     CLOSE STUDENT-FILE
-000430           PRINT-FILE.
-000440     STOP RUN.
-000450
-000460 PROCESS-RECORDS.
-000470     MOVE STUDENT-IN TO RECORD-IMAGE.
-000480     MOVE DETAIL-LINE TO PRINT-LINE.
-000490     WRITE PRINT-LINE.
-000500     ADD 1 TO RECORDS-WRITTEN.
-000510     READ STUDENT-FILE
-000520         AT END MOVE 'NO' TO DATA-REMAINS-SWITCH
-000530     END-READ. 
-000540
-000550 PRINT-SUMMARY.
-000560     MOVE RECORDS-WRITTEN TO TOTAL-READ.
-000570     MOVE SUMMARY-LINE TO PRINT-LINE.
-000571     WRITE PRINT-LINE. 
-000572
-000580
-</textarea>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        lineNumbers: true,
-        matchBrackets: true,
-        mode: "text/x-cobol",
-        theme : "twilight",
-        styleActiveLine: true,
-        showCursorWhenSelecting : true,  
-      });
-      function selectTheme() {
-        var themeInput = document.getElementById("selectTheme");
-        var theme = themeInput.options[themeInput.selectedIndex].innerHTML;
-        editor.setOption("theme", theme);
-      }
-      function selectFontsize() {
-        var fontSizeInput = document.getElementById("selectFontSize");
-        var fontSize = fontSizeInput.options[fontSizeInput.selectedIndex].innerHTML;
-        editor.getWrapperElement().style.fontSize = fontSize;
-        editor.refresh();
-      }
-      function selectReadOnly() {
-        editor.setOption("readOnly", document.getElementById("checkBoxReadOnly").checked);
-      }
-      function tabToIndentSpace() {
-        if (document.getElementById("id_tabToIndentSpace").checked) {
-            editor.setOption("extraKeys", {Tab: function(cm) { cm.replaceSelection("    ", "end"); }});
-        } else {
-            editor.setOption("extraKeys", {Tab: function(cm) { cm.replaceSelection("    ", "end"); }});
-        }
-      }
-    </script>
-  </article>

libraries/codemirror/mode/coffeescript/index.html

@@ -1,740 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: CoffeeScript mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="coffeescript.js"></script>
-<style>.CodeMirror {border-top: 1px solid silver; border-bottom: 1px solid silver;}</style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">CoffeeScript</a>
-  </ul>
-</div>
-
-<article>
-<h2>CoffeeScript mode</h2>
-<form><textarea id="code" name="code">
-# CoffeeScript mode for CodeMirror
-# Copyright (c) 2011 Jeff Pickhardt, released under
-# the MIT License.
-#
-# Modified from the Python CodeMirror mode, which also is 
-# under the MIT License Copyright (c) 2010 Timothy Farrell.
-#
-# The following script, Underscore.coffee, is used to 
-# demonstrate CoffeeScript mode for CodeMirror.
-#
-# To download CoffeeScript mode for CodeMirror, go to:
-# https://github.com/pickhardt/coffeescript-codemirror-mode
-
-# **Underscore.coffee
-# (c) 2011 Jeremy Ashkenas, DocumentCloud Inc.**
-# Underscore is freely distributable under the terms of the
-# [MIT license](http://en.wikipedia.org/wiki/MIT_License).
-# Portions of Underscore are inspired by or borrowed from
-# [Prototype.js](http://prototypejs.org/api), Oliver Steele's
-# [Functional](http://osteele.com), and John Resig's
-# [Micro-Templating](http://ejohn.org).
-# For all details and documentation:
-# http://documentcloud.github.com/underscore/
-
-
-# Baseline setup
-# --------------
-
-# Establish the root object, `window` in the browser, or `global` on the server.
-root = this
-
-
-# Save the previous value of the `_` variable.
-previousUnderscore = root._
-
-### Multiline
-    comment
-###
-
-# Establish the object that gets thrown to break out of a loop iteration.
-# `StopIteration` is SOP on Mozilla.
-breaker = if typeof(StopIteration) is 'undefined' then '__break__' else StopIteration
-
-
-#### Docco style single line comment (title)
-
-
-# Helper function to escape **RegExp** contents, because JS doesn't have one.
-escapeRegExp = (string) -> string.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1')
-
-
-# Save bytes in the minified (but not gzipped) version:
-ArrayProto = Array.prototype
-ObjProto = Object.prototype
-
-
-# Create quick reference variables for speed access to core prototypes.
-slice = ArrayProto.slice
-unshift = ArrayProto.unshift
-toString = ObjProto.toString
-hasOwnProperty = ObjProto.hasOwnProperty
-propertyIsEnumerable = ObjProto.propertyIsEnumerable
-
-
-# All **ECMA5** native implementations we hope to use are declared here.
-nativeForEach = ArrayProto.forEach
-nativeMap = ArrayProto.map
-nativeReduce = ArrayProto.reduce
-nativeReduceRight = ArrayProto.reduceRight
-nativeFilter = ArrayProto.filter
-nativeEvery = ArrayProto.every
-nativeSome = ArrayProto.some
-nativeIndexOf = ArrayProto.indexOf
-nativeLastIndexOf = ArrayProto.lastIndexOf
-nativeIsArray = Array.isArray
-nativeKeys = Object.keys
-
-
-# Create a safe reference to the Underscore object for use below.
-_ = (obj) -> new wrapper(obj)
-
-
-# Export the Underscore object for **CommonJS**.
-if typeof(exports) != 'undefined' then exports._ = _
-
-
-# Export Underscore to global scope.
-root._ = _
-
-
-# Current version.
-_.VERSION = '1.1.0'
-
-
-# Collection Functions
-# --------------------
-
-# The cornerstone, an **each** implementation.
-# Handles objects implementing **forEach**, arrays, and raw objects.
-_.each = (obj, iterator, context) ->
-  try
-    if nativeForEach and obj.forEach is nativeForEach
-      obj.forEach iterator, context
-    else if _.isNumber obj.length
-      iterator.call context, obj[i], i, obj for i in [0...obj.length]
-    else
-      iterator.call context, val, key, obj for own key, val of obj
-  catch e
-    throw e if e isnt breaker
-  obj
-
-
-# Return the results of applying the iterator to each element. Use JavaScript
-# 1.6's version of **map**, if possible.
-_.map = (obj, iterator, context) ->
-  return obj.map(iterator, context) if nativeMap and obj.map is nativeMap
-  results = []
-  _.each obj, (value, index, list) ->
-    results.push iterator.call context, value, index, list
-  results
-
-
-# **Reduce** builds up a single result from a list of values. Also known as
-# **inject**, or **foldl**. Uses JavaScript 1.8's version of **reduce**, if possible.
-_.reduce = (obj, iterator, memo, context) ->
-  if nativeReduce and obj.reduce is nativeReduce
-    iterator = _.bind iterator, context if context
-    return obj.reduce iterator, memo
-  _.each obj, (value, index, list) ->
-    memo = iterator.call context, memo, value, index, list
-  memo
-
-
-# The right-associative version of **reduce**, also known as **foldr**. Uses
-# JavaScript 1.8's version of **reduceRight**, if available.
-_.reduceRight = (obj, iterator, memo, context) ->
-  if nativeReduceRight and obj.reduceRight is nativeReduceRight
-    iterator = _.bind iterator, context if context
-    return obj.reduceRight iterator, memo
-  reversed = _.clone(_.toArray(obj)).reverse()
-  _.reduce reversed, iterator, memo, context
-
-
-# Return the first value which passes a truth test.
-_.detect = (obj, iterator, context) ->
-  result = null
-  _.each obj, (value, index, list) ->
-    if iterator.call context, value, index, list
-      result = value
-      _.breakLoop()
-  result
-
-
-# Return all the elements that pass a truth test. Use JavaScript 1.6's
-# **filter**, if it exists.
-_.filter = (obj, iterator, context) ->
-  return obj.filter iterator, context if nativeFilter and obj.filter is nativeFilter
-  results = []
-  _.each obj, (value, index, list) ->
-    results.push value if iterator.call context, value, index, list
-  results
-
-
-# Return all the elements for which a truth test fails.
-_.reject = (obj, iterator, context) ->
-  results = []
-  _.each obj, (value, index, list) ->
-    results.push value if not iterator.call context, value, index, list
-  results
-
-
-# Determine whether all of the elements match a truth test. Delegate to
-# JavaScript 1.6's **every**, if it is present.
-_.every = (obj, iterator, context) ->
-  iterator ||= _.identity
-  return obj.every iterator, context if nativeEvery and obj.every is nativeEvery
-  result = true
-  _.each obj, (value, index, list) ->
-    _.breakLoop() unless (result = result and iterator.call(context, value, index, list))
-  result
-
-
-# Determine if at least one element in the object matches a truth test. Use
-# JavaScript 1.6's **some**, if it exists.
-_.some = (obj, iterator, context) ->
-  iterator ||= _.identity
-  return obj.some iterator, context if nativeSome and obj.some is nativeSome
-  result = false
-  _.each obj, (value, index, list) ->
-    _.breakLoop() if (result = iterator.call(context, value, index, list))
-  result
-
-
-# Determine if a given value is included in the array or object,
-# based on `===`.
-_.include = (obj, target) ->
-  return _.indexOf(obj, target) isnt -1 if nativeIndexOf and obj.indexOf is nativeIndexOf
-  return true for own key, val of obj when val is target
-  false
-
-
-# Invoke a method with arguments on every item in a collection.
-_.invoke = (obj, method) ->
-  args = _.rest arguments, 2
-  (if method then val[method] else val).apply(val, args) for val in obj
-
-
-# Convenience version of a common use case of **map**: fetching a property.
-_.pluck = (obj, key) ->
-  _.map(obj, (val) -> val[key])
-
-
-# Return the maximum item or (item-based computation).
-_.max = (obj, iterator, context) ->
-  return Math.max.apply(Math, obj) if not iterator and _.isArray(obj)
-  result = computed: -Infinity
-  _.each obj, (value, index, list) ->
-    computed = if iterator then iterator.call(context, value, index, list) else value
-    computed >= result.computed and (result = {value: value, computed: computed})
-  result.value
-
-
-# Return the minimum element (or element-based computation).
-_.min = (obj, iterator, context) ->
-  return Math.min.apply(Math, obj) if not iterator and _.isArray(obj)
-  result = computed: Infinity
-  _.each obj, (value, index, list) ->
-    computed = if iterator then iterator.call(context, value, index, list) else value
-    computed < result.computed and (result = {value: value, computed: computed})
-  result.value
-
-
-# Sort the object's values by a criterion produced by an iterator.
-_.sortBy = (obj, iterator, context) ->
-  _.pluck(((_.map obj, (value, index, list) ->
-    {value: value, criteria: iterator.call(context, value, index, list)}
-  ).sort((left, right) ->
-    a = left.criteria; b = right.criteria
-    if a < b then -1 else if a > b then 1 else 0
-  )), 'value')
-
-
-# Use a comparator function to figure out at what index an object should
-# be inserted so as to maintain order. Uses binary search.
-_.sortedIndex = (array, obj, iterator) ->
-  iterator ||= _.identity
-  low = 0
-  high = array.length
-  while low < high
-    mid = (low + high) >> 1
-    if iterator(array[mid]) < iterator(obj) then low = mid + 1 else high = mid
-  low
-
-
-# Convert anything iterable into a real, live array.
-_.toArray = (iterable) ->
-  return [] if (!iterable)
-  return iterable.toArray() if (iterable.toArray)
-  return iterable if (_.isArray(iterable))
-  return slice.call(iterable) if (_.isArguments(iterable))
-  _.values(iterable)
-
-
-# Return the number of elements in an object.
-_.size = (obj) -> _.toArray(obj).length
-
-
-# Array Functions
-# ---------------
-
-# Get the first element of an array. Passing `n` will return the first N
-# values in the array. Aliased as **head**. The `guard` check allows it to work
-# with **map**.
-_.first = (array, n, guard) ->
-  if n and not guard then slice.call(array, 0, n) else array[0]
-
-
-# Returns everything but the first entry of the array. Aliased as **tail**.
-# Especially useful on the arguments object. Passing an `index` will return
-# the rest of the values in the array from that index onward. The `guard`
-# check allows it to work with **map**.
-_.rest = (array, index, guard) ->
-  slice.call(array, if _.isUndefined(index) or guard then 1 else index)
-
-
-# Get the last element of an array.
-_.last = (array) -> array[array.length - 1]
-
-
-# Trim out all falsy values from an array.
-_.compact = (array) -> item for item in array when item
-
-
-# Return a completely flattened version of an array.
-_.flatten = (array) ->
-  _.reduce array, (memo, value) ->
-    return memo.concat(_.flatten(value)) if _.isArray value
-    memo.push value
-    memo
-  , []
-
-
-# Return a version of the array that does not contain the specified value(s).
-_.without = (array) ->
-  values = _.rest arguments
-  val for val in _.toArray(array) when not _.include values, val
-
-
-# Produce a duplicate-free version of the array. If the array has already
-# been sorted, you have the option of using a faster algorithm.
-_.uniq = (array, isSorted) ->
-  memo = []
-  for el, i in _.toArray array
-    memo.push el if i is 0 || (if isSorted is true then _.last(memo) isnt el else not _.include(memo, el))
-  memo
-
-
-# Produce an array that contains every item shared between all the
-# passed-in arrays.
-_.intersect = (array) ->
-  rest = _.rest arguments
-  _.select _.uniq(array), (item) ->
-    _.all rest, (other) ->
-      _.indexOf(other, item) >= 0
-
-
-# Zip together multiple lists into a single array -- elements that share
-# an index go together.
-_.zip = ->
-  length = _.max _.pluck arguments, 'length'
-  results = new Array length
-  for i in [0...length]
-    results[i] = _.pluck arguments, String i
-  results
-
-
-# If the browser doesn't supply us with **indexOf** (I'm looking at you, MSIE),
-# we need this function. Return the position of the first occurrence of an
-# item in an array, or -1 if the item is not included in the array.
-_.indexOf = (array, item) ->
-  return array.indexOf item if nativeIndexOf and array.indexOf is nativeIndexOf
-  i = 0; l = array.length
-  while l - i
-    if array[i] is item then return i else i++
-  -1
-
-
-# Provide JavaScript 1.6's **lastIndexOf**, delegating to the native function,
-# if possible.
-_.lastIndexOf = (array, item) ->
-  return array.lastIndexOf(item) if nativeLastIndexOf and array.lastIndexOf is nativeLastIndexOf
-  i = array.length
-  while i
-    if array[i] is item then return i else i--
-  -1
-
-
-# Generate an integer Array containing an arithmetic progression. A port of
-# [the native Python **range** function](http://docs.python.org/library/functions.html#range).
-_.range = (start, stop, step) ->
-  a = arguments
-  solo = a.length <= 1
-  i = start = if solo then 0 else a[0]
-  stop = if solo then a[0] else a[1]
-  step = a[2] or 1
-  len = Math.ceil((stop - start) / step)
-  return [] if len <= 0
-  range = new Array len
-  idx = 0
-  loop
-    return range if (if step > 0 then i - stop else stop - i) >= 0
-    range[idx] = i
-    idx++
-    i+= step
-
-
-# Function Functions
-# ------------------
-
-# Create a function bound to a given object (assigning `this`, and arguments,
-# optionally). Binding with arguments is also known as **curry**.
-_.bind = (func, obj) ->
-  args = _.rest arguments, 2
-  -> func.apply obj or root, args.concat arguments
-
-
-# Bind all of an object's methods to that object. Useful for ensuring that
-# all callbacks defined on an object belong to it.
-_.bindAll = (obj) ->
-  funcs = if arguments.length > 1 then _.rest(arguments) else _.functions(obj)
-  _.each funcs, (f) -> obj[f] = _.bind obj[f], obj
-  obj
-
-
-# Delays a function for the given number of milliseconds, and then calls
-# it with the arguments supplied.
-_.delay = (func, wait) ->
-  args = _.rest arguments, 2
-  setTimeout((-> func.apply(func, args)), wait)
-
-
-# Memoize an expensive function by storing its results.
-_.memoize = (func, hasher) ->
-  memo = {}
-  hasher or= _.identity
-  ->
-    key = hasher.apply this, arguments
-    return memo[key] if key of memo
-    memo[key] = func.apply this, arguments
-
-
-# Defers a function, scheduling it to run after the current call stack has
-# cleared.
-_.defer = (func) ->
-  _.delay.apply _, [func, 1].concat _.rest arguments
-
-
-# Returns the first function passed as an argument to the second,
-# allowing you to adjust arguments, run code before and after, and
-# conditionally execute the original function.
-_.wrap = (func, wrapper) ->
-  -> wrapper.apply wrapper, [func].concat arguments
-
-
-# Returns a function that is the composition of a list of functions, each
-# consuming the return value of the function that follows.
-_.compose = ->
-  funcs = arguments
-  ->
-    args = arguments
-    for i in [funcs.length - 1..0] by -1
-      args = [funcs[i].apply(this, args)]
-    args[0]
-
-
-# Object Functions
-# ----------------
-
-# Retrieve the names of an object's properties.
-_.keys = nativeKeys or (obj) ->
-  return _.range 0, obj.length if _.isArray(obj)
-  key for key, val of obj
-
-
-# Retrieve the values of an object's properties.
-_.values = (obj) ->
-  _.map obj, _.identity
-
-
-# Return a sorted list of the function names available in Underscore.
-_.functions = (obj) ->
-  _.filter(_.keys(obj), (key) -> _.isFunction(obj[key])).sort()
-
-
-# Extend a given object with all of the properties in a source object.
-_.extend = (obj) ->
-  for source in _.rest(arguments)
-    obj[key] = val for key, val of source
-  obj
-
-
-# Create a (shallow-cloned) duplicate of an object.
-_.clone = (obj) ->
-  return obj.slice 0 if _.isArray obj
-  _.extend {}, obj
-
-
-# Invokes interceptor with the obj, and then returns obj.
-# The primary purpose of this method is to "tap into" a method chain,
-# in order to perform operations on intermediate results within
- the chain.
-_.tap = (obj, interceptor) ->
-  interceptor obj
-  obj
-
-
-# Perform a deep comparison to check if two objects are equal.
-_.isEqual = (a, b) ->
-  # Check object identity.
-  return true if a is b
-  # Different types?
-  atype = typeof(a); btype = typeof(b)
-  return false if atype isnt btype
-  # Basic equality test (watch out for coercions).
-  return true if `a == b`
-  # One is falsy and the other truthy.
-  return false if (!a and b) or (a and !b)
-  # One of them implements an `isEqual()`?
-  return a.isEqual(b) if a.isEqual
-  # Check dates' integer values.
-  return a.getTime() is b.getTime() if _.isDate(a) and _.isDate(b)
-  # Both are NaN?
-  return false if _.isNaN(a) and _.isNaN(b)
-  # Compare regular expressions.
-  if _.isRegExp(a) and _.isRegExp(b)
-    return a.source is b.source and
-           a.global is b.global and
-           a.ignoreCase is b.ignoreCase and
-           a.multiline is b.multiline
-  # If a is not an object by this point, we can't handle it.
-  return false if atype isnt 'object'
-  # Check for different array lengths before comparing contents.
-  return false if a.length and (a.length isnt b.length)
-  # Nothing else worked, deep compare the contents.
-  aKeys = _.keys(a); bKeys = _.keys(b)
-  # Different object sizes?
-  return false if aKeys.length isnt bKeys.length
-  # Recursive comparison of contents.
-  return false for key, val of a when !(key of b) or !_.isEqual(val, b[key])
-  true
-
-
-# Is a given array or object empty?
-_.isEmpty = (obj) ->
-  return obj.length is 0 if _.isArray(obj) or _.isString(obj)
-  return false for own key of obj
-  true
-
-
-# Is a given value a DOM element?
-_.isElement = (obj) -> obj and obj.nodeType is 1
-
-
-# Is a given value an array?
-_.isArray = nativeIsArray or (obj) -> !!(obj and obj.concat and obj.unshift and not obj.callee)
-
-
-# Is a given variable an arguments object?
-_.isArguments = (obj) -> obj and obj.callee
-
-
-# Is the given value a function?
-_.isFunction = (obj) -> !!(obj and obj.constructor and obj.call and obj.apply)
-
-
-# Is the given value a string?
-_.isString = (obj) -> !!(obj is '' or (obj and obj.charCodeAt and obj.substr))
-
-
-# Is a given value a number?
-_.isNumber = (obj) -> (obj is +obj) or toString.call(obj) is '[object Number]'
-
-
-# Is a given value a boolean?
-_.isBoolean = (obj) -> obj is true or obj is false
-
-
-# Is a given value a Date?
-_.isDate = (obj) -> !!(obj and obj.getTimezoneOffset and obj.setUTCFullYear)
-
-
-# Is the given value a regular expression?
-_.isRegExp = (obj) -> !!(obj and obj.exec and (obj.ignoreCase or obj.ignoreCase is false))
-
-
-# Is the given value NaN -- this one is interesting. `NaN != NaN`, and
-# `isNaN(undefined) == true`, so we make sure it's a number first.
-_.isNaN = (obj) -> _.isNumber(obj) and window.isNaN(obj)
-
-
-# Is a given value equal to null?
-_.isNull = (obj) -> obj is null
-
-
-# Is a given variable undefined?
-_.isUndefined = (obj) -> typeof obj is 'undefined'
-
-
-# Utility Functions
-# -----------------
-
-# Run Underscore.js in noConflict mode, returning the `_` variable to its
-# previous owner. Returns a reference to the Underscore object.
-_.noConflict = ->
-  root._ = previousUnderscore
-  this
-
-
-# Keep the identity function around for default iterators.
-_.identity = (value) -> value
-
-
-# Run a function `n` times.
-_.times = (n, iterator, context) ->
-  iterator.call context, i for i in [0...n]
-
-
-# Break out of the middle of an iteration.
-_.breakLoop = -> throw breaker
-
-
-# Add your own custom functions to the Underscore object, ensuring that
-# they're correctly added to the OOP wrapper as well.
-_.mixin = (obj) ->
-  for name in _.functions(obj)
-    addToWrapper name, _[name] = obj[name]
-
-
-# Generate a unique integer id (unique within the entire client session).
-# Useful for temporary DOM ids.
-idCounter = 0
-_.uniqueId = (prefix) ->
-  (prefix or '') + idCounter++
-
-
-# By default, Underscore uses **ERB**-style template delimiters, change the
-# following template settings to use alternative delimiters.
-_.templateSettings = {
-  start: '<%'
-  end: '%>'
-  interpolate: /<%=(.+?)%>/g
-}
-
-
-# JavaScript templating a-la **ERB**, pilfered from John Resig's
-# *Secrets of the JavaScript Ninja*, page 83.
-# Single-quote fix from Rick Strahl.
-# With alterations for arbitrary delimiters, and to preserve whitespace.
-_.template = (str, data) ->
-  c = _.templateSettings
-  endMatch = new RegExp("'(?=[^"+c.end.substr(0, 1)+"]*"+escapeRegExp(c.end)+")","g")
-  fn = new Function 'obj',
-    'var p=[],print=function(){p.push.apply(p,arguments);};' +
-    'with(obj||{}){p.push(\'' +
-    str.replace(/\r/g, '\\r')
-       .replace(/\n/g, '\\n')
-       .replace(/\t/g, '\\t')
-       .replace(endMatch,"���")
-       .split("'").join("\\'")
-       .split("���").join("'")
-       .replace(c.interpolate, "',$1,'")
-       .split(c.start).join("');")
-       .split(c.end).join("p.push('") +
-       "');}return p.join('');"
-  if data then fn(data) else fn
-
-
-# Aliases
-# -------
-
-_.forEach = _.each
-_.foldl = _.inject = _.reduce
-_.foldr = _.reduceRight
-_.select = _.filter
-_.all = _.every
-_.any = _.some
-_.contains = _.include
-_.head = _.first
-_.tail = _.rest
-_.methods = _.functions
-
-
-# Setup the OOP Wrapper
-# ---------------------
-
-# If Underscore is called as a function, it returns a wrapped object that
-# can be used OO-style. This wrapper holds altered versions of all the
-# underscore functions. Wrapped objects may be chained.
-wrapper = (obj) ->
-  this._wrapped = obj
-  this
-
-
-# Helper function to continue chaining intermediate results.
-result = (obj, chain) ->
-  if chain then _(obj).chain() else obj
-
-
-# A method to easily add functions to the OOP wrapper.
-addToWrapper = (name, func) ->
-  wrapper.prototype[name] = ->
-    args = _.toArray arguments
-    unshift.call args, this._wrapped
-    result func.apply(_, args), this._chain
-
-
-# Add all ofthe Underscore functions to the wrapper object.
-_.mixin _
-
-
-# Add all mutator Array functions to the wrapper.
-_.each ['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], (name) ->
-  method = Array.prototype[name]
-  wrapper.prototype[name] = ->
-    method.apply(this._wrapped, arguments)
-    result(this._wrapped, this._chain)
-
-
-# Add all accessor Array functions to the wrapper.
-_.each ['concat', 'join', 'slice'], (name) ->
-  method = Array.prototype[name]
-  wrapper.prototype[name] = ->
-    result(method.apply(this._wrapped, arguments), this._chain)
-
-
-# Start chaining a wrapped Underscore object.
-wrapper::chain = ->
-  this._chain = true
-  this
-
-
-# Extracts the result from a wrapped and chained object.
-wrapper::value = -> this._wrapped
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>application/vnd.coffeescript</code>, <code>text/coffeescript</code>, <code>text/x-coffeescript</code>.</p>
-
-    <p>The CoffeeScript mode was written by Jeff Pickhardt.</p>
-
-  </article>

libraries/codemirror/mode/commonlisp/index.html

@@ -1,177 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Common Lisp mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="commonlisp.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Common Lisp</a>
-  </ul>
-</div>
-
-<article>
-<h2>Common Lisp mode</h2>
-<form><textarea id="code" name="code">(in-package :cl-postgres)
-
-;; These are used to synthesize reader and writer names for integer
-;; reading/writing functions when the amount of bytes and the
-;; signedness is known. Both the macro that creates the functions and
-;; some macros that use them create names this way.
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defun integer-reader-name (bytes signed)
-    (intern (with-standard-io-syntax
-              (format nil "~a~a~a~a" '#:read- (if signed "" '#:u) '#:int bytes))))
-  (defun integer-writer-name (bytes signed)
-    (intern (with-standard-io-syntax
-              (format nil "~a~a~a~a" '#:write- (if signed "" '#:u) '#:int bytes)))))
-
-(defmacro integer-reader (bytes)
-  "Create a function to read integers from a binary stream."
-  (let ((bits (* bytes 8)))
-    (labels ((return-form (signed)
-               (if signed
-                   `(if (logbitp ,(1- bits) result)
-                        (dpb result (byte ,(1- bits) 0) -1)
-                        result)
-                   `result))
-             (generate-reader (signed)
-               `(defun ,(integer-reader-name bytes signed) (socket)
-                  (declare (type stream socket)
-                           #.*optimize*)
-                  ,(if (= bytes 1)
-                       `(let ((result (the (unsigned-byte 8) (read-byte socket))))
-                          (declare (type (unsigned-byte 8) result))
-                          ,(return-form signed))
-                       `(let ((result 0))
-                          (declare (type (unsigned-byte ,bits) result))
-                          ,@(loop :for byte :from (1- bytes) :downto 0
-                                   :collect `(setf (ldb (byte 8 ,(* 8 byte)) result)
-                                                   (the (unsigned-byte 8) (read-byte socket))))
-                          ,(return-form signed))))))
-      `(progn
-;; This causes weird errors on SBCL in some circumstances. Disabled for now.
-;;         (declaim (inline ,(integer-reader-name bytes t)
-;;                          ,(integer-reader-name bytes nil)))
-         (declaim (ftype (function (t) (signed-byte ,bits))
-                         ,(integer-reader-name bytes t)))
-         ,(generate-reader t)
-         (declaim (ftype (function (t) (unsigned-byte ,bits))
-                         ,(integer-reader-name bytes nil)))
-         ,(generate-reader nil)))))
-
-(defmacro integer-writer (bytes)
-  "Create a function to write integers to a binary stream."
-  (let ((bits (* 8 bytes)))
-    `(progn
-      (declaim (inline ,(integer-writer-name bytes t)
-                       ,(integer-writer-name bytes nil)))
-      (defun ,(integer-writer-name bytes nil) (socket value)
-        (declare (type stream socket)
-                 (type (unsigned-byte ,bits) value)
-                 #.*optimize*)
-        ,@(if (= bytes 1)
-              `((write-byte value socket))
-              (loop :for byte :from (1- bytes) :downto 0
-                    :collect `(write-byte (ldb (byte 8 ,(* byte 8)) value)
-                               socket)))
-        (values))
-      (defun ,(integer-writer-name bytes t) (socket value)
-        (declare (type stream socket)
-                 (type (signed-byte ,bits) value)
-                 #.*optimize*)
-        ,@(if (= bytes 1)
-              `((write-byte (ldb (byte 8 0) value) socket))
-              (loop :for byte :from (1- bytes) :downto 0
-                    :collect `(write-byte (ldb (byte 8 ,(* byte 8)) value)
-                               socket)))
-        (values)))))
-
-;; All the instances of the above that we need.
-
-(integer-reader 1)
-(integer-reader 2)
-(integer-reader 4)
-(integer-reader 8)
-
-(integer-writer 1)
-(integer-writer 2)
-(integer-writer 4)
-
-(defun write-bytes (socket bytes)
-  "Write a byte-array to a stream."
-  (declare (type stream socket)
-           (type (simple-array (unsigned-byte 8)) bytes)
-           #.*optimize*)
-  (write-sequence bytes socket))
-
-(defun write-str (socket string)
-  "Write a null-terminated string to a stream \(encoding it when UTF-8
-support is enabled.)."
-  (declare (type stream socket)
-           (type string string)
-           #.*optimize*)
-  (enc-write-string string socket)
-  (write-uint1 socket 0))
-
-(declaim (ftype (function (t unsigned-byte)
-                          (simple-array (unsigned-byte 8) (*)))
-                read-bytes))
-(defun read-bytes (socket length)
-  "Read a byte array of the given length from a stream."
-  (declare (type stream socket)
-           (type fixnum length)
-           #.*optimize*)
-  (let ((result (make-array length :element-type '(unsigned-byte 8))))
-    (read-sequence result socket)
-    result))
-
-(declaim (ftype (function (t) string) read-str))
-(defun read-str (socket)
-  "Read a null-terminated string from a stream. Takes care of encoding
-when UTF-8 support is enabled."
-  (declare (type stream socket)
-           #.*optimize*)
-  (enc-read-string socket :null-terminated t))
-
-(defun skip-bytes (socket length)
-  "Skip a given number of bytes in a binary stream."
-  (declare (type stream socket)
-           (type (unsigned-byte 32) length)
-           #.*optimize*)
-  (dotimes (i length)
-    (read-byte socket)))
-
-(defun skip-str (socket)
-  "Skip a null-terminated string."
-  (declare (type stream socket)
-           #.*optimize*)
-  (loop :for char :of-type fixnum = (read-byte socket)
-        :until (zerop char)))
-
-(defun ensure-socket-is-closed (socket &amp;key abort)
-  (when (open-stream-p socket)
-    (handler-case
-        (close socket :abort abort)
-      (error (error)
-        (warn "Ignoring the error which happened while trying to close PostgreSQL socket: ~A" error)))))
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {lineNumbers: true});
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/x-common-lisp</code>.</p>
-
-  </article>

libraries/codemirror/mode/crystal/index.html

@@ -1,116 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: Crystal mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="../../addon/edit/matchbrackets.js"></script>
-<script src="crystal.js"></script>
-<style>
-  .CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}
-  .cm-s-default span.cm-arrow { color: red; }
-</style>
-
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">Crystal</a>
-  </ul>
-</div>
-
-<article>
-<h2>Crystal mode</h2>
-<form><textarea id="code" name="code">
-# Features of Crystal
-# - Ruby-inspired syntax.
-# - Statically type-checked but without having to specify the type of variables or method arguments.
-# - Be able to call C code by writing bindings to it in Crystal.
-# - Have compile-time evaluation and generation of code, to avoid boilerplate code.
-# - Compile to efficient native code.
-
-# A very basic HTTP server
-require "http/server"
-
-server = HTTP::Server.new(8080) do |request|
-  HTTP::Response.ok "text/plain", "Hello world, got #{request.path}!"
-end
-
-puts "Listening on http://0.0.0.0:8080"
-server.listen
-
-module Foo
-  abstract def abstract_method : String
-
-  @[AlwaysInline]
-  def with_foofoo
-    with Foo.new(self) yield
-  end
-
-  struct Foo
-    def initialize(@foo : ::Foo)
-    end
-
-    def hello_world
-      @foo.abstract_method
-    end
-  end
-end
-
-class Bar
-  include Foo
-
-  @@foobar = 12345
-
-  def initialize(@bar : Int32)
-  end
-
-  macro alias_method(name, method)
-    def {{ name }}(*args)
-      {{ method }}(*args)
-    end
-  end
-
-  def a_method
-    "Hello, World"
-  end
-
-  alias_method abstract_method, a_method
-
-  def show_instance_vars : Nil
-    {% for var in @type.instance_vars %}
-      puts "@{{ var }} = #{ @{{ var }} }"
-    {% end %}
-  end
-end
-
-class Baz &lt; Bar; end
-
-lib LibC
-  fun c_puts = "puts"(str : Char*) : Int
-end
-
-baz = Baz.new(100)
-baz.show_instance_vars
-baz.with_foofoo do
-  LibC.c_puts hello_world
-end
-</textarea></form>
-<script>
-  var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-    mode: "text/x-crystal",
-    matchBrackets: true,
-    indentUnit: 2
-  });
-</script>
-
-<p><strong>MIME types defined:</strong> <code>text/x-crystal</code>.</p>
-</article>

libraries/codemirror/mode/css/css.js

@@ -442,117 +442,149 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "monochrome", "min-monochrome", "max-monochrome", "resolution",
     "min-resolution", "max-resolution", "scan", "grid", "orientation",
     "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
-    "pointer", "any-pointer", "hover", "any-hover"
+    "pointer", "any-pointer", "hover", "any-hover", "prefers-color-scheme"
   ], mediaFeatures = keySet(mediaFeatures_);
 
   var mediaValueKeywords_ = [
     "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
-    "interlace", "progressive"
+    "interlace", "progressive",
+    "dark", "light"
   ], mediaValueKeywords = keySet(mediaValueKeywords_);
 
   var propertyKeywords_ = [
     "align-content", "align-items", "align-self", "alignment-adjust",
-    "alignment-baseline", "anchor-point", "animation", "animation-delay",
+    "alignment-baseline", "all", "anchor-point", "animation", "animation-delay",
     "animation-direction", "animation-duration", "animation-fill-mode",
     "animation-iteration-count", "animation-name", "animation-play-state",
-    "animation-timing-function", "appearance", "azimuth", "backface-visibility",
-    "background", "background-attachment", "background-blend-mode", "background-clip",
-    "background-color", "background-image", "background-origin", "background-position",
-    "background-repeat", "background-size", "baseline-shift", "binding",
-    "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
-    "bookmark-target", "border", "border-bottom", "border-bottom-color",
-    "border-bottom-left-radius", "border-bottom-right-radius",
-    "border-bottom-style", "border-bottom-width", "border-collapse",
-    "border-color", "border-image", "border-image-outset",
+    "animation-timing-function", "appearance", "azimuth", "backdrop-filter",
+    "backface-visibility", "background", "background-attachment",
+    "background-blend-mode", "background-clip", "background-color",
+    "background-image", "background-origin", "background-position",
+    "background-position-x", "background-position-y", "background-repeat",
+    "background-size", "baseline-shift", "binding", "bleed", "block-size",
+    "bookmark-label", "bookmark-level", "bookmark-state", "bookmark-target",
+    "border", "border-bottom", "border-bottom-color", "border-bottom-left-radius",
+    "border-bottom-right-radius", "border-bottom-style", "border-bottom-width",
+    "border-collapse", "border-color", "border-image", "border-image-outset",
     "border-image-repeat", "border-image-slice", "border-image-source",
-    "border-image-width", "border-left", "border-left-color",
-    "border-left-style", "border-left-width", "border-radius", "border-right",
-    "border-right-color", "border-right-style", "border-right-width",
-    "border-spacing", "border-style", "border-top", "border-top-color",
-    "border-top-left-radius", "border-top-right-radius", "border-top-style",
-    "border-top-width", "border-width", "bottom", "box-decoration-break",
-    "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
-    "caption-side", "caret-color", "clear", "clip", "color", "color-profile", "column-count",
-    "column-fill", "column-gap", "column-rule", "column-rule-color",
-    "column-rule-style", "column-rule-width", "column-span", "column-width",
-    "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
-    "cue-after", "cue-before", "cursor", "direction", "display",
-    "dominant-baseline", "drop-initial-after-adjust",
-    "drop-initial-after-align", "drop-initial-before-adjust",
-    "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
-    "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
-    "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
-    "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
-    "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust",
-    "font-stretch", "font-style", "font-synthesis", "font-variant",
-    "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
-    "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
-    "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow",
-    "grid-auto-rows", "grid-column", "grid-column-end", "grid-column-gap",
-    "grid-column-start", "grid-gap", "grid-row", "grid-row-end", "grid-row-gap",
-    "grid-row-start", "grid-template", "grid-template-areas", "grid-template-columns",
-    "grid-template-rows", "hanging-punctuation", "height", "hyphens",
-    "icon", "image-orientation", "image-rendering", "image-resolution",
-    "inline-box-align", "justify-content", "justify-items", "justify-self", "left", "letter-spacing",
-    "line-break", "line-height", "line-stacking", "line-stacking-ruby",
+    "border-image-width", "border-left", "border-left-color", "border-left-style",
+    "border-left-width", "border-radius", "border-right", "border-right-color",
+    "border-right-style", "border-right-width", "border-spacing", "border-style",
+    "border-top", "border-top-color", "border-top-left-radius",
+    "border-top-right-radius", "border-top-style", "border-top-width",
+    "border-width", "bottom", "box-decoration-break", "box-shadow", "box-sizing",
+    "break-after", "break-before", "break-inside", "caption-side", "caret-color",
+    "clear", "clip", "color", "color-profile", "column-count", "column-fill",
+    "column-gap", "column-rule", "column-rule-color", "column-rule-style",
+    "column-rule-width", "column-span", "column-width", "columns", "contain",
+    "content", "counter-increment", "counter-reset", "crop", "cue", "cue-after",
+    "cue-before", "cursor", "direction", "display", "dominant-baseline",
+    "drop-initial-after-adjust", "drop-initial-after-align",
+    "drop-initial-before-adjust", "drop-initial-before-align", "drop-initial-size",
+    "drop-initial-value", "elevation", "empty-cells", "fit", "fit-position",
+    "flex", "flex-basis", "flex-direction", "flex-flow", "flex-grow",
+    "flex-shrink", "flex-wrap", "float", "float-offset", "flow-from", "flow-into",
+    "font", "font-family", "font-feature-settings", "font-kerning",
+    "font-language-override", "font-optical-sizing", "font-size",
+    "font-size-adjust", "font-stretch", "font-style", "font-synthesis",
+    "font-variant", "font-variant-alternates", "font-variant-caps",
+    "font-variant-east-asian", "font-variant-ligatures", "font-variant-numeric",
+    "font-variant-position", "font-variation-settings", "font-weight", "gap",
+    "grid", "grid-area", "grid-auto-columns", "grid-auto-flow", "grid-auto-rows",
+    "grid-column", "grid-column-end", "grid-column-gap", "grid-column-start",
+    "grid-gap", "grid-row", "grid-row-end", "grid-row-gap", "grid-row-start",
+    "grid-template", "grid-template-areas", "grid-template-columns",
+    "grid-template-rows", "hanging-punctuation", "height", "hyphens", "icon",
+    "image-orientation", "image-rendering", "image-resolution", "inline-box-align",
+    "inset", "inset-block", "inset-block-end", "inset-block-start", "inset-inline",
+    "inset-inline-end", "inset-inline-start", "isolation", "justify-content",
+    "justify-items", "justify-self", "left", "letter-spacing", "line-break",
+    "line-height", "line-height-step", "line-stacking", "line-stacking-ruby",
     "line-stacking-shift", "line-stacking-strategy", "list-style",
     "list-style-image", "list-style-position", "list-style-type", "margin",
-    "margin-bottom", "margin-left", "margin-right", "margin-top",
-    "marks", "marquee-direction", "marquee-loop",
-    "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
-    "max-width", "min-height", "min-width", "mix-blend-mode", "move-to", "nav-down", "nav-index",
-    "nav-left", "nav-right", "nav-up", "object-fit", "object-position",
-    "opacity", "order", "orphans", "outline",
-    "outline-color", "outline-offset", "outline-style", "outline-width",
-    "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
-    "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
-    "page", "page-break-after", "page-break-before", "page-break-inside",
-    "page-policy", "pause", "pause-after", "pause-before", "perspective",
-    "perspective-origin", "pitch", "pitch-range", "place-content", "place-items", "place-self", "play-during", "position",
-    "presentation-level", "punctuation-trim", "quotes", "region-break-after",
-    "region-break-before", "region-break-inside", "region-fragment",
-    "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
-    "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
-    "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin",
-    "shape-outside", "size", "speak", "speak-as", "speak-header",
-    "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
-    "tab-size", "table-layout", "target", "target-name", "target-new",
-    "target-position", "text-align", "text-align-last", "text-decoration",
+    "margin-bottom", "margin-left", "margin-right", "margin-top", "marks",
+    "marquee-direction", "marquee-loop", "marquee-play-count", "marquee-speed",
+    "marquee-style", "mask-clip", "mask-composite", "mask-image", "mask-mode",
+    "mask-origin", "mask-position", "mask-repeat", "mask-size","mask-type",
+    "max-block-size", "max-height", "max-inline-size",
+    "max-width", "min-block-size", "min-height", "min-inline-size", "min-width",
+    "mix-blend-mode", "move-to", "nav-down", "nav-index", "nav-left", "nav-right",
+    "nav-up", "object-fit", "object-position", "offset", "offset-anchor",
+    "offset-distance", "offset-path", "offset-position", "offset-rotate",
+    "opacity", "order", "orphans", "outline", "outline-color", "outline-offset",
+    "outline-style", "outline-width", "overflow", "overflow-style",
+    "overflow-wrap", "overflow-x", "overflow-y", "padding", "padding-bottom",
+    "padding-left", "padding-right", "padding-top", "page", "page-break-after",
+    "page-break-before", "page-break-inside", "page-policy", "pause",
+    "pause-after", "pause-before", "perspective", "perspective-origin", "pitch",
+    "pitch-range", "place-content", "place-items", "place-self", "play-during",
+    "position", "presentation-level", "punctuation-trim", "quotes",
+    "region-break-after", "region-break-before", "region-break-inside",
+    "region-fragment", "rendering-intent", "resize", "rest", "rest-after",
+    "rest-before", "richness", "right", "rotate", "rotation", "rotation-point",
+    "row-gap", "ruby-align", "ruby-overhang", "ruby-position", "ruby-span",
+    "scale", "scroll-behavior", "scroll-margin", "scroll-margin-block",
+    "scroll-margin-block-end", "scroll-margin-block-start", "scroll-margin-bottom",
+    "scroll-margin-inline", "scroll-margin-inline-end",
+    "scroll-margin-inline-start", "scroll-margin-left", "scroll-margin-right",
+    "scroll-margin-top", "scroll-padding", "scroll-padding-block",
+    "scroll-padding-block-end", "scroll-padding-block-start",
+    "scroll-padding-bottom", "scroll-padding-inline", "scroll-padding-inline-end",
+    "scroll-padding-inline-start", "scroll-padding-left", "scroll-padding-right",
+    "scroll-padding-top", "scroll-snap-align", "scroll-snap-type",
+    "shape-image-threshold", "shape-inside", "shape-margin", "shape-outside",
+    "size", "speak", "speak-as", "speak-header", "speak-numeral",
+    "speak-punctuation", "speech-rate", "stress", "string-set", "tab-size",
+    "table-layout", "target", "target-name", "target-new", "target-position",
+    "text-align", "text-align-last", "text-combine-upright", "text-decoration",
     "text-decoration-color", "text-decoration-line", "text-decoration-skip",
-    "text-decoration-style", "text-emphasis", "text-emphasis-color",
-    "text-emphasis-position", "text-emphasis-style", "text-height",
-    "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
-    "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
-    "text-wrap", "top", "transform", "transform-origin", "transform-style",
-    "transition", "transition-delay", "transition-duration",
-    "transition-property", "transition-timing-function", "unicode-bidi",
-    "user-select", "vertical-align", "visibility", "voice-balance", "voice-duration",
-    "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
-    "voice-volume", "volume", "white-space", "widows", "width", "will-change", "word-break",
-    "word-spacing", "word-wrap", "z-index",
+    "text-decoration-skip-ink", "text-decoration-style", "text-emphasis",
+    "text-emphasis-color", "text-emphasis-position", "text-emphasis-style",
+    "text-height", "text-indent", "text-justify", "text-orientation",
+    "text-outline", "text-overflow", "text-rendering", "text-shadow",
+    "text-size-adjust", "text-space-collapse", "text-transform",
+    "text-underline-position", "text-wrap", "top", "touch-action", "transform", "transform-origin",
+    "transform-style", "transition", "transition-delay", "transition-duration",
+    "transition-property", "transition-timing-function", "translate",
+    "unicode-bidi", "user-select", "vertical-align", "visibility", "voice-balance",
+    "voice-duration", "voice-family", "voice-pitch", "voice-range", "voice-rate",
+    "voice-stress", "voice-volume", "volume", "white-space", "widows", "width",
+    "will-change", "word-break", "word-spacing", "word-wrap", "writing-mode", "z-index",
     // SVG-specific
     "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
     "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
     "color-interpolation", "color-interpolation-filters",
     "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",
-    "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke",
+    "marker", "marker-end", "marker-mid", "marker-start", "paint-order", "shape-rendering", "stroke",
     "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin",
     "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
     "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
-    "glyph-orientation-vertical", "text-anchor", "writing-mode"
+    "glyph-orientation-vertical", "text-anchor", "writing-mode",
   ], propertyKeywords = keySet(propertyKeywords_);
 
   var nonStandardPropertyKeywords_ = [
+    "border-block", "border-block-color", "border-block-end",
+    "border-block-end-color", "border-block-end-style", "border-block-end-width",
+    "border-block-start", "border-block-start-color", "border-block-start-style",
+    "border-block-start-width", "border-block-style", "border-block-width",
+    "border-inline", "border-inline-color", "border-inline-end",
+    "border-inline-end-color", "border-inline-end-style",
+    "border-inline-end-width", "border-inline-start", "border-inline-start-color",
+    "border-inline-start-style", "border-inline-start-width",
+    "border-inline-style", "border-inline-width", "margin-block",
+    "margin-block-end", "margin-block-start", "margin-inline", "margin-inline-end",
+    "margin-inline-start", "padding-block", "padding-block-end",
+    "padding-block-start", "padding-inline", "padding-inline-end",
+    "padding-inline-start", "scroll-snap-stop", "scrollbar-3d-light-color",
     "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
     "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
-    "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
-    "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
-    "searchfield-results-decoration", "zoom"
+    "scrollbar-track-color", "searchfield-cancel-button", "searchfield-decoration",
+    "searchfield-results-button", "searchfield-results-decoration", "shape-inside", "zoom"
   ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
 
   var fontProperties_ = [
-    "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
-    "font-stretch", "font-weight", "font-style"
+    "font-display", "font-family", "src", "unicode-range", "font-variant",
+     "font-feature-settings", "font-stretch", "font-weight", "font-style"
   ], fontProperties = keySet(fontProperties_);
 
   var counterDescriptors_ = [
@@ -594,7 +626,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
     "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
     "arabic-indic", "armenian", "asterisks", "attr", "auto", "auto-flow", "avoid", "avoid-column", "avoid-page",
-    "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
+    "avoid-region", "axis-pan", "background", "backwards", "baseline", "below", "bidi-override", "binary",
     "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
     "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
     "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
@@ -618,7 +650,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
     "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
     "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
-    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
+    "extra-expanded", "fantasy", "fast", "fill", "fill-box", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
     "forwards", "from", "geometricPrecision", "georgian", "graytext", "grid", "groove",
     "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
     "help", "hidden", "hide", "higher", "highlight", "highlighttext",
@@ -633,7 +665,7 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
     "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
     "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
-    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d",
+    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "manipulation", "match", "matrix", "matrix3d",
     "media-controls-background", "media-current-time-display",
     "media-fullscreen-button", "media-mute-button", "media-play-button",
     "media-return-to-realtime-button", "media-rewind-button",
@@ -642,13 +674,13 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "media-volume-slider-container", "media-volume-sliderthumb", "medium",
     "menu", "menulist", "menulist-button", "menulist-text",
     "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
-    "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
+    "mix", "mongolian", "monospace", "move", "multiple", "multiple_mask_images", "multiply", "myanmar", "n-resize",
     "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
     "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
     "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "opacity", "open-quote",
     "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
     "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
-    "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
+    "painted", "page", "paused", "persian", "perspective", "pinch-zoom", "plus-darker", "plus-lighter",
     "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
     "progress", "push-button", "radial-gradient", "radio", "read-only",
     "read-write", "read-write-plaintext-only", "rectangle", "region",
@@ -666,8 +698,8 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
     "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
     "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "space-evenly", "spell-out", "square",
-    "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
-    "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
+    "square-button", "start", "static", "status-bar", "stretch", "stroke", "stroke-box", "sub",
+    "subpixel-antialiased", "svg_masks", "super", "sw-resize", "symbolic", "symbols", "system-ui", "table",
     "table-caption", "table-cell", "table-column", "table-column-group",
     "table-footer-group", "table-header-group", "table-row", "table-row-group",
     "tamil",
@@ -677,10 +709,10 @@ CodeMirror.defineMode("css", function(config, parserConfig) {
     "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
     "trad-chinese-formal", "trad-chinese-informal", "transform",
     "translate", "translate3d", "translateX", "translateY", "translateZ",
-    "transparent", "ultra-condensed", "ultra-expanded", "underline", "unset", "up",
+    "transparent", "ultra-condensed", "ultra-expanded", "underline", "unidirectional-pan", "unset", "up",
     "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
     "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
-    "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
+    "var", "vertical", "vertical-text", "view-box", "visible", "visibleFill", "visiblePainted",
     "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
     "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor",
     "xx-large", "xx-small"

libraries/codemirror/mode/css/gss.html

@@ -13,7 +13,7 @@
 <script src="../../addon/hint/css-hint.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>

libraries/codemirror/mode/css/gss_test.js

@@ -1,17 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
-
-(function() {
-  "use strict";
-
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-gss");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "gss"); }
-
-  MT("atComponent",
-     "[def @component] {",
-     "[tag foo] {",
-     "  [property color]: [keyword black];",
-     "}",
-     "}");
-
-})();

libraries/codemirror/mode/css/index.html

@@ -1,75 +0,0 @@
-<!doctype html>
-
-<title>CodeMirror: CSS mode</title>
-<meta charset="utf-8"/>
-<link rel=stylesheet href="../../doc/docs.css">
-
-<link rel="stylesheet" href="../../lib/codemirror.css">
-<link rel="stylesheet" href="../../addon/hint/show-hint.css">
-<script src="../../lib/codemirror.js"></script>
-<script src="css.js"></script>
-<script src="../../addon/hint/show-hint.js"></script>
-<script src="../../addon/hint/css-hint.js"></script>
-<style>.CodeMirror {background: #f8f8f8;}</style>
-<div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
-
-  <ul>
-    <li><a href="../../index.html">Home</a>
-    <li><a href="../../doc/manual.html">Manual</a>
-    <li><a href="https://github.com/codemirror/codemirror">Code</a>
-  </ul>
-  <ul>
-    <li><a href="../index.html">Language modes</a>
-    <li><a class=active href="#">CSS</a>
-  </ul>
-</div>
-
-<article>
-<h2>CSS mode</h2>
-<form><textarea id="code" name="code">
-/* Some example CSS */
-
-@import url("something.css");
-
-body {
-  margin: 0;
-  padding: 3em 6em;
-  font-family: tahoma, arial, sans-serif;
-  color: #000;
-}
-
-#navigation a {
-  font-weight: bold;
-  text-decoration: none !important;
-}
-
-h1 {
-  font-size: 2.5em;
-}
-
-h2 {
-  font-size: 1.7em;
-}
-
-h1:before, h2:before {
-  content: "::";
-}
-
-code {
-  font-family: courier, monospace;
-  font-size: 80%;
-  color: #418A8A;
-}
-</textarea></form>
-    <script>
-      var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-        extraKeys: {"Ctrl-Space": "autocomplete"}
-      });
-    </script>
-
-    <p><strong>MIME types defined:</strong> <code>text/css</code>, <code>text/x-scss</code> (<a href="scss.html">demo</a>), <code>text/x-less</code> (<a href="less.html">demo</a>).</p>
-
-    <p><strong>Parsing/Highlighting Tests:</strong> <a href="../../test/index.html#css_*">normal</a>,  <a href="../../test/index.html#verbose,css_*">verbose</a>.</p>
-
-  </article>

libraries/codemirror/mode/css/less.html

@@ -10,7 +10,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {border: 1px solid #ddd; line-height: 1.2;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>

libraries/codemirror/mode/css/less_test.js

@@ -1,54 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: https://codemirror.net/LICENSE
-
-(function() {
-  "use strict";
-
-  var mode = CodeMirror.getMode({indentUnit: 2}, "text/x-less");
-  function MT(name) { test.mode(name, mode, Array.prototype.slice.call(arguments, 1), "less"); }
-
-  MT("variable",
-     "[variable-2 @base]: [atom #f04615];",
-     "[qualifier .class] {",
-     "  [property width]: [variable&callee percentage]([number 0.5]); [comment // returns `50%`]",
-     "  [property color]: [variable&callee saturate]([variable-2 @base], [number 5%]);",
-     "}");
-
-  MT("amp",
-     "[qualifier .child], [qualifier .sibling] {",
-     "  [qualifier .parent] [atom &] {",
-     "    [property color]: [keyword black];",
-     "  }",
-     "  [atom &] + [atom &] {",
-     "    [property color]: [keyword red];",
-     "  }",
-     "}");
-
-  MT("mixin",
-     "[qualifier .mixin] ([variable dark]; [variable-2 @color]) {",
-     "  [property color]: [variable&callee darken]([variable-2 @color], [number 10%]);",
-     "}",
-     "[qualifier .mixin] ([variable light]; [variable-2 @color]) {",
-     "  [property color]: [variable&callee lighten]([variable-2 @color], [number 10%]);",
-     "}",
-     "[qualifier .mixin] ([variable-2 @_]; [variable-2 @color]) {",
-     "  [property display]: [atom block];",
-     "}",
-     "[variable-2 @switch]: [variable light];",
-     "[qualifier .class] {",
-     "  [qualifier .mixin]([variable-2 @switch]; [atom #888]);",
-     "}");
-
-  MT("nest",
-     "[qualifier .one] {",
-     "  [def @media] ([property width]: [number 400px]) {",
-     "    [property font-size]: [number 1.2em];",
-     "    [def @media] [attribute print] [keyword and] [property color] {",
-     "      [property color]: [keyword blue];",
-     "    }",
-     "  }",
-     "}");
-
-
-  MT("interpolation", ".@{[variable foo]} { [property font-weight]: [atom bold]; }");
-})();

libraries/codemirror/mode/css/scss.html

@@ -10,7 +10,7 @@
 <script src="css.js"></script>
 <style>.CodeMirror {background: #f8f8f8;}</style>
 <div id=nav>
-  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png"></a>
+  <a href="https://codemirror.net"><h1>CodeMirror</h1><img id=logo src="../../doc/logo.png" alt=""></a>
 
   <ul>
     <li><a href="../../index.html">Home</a>