From fd47abf6eca65996f615595b2edfd3074e267560 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Fri, 15 Nov 2024 23:30:06 -0600 Subject: [PATCH] Update: IKI and EKI specifications. Further clarify the specifications and simplify some of the logic. The "Before Structure" is confusing in that it has a `\*:*`. --- specifications/eki.txt | 15 ++++++++------- specifications/iki.txt | 11 ++++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/specifications/eki.txt b/specifications/eki.txt index 85905b0..ae36114 100644 --- a/specifications/eki.txt +++ b/specifications/eki.txt @@ -1,7 +1,7 @@ # fss-0002 iki-0000 # # license open-standard-license-1.0-or-later -# version 2024/11/03 +# version 2024/11/10 # # This file (assumed to be named eki.txt) can be more easily read using the following iki_read commands: # iki_read eki.txt +Q -w -WWW character "'" "'" code '"' '"' italic '"' '"' @@ -22,29 +22,30 @@ EKI Specifications: Key\: code:"\o" = any printable word character, including character:"_", character:"-", character:"+" (and Unicode equivalents). - code:"\O" = any printable word character, including character:"_", character:"-", character:"+" (and Unicode equivalents) followed by a colon character:":" (unicode:"U+003A"). + code:"\O" = any printable word character, including character:"_", character:"-", character:"+" (and Unicode equivalents) followed by a colon character:":" (unicode:"U+003A") (cannot be only a colon by itself). code:"\c" = any character, including white space and non-printing, and any delimited quote (used as the opening quote) or a any quote (undelimited) not used as the opening quote. code:"\q" = either a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a grave character:'`' (unicode:"U+0060"). code:"\x" = any character. - code:"\W" = any non-word character, discluding character:"_", character:"-", character:"+" (and Unicode equivalents). - code:"\e" = an optional escape sequence of any number of backslashes, such as character:"\\". + code:"\W" = any non-word character, discluding character:"_" (and Unicode equivalents), character:"-" (and Unicode equivalents), character:"+" (and Unicode equivalents), and colon character:":" (unicode:"U+003A"). + code:"\e" = an optional escape sequence of any number of backslashes, such as character:"\\" (unicode:"U+005C"). code:"[" = a single conditionally optional open bracket, character:"[" (unicode:"U+005B"). code:"]" = a single conditionally optional close bracket, character:"]" (unicode:"U+005D"). code:"*" = zero or more occurrences. code:"~" = one or more occurrences, or zero if at start of file. + code:"+" = one or more occurrences. code:":" = The colon character:":" (unicode:"U+003A"). Before Structure\: - code:"\x*\W~\*:*" + code:"\x*\W~" Structure\: - code:"[\O*\o]\e:\q\c\q" + code:"[\O*\o+]\e:\q\c\q" After Structure\: code:"" Example\: - code:'# fss-000c iki-0000 + code:'# fss-000c eki-0000 This is my sentence, anything can go here but sometimes I want to italic\:"emphasize some text". diff --git a/specifications/iki.txt b/specifications/iki.txt index 6d47c21..be9ad89 100644 --- a/specifications/iki.txt +++ b/specifications/iki.txt @@ -1,7 +1,7 @@ # fss-0002 iki-0000 # # license open-standard-license-1.0-or-later -# version 2024/11/03 +# version 2024/11/10 # # This file (assumed to be named iki.txt) can be more easily read using the following iki_read commands: # iki_read iki.txt +Q -w -WWW character "'" "'" code '"' '"' italic '"' '"' @@ -40,19 +40,20 @@ IKI Specifications: code:"\c" = any character, including white space and non-printing, and any delimited quote (used as the opening quote) or a any quote (undelimited) not used as the opening quote. code:"\q" = either a single quote character:"'" (unicode:"U+0027"), a double quote character:'"' (unicode:"U+0022"), or a grave character:'`' (unicode:"U+0060"). code:"\x" = any character. - code:"\W" = any non-word character, discluding character:"_", character:"-", character:"+" (and Unicode equivalents). - code:"\e" = an optional escape sequence of any number of backslashes, such as character:"\\". + code:"\W" = any non-word character, discluding character:"_" (and Unicode equivalents), character:"-" (and Unicode equivalents), and character:"+" (and Unicode equivalents). + code:"\e" = an optional escape sequence of any number of backslashes, such as character:"\\" (unicode:"U+005C"). code:"[" = a single conditionally optional open bracket, character:"[" (unicode:"U+005B"). code:"]" = a single conditionally optional close bracket, character:"]" (unicode:"U+005D"). code:"*" = zero or more occurrences. code:"~" = one or more occurrences, or zero if at start of file. + code:"+" = one or more occurrences. code:":" = The colon character:":" (unicode:"U+003A"). Before Structure\: - code:"\x*\W~\*:*" + code:"\x*\W~" Structure\: - code:"[\o]\e:\q\c\q" + code:"[\o+]\e:\q\c\q" After Structure\: code:"" -- 1.8.3.1