fix typos, error args and target substitution

Author: mandelsoft

Makefile

@@ -27,6 +27,9 @@ bin/mdref: ${SOURCES}
 .PHONY: test
 test: bin/mdref
 	bin/mdref --list --headings src .
-	diff -ur doc test/doc
-	diff README.md test/README.md
+	diff -ur test/doc doc
+	diff test/README.md README.md
 
+.PHONY: gentest
+gentest: bin/mdref
+	bin/mdref --list --headings src test

VERSION

@@ -1 +1 @@
-0.3.0
+0.4.1

cmds.go

@@ -66,7 +66,7 @@ func (i *filter) Filter(data []byte) ([]byte, error) {
 	var result []byte
 	for _, m := range matches {
 		if len(m) != 2 {
-			return nil, fmt.Errorf("regular expressin must contain one matching group")
+			return nil, fmt.Errorf("regular expression must contain one matching group")
 		}
 		result = append(result, m[1]...)
 		result = append(result, []byte(sep)...)
@@ -82,7 +82,7 @@ func (i *Include) GetSubstitution(p string) ([]byte, error) {
 
 	data, err = i.extractor.extract(data)
 	if err != nil {
-		return nil, fmt.Errorf("include file %q; %w", err)
+		return nil, fmt.Errorf("include file %q: %w", i.file, err)
 	}
 	return i.filter.Filter(data)
 }
@@ -167,7 +167,7 @@ func (i *NumExtractor) extract(data []byte) ([]byte, error) {
 		end = i.end
 	}
 	if end > len(lines) {
-		return nil, fmt.Errorf("end line %d after end of file (%d lines", end, len(lines))
+		return nil, fmt.Errorf("end line %d after end of file (%d lines)", end, len(lines))
 	}
 	return []byte(strings.Join(lines[start:end], "\n")), nil
 }

doc/chapters/commands.md

@@ -9,6 +9,9 @@ All commands use the same basic annotation syntax:
 
 The following commands are supported:
 
+- [`include`](#include) include content of other file
+- [`execute`](#execute) unclude output of command execution
+
 ### Include
 
 The include command uses the following syntax

generate.go

@@ -59,10 +59,10 @@ func generate(files []*File, resolution Resolution, source, target string) error
 			}
 
 			for k := range f.refs {
-				exp := regexp.MustCompile("({{" + k + "}})")
+				exp := regexp.MustCompile(`\({{` + k + `}}\)`)
 
 				ref, _ := resolution.Resolve(k, f.relpath)
-				data = exp.ReplaceAll(data, []byte(ref))
+				data = exp.ReplaceAll(data, []byte("("+ref+")"))
 			}
 
 			for k, r := range f.targets {

src/doc/chapters/commands.md

@@ -10,6 +10,10 @@ All commands use the same basic annotation syntax:
 
 The following commands are supported:
 
+- [`include`]({{cmd-include}}) include content of other file
+- [`execute`]({{cmd-execute}}) unclude output of command execution
+
+{{cmd-include}}
 ### Include
 
 The include command uses the following syntax
@@ -73,6 +77,7 @@ using
 {{include}{../../../cmds.go}{filter}{(?m)^.*// ?(.*)$}}
 </pre>
 
+{{cmd-execute}}
 ### Execute
 
 The execute command uses the following syntax

test/doc/chapters/commands.md

@@ -9,6 +9,9 @@ All commands use the same basic annotation syntax:
 
 The following commands are supported:
 
+- [`include`](#include) include content of other file
+- [`execute`](#execute) unclude output of command execution
+
 ### Include
 
 The include command uses the following syntax