diff --git a/v2/README.md b/v2/README.md index 6de965c..bfc24ed 100644 --- a/v2/README.md +++ b/v2/README.md @@ -33,6 +33,10 @@ Some improvements to check, later: Version Changes Control ======================= +v2.1.1 - 2022-03-01 +----------------------- +- XTemplate: Added > to metalanguage string tags to resolve also the paths (bug corrected). + v2.1.0 - 2022-02-27 ----------------------- - XLanguage: bug corrected on unlock of stringload and loadFromFile (was blocking the system) diff --git a/v2/xcore.go b/v2/xcore.go index 2b15971..95c0fa9 100644 --- a/v2/xcore.go +++ b/v2/xcore.go @@ -868,7 +868,7 @@ package xcore // VERSION is the used version nombre of the XCore library. -const VERSION = "2.1.0" +const VERSION = "2.1.1" // LOG is the flag to activate logging on the library. // if LOG is set to TRUE, LOG indicates to the XCore libraries to log a trace of functions called, with most important parameters. diff --git a/v2/xtemplate.go b/v2/xtemplate.go index b3de2f7..9e6d42a 100644 --- a/v2/xtemplate.go +++ b/v2/xtemplate.go @@ -141,11 +141,11 @@ func (t *XTemplate) compile(data string) error { `|(#)#([a-zA-Z0-9-_\.]+?)##` + // index based 4 // ==== ELEMENTS - `|(&)&([a-zA-Z0-9-_\:\|\.]+?)&&` + // index based 6 - `|(@)@([a-zA-Z0-9-_\:\|\.]+?)@@` + // index based 8 - `|(\?)\?([a-zA-Z0-9-_\:\|\.]+?)\?\?` + // index based 10 - `|(\!)\!([a-zA-Z0-9-_\:\|\.]+?)\!\!` + // index based 12 - `|(\{)\{([a-zA-Z0-9-_\:\|\.]+?)\}\}` + // index based 14 + `|(&)&([a-zA-Z0-9-_\>\:\|\.]+?)&&` + // index based 6 + `|(@)@([a-zA-Z0-9-_\>\:\|\.]+?)@@` + // index based 8 + `|(\?)\?([a-zA-Z0-9-_\>\:\|\.]+?)\?\?` + // index based 10 + `|(\!)\!([a-zA-Z0-9-_\>\:\|\.]+?)\!\!` + // index based 12 + `|(\{)\{([a-zA-Z0-9-_\>\:\|\.]+?)\}\}` + // index based 14 // ==== NESTED ELEMENTS (SUB TEMPLATES) `|\[\[(\])\](\n|\r|\r\n|\n\r)?` + // index based 16 diff --git a/v2/xtemplate_test.go b/v2/xtemplate_test.go index b8eb7ad..387fcb4 100644 --- a/v2/xtemplate_test.go +++ b/v2/xtemplate_test.go @@ -235,6 +235,7 @@ func TestXTemplateClone(t *testing.T) { if str2 != str1 { t.Errorf("Error comparing template cloned") } + fmt.Println(str1) } /*