From 6623dbdf5355cc82aa1091afd8e6f82f755d1315 Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Thu, 25 Jun 2020 21:51:59 -0500 Subject: [PATCH] Cleanup: reserve IKI-0000 and update documentation The standard IKI-0000 is now to be used to represent anything that follows the IKI standard without explicitly descrribing what its vocabulary is. All other IKI standards (IKI-0001 and greater) are to be used to represent a specific set of vocabulary terms. --- level_0/f_iki/c/iki-common.h | 46 ++++++++++++++++++++++---------------------- specifications/fss-000D.txt | 5 ++++- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/level_0/f_iki/c/iki-common.h b/level_0/f_iki/c/iki-common.h index e518209..8f37731 100644 --- a/level_0/f_iki/c/iki-common.h +++ b/level_0/f_iki/c/iki-common.h @@ -27,32 +27,32 @@ extern "C" { #define f_iki_syntax_slash '\\' #endif //_di_f_iki_syntax_ -#ifndef _di_iki_vocabulary_0000_ - #define iki_vocabulary_0000_emphasis "emphasis" - #define iki_vocabulary_0000_code "code" - #define iki_vocabulary_0000_quote "quote" - #define iki_vocabulary_0000_uri "uri" - #define iki_vocabulary_0000_url "url" - #define iki_vocabulary_0000_urn "urn" - #define iki_vocabulary_0000_variable "var" - - #define iki_vocabulary_0000_emphasis_length 8 - #define iki_vocabulary_0000_code_length 4 - #define iki_vocabulary_0000_quote_length 5 - #define iki_vocabulary_0000_uri_length 3 - #define iki_vocabulary_0000_url_length 3 - #define iki_vocabulary_0000_urn_length 3 - #define iki_vocabulary_0000_variable_length 3 -#endif // _di_iki_vocabulary_0000_ - #ifndef _di_iki_vocabulary_0001_ - #define iki_vocabulary_0001_define "define" - #define iki_vocabulary_0001_parameter "parameter" - - #define iki_vocabulary_0001_define_length 6 - #define iki_vocabulary_0001_parameter_length 9 + #define iki_vocabulary_0001_emphasis "emphasis" + #define iki_vocabulary_0001_code "code" + #define iki_vocabulary_0001_quote "quote" + #define iki_vocabulary_0001_uri "uri" + #define iki_vocabulary_0001_url "url" + #define iki_vocabulary_0001_urn "urn" + #define iki_vocabulary_0001_variable "var" + + #define iki_vocabulary_0001_emphasis_length 8 + #define iki_vocabulary_0001_code_length 4 + #define iki_vocabulary_0001_quote_length 5 + #define iki_vocabulary_0001_uri_length 3 + #define iki_vocabulary_0001_url_length 3 + #define iki_vocabulary_0001_urn_length 3 + #define iki_vocabulary_0001_variable_length 3 #endif // _di_iki_vocabulary_0001_ +#ifndef _di_iki_vocabulary_0002_ + #define iki_vocabulary_0002_define "define" + #define iki_vocabulary_0002_parameter "parameter" + + #define iki_vocabulary_0002_define_length 6 + #define iki_vocabulary_0002_parameter_length 9 +#endif // _di_iki_vocabulary_0002_ + /** * This holds an array of string ranges that represent the entire vocabulary name, content, and syntax. * diff --git a/specifications/fss-000D.txt b/specifications/fss-000D.txt index 0cafab7..9fa1228 100644 --- a/specifications/fss-000D.txt +++ b/specifications/fss-000D.txt @@ -18,6 +18,9 @@ Featureless Settings Specification: 000D - Iki Text: Whitespace (or start of file), must exist before any valid variable name. + The IKI format will use IKI-0000 to represent an IKI with no explicitly defined vocabulary. + Whereas IKI-0001 and beyond represent a specific IKI vocabulary. + Key\: \s = whitespace. \o = any printable word character, including "_", "-", "+". @@ -37,7 +40,7 @@ Featureless Settings Specification: 000D - Iki Text: Other times I want to render a url such as this example url: url:'http://www.example.com/url with space/'. - There are no comments, except for maybe the FSS header. + There are no comments, except for maybe the FSS header (which would not resolve to any IKI syntax anyway). Quotes may be included, such as: code:"const char *string = \"My \\\"quoted\\\" C string.\";". -- 1.8.3.1