Skip to content

Commit

Permalink
Merge pull request #66 from webability-go/late-night
Browse files Browse the repository at this point in the history
patch v2.1.2
  • Loading branch information
metalwolf committed Mar 2, 2022
2 parents 8b614c0 + 5fa1a00 commit 076bdd1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
4 changes: 4 additions & 0 deletions v2/README.md
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion v2/xcore.go
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions v2/xtemplate.go
Expand Up @@ -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
Expand Down

0 comments on commit 076bdd1

Please sign in to comment.