Merge pull request #164 from alex-laycalvert/main

Feature: Short Title Template Substitutions
This commit is contained in:
lambtho
2022-09-23 19:00:42 +00:00
committed by GitHub
3 changed files with 55 additions and 47 deletions

View File

@@ -112,32 +112,32 @@ of being able to edit it.
<!-- vim-markdown-toc GFM --> <!-- vim-markdown-toc GFM -->
- [0. Install and setup](#0-install-and-setup) * [0. Install and setup](#0-install-and-setup)
- [0.0 Prerequisites](#00-prerequisites) * [0.0 Prerequisites](#00-prerequisites)
- [0.0.1 Telescope](#001-telescope) * [0.0.1 Telescope](#001-telescope)
- [0.0.2 calendar-vim Plugin (optional)](#002-calendar-vim-plugin-optional) * [0.0.2 calendar-vim Plugin (optional)](#002-calendar-vim-plugin-optional)
- [0.0.3 For pasting images: xclip (optional)](#003-for-pasting-images-xclip-optional) * [0.0.3 For pasting images: xclip (optional)](#003-for-pasting-images-xclip-optional)
- [0.0.4 For image previews: telescope-media-files.nvim (optional)](#004-for-image-previews-telescope-media-filesnvim-optional) * [0.0.4 For image previews: telescope-media-files.nvim (optional)](#004-for-image-previews-telescope-media-filesnvim-optional)
- [catimg](#catimg) * [catimg](#catimg)
- [viu](#viu) * [viu](#viu)
- [telescope-media-files.nvim](#telescope-media-filesnvim) * [telescope-media-files.nvim](#telescope-media-filesnvim)
- [0.1 Install the plugin](#01-install-the-plugin) * [0.1 Install the plugin](#01-install-the-plugin)
- [0.1.0 Other useful plugins](#010-other-useful-plugins) * [0.1.0 Other useful plugins](#010-other-useful-plugins)
- [0.2 Configure telekasten.nvim](#02-configure-telekastennvim) * [0.2 Configure telekasten.nvim](#02-configure-telekastennvim)
- [0.3 Configure your own colors](#03-configure-your-own-colors) * [0.3 Configure your own colors](#03-configure-your-own-colors)
- [1. Get Help](#1-get-help) * [1. Get Help](#1-get-help)
- [2. Use it](#2-use-it) * [2. Use it](#2-use-it)
- [2.0 Telekasten command](#20-telekasten-command) * [2.0 Telekasten command](#20-telekasten-command)
- [2.1 Telekasten command palette](#21-telekasten-command-palette) * [2.1 Telekasten command palette](#21-telekasten-command-palette)
- [2.2 Telekasten lua functions](#22-telekasten-lua-functions) * [2.2 Telekasten lua functions](#22-telekasten-lua-functions)
- [2.3 Link notation](#23-link-notation) * [2.3 Link notation](#23-link-notation)
- [2.4 Tag notation](#24-tag-notation) * [2.4 Tag notation](#24-tag-notation)
- [2.5 Note templates](#25-note-templates) * [2.5 Note templates](#25-note-templates)
- [2.5.1 Template files](#251-template-files) * [2.5.1 Template files](#251-template-files)
- [2.6 Using the calendar](#26-using-the-calendar) * [2.6 Using the calendar](#26-using-the-calendar)
- [2.7 Using the telescope pickers](#27-using-the-telescope-pickers) * [2.7 Using the telescope pickers](#27-using-the-telescope-pickers)
- [3. Bind it](#3-bind-it) * [3. Bind it](#3-bind-it)
- [4. The hardcoded stuff](#4-the-hardcoded-stuff) * [4. The hardcoded stuff](#4-the-hardcoded-stuff)
<!-- vim-markdown-toc --> <!-- vim-markdown-toc -->
@@ -823,6 +823,7 @@ Currently, the following substitutions will be made during new note creation:
| specifier in template | expands to | example | | specifier in template | expands to | example |
| --- | --- | --- | | --- | --- | --- |
| `{{title}}` | the title of the note | My new note | | `{{title}}` | the title of the note | My new note |
| `{{shorttitle}}` | the short title of the note | dir/subdir/My Note -> My Note |
| `{{uuid}}` | UUID for the note | 202201271129 | | `{{uuid}}` | UUID for the note | 202201271129 |
| `{{date}}` | date in iso format | 2021-11-21 | | `{{date}}` | date in iso format | 2021-11-21 |
| `{{prevday}}` | previous day's date in iso format | 2021-11-20 | | `{{prevday}}` | previous day's date in iso format | 2021-11-20 |

View File

@@ -847,27 +847,28 @@ The following substitutions will be made during new note creation:
| specifier | | | | specifier | | |
| in template | expands to | example | | in template | expands to | example |
+-----------------+-----------------------+-----------------------------+ +-----------------+-----------------------+-----------------------------+
| `{{title}}` | the title of the note | My new note | | `{{title}}` | the title of the note | My new note |
| `{{uuid}}` | UUID of the note | 202201271129 | | `{{shorttitle}} | the short title of the note | dir/dir/My Note -> My Note |
| `{{date}}` | date in iso format | 2021-11-21 | | `{{uuid}}` | UUID of the note | 202201271129 |
| `{{prevday}}` | previous day, iso | 2021-11-20 | | `{{date}}` | date in iso format | 2021-11-21 |
| `{{nextday}}` | next day, iso | 2021-11-22 | | `{{prevday}}` | previous day, iso | 2021-11-20 |
| `{{hdate}}` | date in long format | Sunday, November 21st, 2021 | | `{{nextday}}` | next day, iso | 2021-11-22 |
| `{{rfc3339}}` | date in RFC3339 format| 2021-11-21T14:30Z+01:00 | | `{{hdate}}` | date in long format | Sunday, November 21st, 2021 |
| `{{week}}` | week of the year | 46 | | `{{rfc3339}}` | date in RFC3339 format | 2021-11-21T14:30Z+01:00 |
| `{{prevweek}}` | previous week | 45 | | `{{week}}` | week of the year | 46 |
| `{{nextweek}}` | next week | 47 | | `{{prevweek}}` | previous week | 45 |
| `{{isoweek}}` | week in iso format | 2021-46 | | `{{nextweek}}` | next week | 47 |
| `{{isoprevweek}}` | last week, iso | 2021-45 | | `{{isoweek}}` | week in iso format | 2021-46 |
| `{{isonextweek}}` | next week, iso | 2021-47 | | `{{isoprevweek}}` | last week, iso | 2021-45 |
| `{{year}}` | year | 2021 | | `{{isonextweek}}` | next week, iso | 2021-47 |
| `{{monday}}` | Monday, iso | 2021-11-15 | | `{{year}}` | year | 2021 |
| `{{tuesday}}` | Tuesday, iso | 2021-11-16 | | `{{monday}}` | Monday, iso | 2021-11-15 |
| `{{wednesday}}` | Wednesday, iso | 2021-11-17 | | `{{tuesday}}` | Tuesday, iso | 2021-11-16 |
| `{{thursday}}` | Thursday, iso | 2021-11-18 | | `{{wednesday}}` | Wednesday, iso | 2021-11-17 |
| `{{friday}}` | Friday, iso | 2021-11-19 | | `{{thursday}}` | Thursday, iso | 2021-11-18 |
| `{{saturday}}` | Saturday, iso | 2021-11-20 | | `{{friday}}` | Friday, iso | 2021-11-19 |
| `{{sunday}}` | Sunday, iso (see note)| 2021-11-21 | | `{{saturday}}` | Saturday, iso | 2021-11-20 |
| `{{sunday}}` | Sunday, iso (see note)| 2021-11-21 |
+-----------------+-----------------------+-----------------------------+ +-----------------+-----------------------+-----------------------------+
Note: Sunday is adjusted to match the user's `calendar_monday` preference. Note: Sunday is adjusted to match the user's `calendar_monday` preference.

View File

@@ -613,6 +613,11 @@ local function linesubst(line, title, dates, uuid)
uuid = "" uuid = ""
end end
local shorttitle = string.match(title, "^.+/(.+)$")
if shorttitle == nil then
shorttitle = title
end
local substs = { local substs = {
hdate = dates.hdate, hdate = dates.hdate,
week = dates.week, week = dates.week,
@@ -637,6 +642,7 @@ local function linesubst(line, title, dates, uuid)
saturday = dates.saturday, saturday = dates.saturday,
title = title, title = title,
shorttitle = shorttitle,
uuid = uuid, uuid = uuid,
} }
for k, v in pairs(substs) do for k, v in pairs(substs) do