From 5fa1a00d78ee80df51677c26a9ba5f6f2b74933a Mon Sep 17 00:00:00 2001 From: metalwolf Date: Wed, 2 Mar 2022 00:00:55 -0600 Subject: [PATCH] patch v2.1.2 --- v2/README.md | 4 ++++ v2/xcore.go | 2 +- v2/xtemplate.go | 10 +++++----- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/v2/README.md b/v2/README.md index bfc24ed..14804d5 100644 --- a/v2/README.md +++ b/v2/README.md @@ -33,6 +33,10 @@ Some improvements to check, later: Version Changes Control ======================= +v2.1.2 - 2022-03-02 +----------------------- +- XTemplate: Added = to metalanguage string tags to resolve also the paths (bug corrected). + v2.1.1 - 2022-03-01 ----------------------- - XTemplate: Added > to metalanguage string tags to resolve also the paths (bug corrected). diff --git a/v2/xcore.go b/v2/xcore.go index 95c0fa9..60806c6 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.1" +const VERSION = "2.1.2" // 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 9e6d42a..72994fd 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