actions/mark
1
0
Fork 0
mirror of https://github.com/kovetskiy/mark.git synced 2025-04-24 05:42:40 +08:00
Code Issues Packages Projects Releases 1 Wiki Activity

allow templates and macros to include blanks in path (#191)

Browse Source
This commit is contained in:
Stephan Hradek 2022-06-06 08:35:48 +02:00 committed by GitHub
parent 5428cc6833
commit 3c7bd6133f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/mark/includes/templates.go
View File

@ -18,7 +18,7 @@ import (
// <!-- Include: <template path> // <!-- Include: <template path>
// <optional yaml data> --> // <optional yaml data> -->
var reIncludeDirective = regexp.MustCompile( var reIncludeDirective = regexp.MustCompile(
`(?s)<!--\s*Include:\s*(?P<template>\S+)\s*(\n(?P<config>.*?))?-->`) `(?s)<!--\s*Include:\s*(?P<template>.+?)\s*(\n(?P<config>.*?))?-->`)
func LoadTemplate( func LoadTemplate(
base string, base string,

2
pkg/mark/macro/macro.go
View File

@ -21,7 +21,7 @@ var reMacroDirective = regexp.MustCompile(
`(?s)` + // dot capture newlines `(?s)` + // dot capture newlines
/**/ `<!--\s*Macro:\s*(?P<expr>[^\n]+)\n` + /**/ `<!--\s*Macro:\s*(?P<expr>[^\n]+)\n` +
/* */ `\s*Template:\s*(?P<template>\S+)\s*` + /* */ `\s*Template:\s*(?P<template>.+?)\s*` +
/* */ `(?P<config>\n.*?)?-->`, /* */ `(?P<config>\n.*?)?-->`,
) )