Skip to content

Commit 5cd9e2b

Browse files
committed
Use explicit for loops and rename variable
1 parent 1951f2a commit 5cd9e2b

File tree

1 file changed

+60
-24
lines changed

1 file changed

+60
-24
lines changed

tools/make/lib/markdown/equations.mk

Lines changed: 60 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
GIT_COMMIT_EQUATIONS ?= $(GIT_COMMIT) -m 'Process Markdown equations'
2323

2424
# Define the command to commit staged files after inserting resource URLs:
25-
GIT_COMMIT_SRC_URLS ?= $(GIT_COMMIT) -m 'Insert src urls into equation elements'
25+
GIT_COMMIT_EQUATIONS_SRC_URLS ?= $(GIT_COMMIT) -m 'Insert src urls into equation elements'
2626

2727
# Define the path relative to a processed Markdown file for storing equation resources:
2828
EQUATION_RESOURCES_PATH ?= ./docs/img/
@@ -97,7 +97,7 @@ markdown-equations: $(NODE_MODULES) assert-clean-working-directory
9797
$(REMARK_EQUATIONS_FLAGS) \
9898
$(REMARK_IMG_EQUATIONS_SRC_URLS_PLUGIN_FLAGS) \
9999
$(REMARK_EQUATIONS_OUTPUT_FLAG) && \
100-
$(GIT_ADD) && $(GIT_COMMIT_SRC_URLS)
100+
$(GIT_ADD) && $(GIT_COMMIT_EQUATIONS_SRC_URLS)
101101

102102
.PHONY: markdown-equations
103103

@@ -118,10 +118,16 @@ markdown-equations: $(NODE_MODULES) assert-clean-working-directory
118118
# make markdown-img-equations MARKDOWN_PATTERN='README.md' MARKDOWN_FILTER='.*/math/base/special/.*'
119119
#/
120120
markdown-img-equations: $(NODE_MODULES)
121-
$(QUIET) NODE_PATH="$(NODE_PATH)" $(REMARK) $(MARKDOWN_FILES) \
122-
$(REMARK_EQUATIONS_FLAGS) \
123-
$(REMARK_IMG_EQUATIONS_PLUGIN_FLAGS) \
124-
$(REMARK_EQUATIONS_OUTPUT_FLAG)
121+
$(QUIET) $(FIND_MARKDOWN_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
122+
echo ""; \
123+
echo "Processing file: $$file"; \
124+
NODE_PATH="$(NODE_PATH)" \
125+
$(NODE) "$(REMARK)" \
126+
$$file \
127+
$(REMARK_EQUATIONS_FLAGS) \
128+
$(REMARK_IMG_EQUATIONS_PLUGIN_FLAGS) \
129+
$(REMARK_EQUATIONS_OUTPUT_FLAG) || exit 1; \
130+
done
125131

126132
.PHONY: markdown-img-equations
127133

@@ -138,10 +144,16 @@ markdown-img-equations: $(NODE_MODULES)
138144
# make markdown-img-equations-files FILES='/foo/foo.md /foo/bar.md'
139145
#/
140146
markdown-img-equations-files: $(NODE_MODULES)
141-
$(QUIET) NODE_PATH="$(NODE_PATH)" $(REMARK) $(FILES) \
142-
$(REMARK_EQUATIONS_FLAGS) \
143-
$(REMARK_IMG_EQUATIONS_PLUGIN_FLAGS) \
144-
$(REMARK_EQUATIONS_OUTPUT_FLAG)
147+
$(QUIET) for file in $(FILES); do \
148+
echo ""; \
149+
echo "Processing file: $$file"; \
150+
NODE_PATH="$(NODE_PATH)" \
151+
$(NODE) "$(REMARK)" \
152+
$$file \
153+
$(REMARK_EQUATIONS_FLAGS) \
154+
$(REMARK_IMG_EQUATIONS_PLUGIN_FLAGS) \
155+
$(REMARK_EQUATIONS_OUTPUT_FLAG) || exit 1; \
156+
done
145157

146158
.PHONY: markdown-img-equations-files
147159

@@ -157,9 +169,15 @@ markdown-img-equations-files: $(NODE_MODULES)
157169
# @example
158170
# make markdown-svg-equations MARKDOWN_PATTERN='README.md' MARKDOWN_FILTER='.*/math/base/special/.*'
159171
markdown-svg-equations: $(NODE_MODULES)
160-
$(QUIET) NODE_PATH="$(NODE_PATH)" $(REMARK) $(MARKDOWN_FILES) \
161-
$(REMARK_EQUATIONS_FLAGS) \
162-
$(REMARK_SVG_EQUATIONS_PLUGIN_FLAGS)
172+
$(QUIET) $(FIND_MARKDOWN_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
173+
echo ""; \
174+
echo "Processing file: $$file"; \
175+
NODE_PATH="$(NODE_PATH)" \
176+
$(NODE) "$(REMARK)" \
177+
$$file \
178+
$(REMARK_EQUATIONS_FLAGS) \
179+
$(REMARK_SVG_EQUATIONS_PLUGIN_FLAGS) || exit 1; \
180+
done
163181

164182
.PHONY: markdown-svg-equations
165183

@@ -175,9 +193,15 @@ markdown-svg-equations: $(NODE_MODULES)
175193
# @example
176194
# make markdown-svg-equations-files FILES='/foo/foo.md /foo/bar.md'
177195
markdown-svg-equations-files: $(NODE_MODULES)
178-
$(QUIET) NODE_PATH="$(NODE_PATH)" $(REMARK) $(FILES) \
179-
$(REMARK_EQUATIONS_FLAGS) \
180-
$(REMARK_SVG_EQUATIONS_PLUGIN_FLAGS)
196+
$(QUIET) for file in $(FILES); do \
197+
echo ""; \
198+
echo "Processing file: $$file"; \
199+
NODE_PATH="$(NODE_PATH)" \
200+
$(NODE) "$(REMARK)" \
201+
$$file \
202+
$(REMARK_EQUATIONS_FLAGS) \
203+
$(REMARK_SVG_EQUATIONS_PLUGIN_FLAGS) || exit 1; \
204+
done
181205

182206
.PHONY: markdown-svg-equations-files
183207

@@ -198,10 +222,16 @@ markdown-svg-equations-files: $(NODE_MODULES)
198222
# @example
199223
# make markdown-img-equations-src-urls MARKDOWN_PATTERN='README.md' MARKDOWN_FILTER='.*/math/base/special/.*'
200224
markdown-img-equations-src-urls: $(NODE_MODULES)
201-
$(QUIET) NODE_PATH="$(NODE_PATH)" $(REMARK) $(MARKDOWN_FILES) \
202-
$(REMARK_EQUATIONS_FLAGS) \
203-
$(REMARK_IMG_EQUATIONS_SRC_URLS_PLUGIN_FLAGS) \
204-
$(REMARK_EQUATIONS_OUTPUT_FLAG)
225+
$(QUIET) $(FIND_MARKDOWN_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r file; do \
226+
echo ""; \
227+
echo "Processing file: $$file"; \
228+
NODE_PATH="$(NODE_PATH)" \
229+
$(NODE) "$(REMARK)" \
230+
$$file \
231+
$(REMARK_EQUATIONS_FLAGS) \
232+
$(REMARK_IMG_EQUATIONS_SRC_URLS_PLUGIN_FLAGS) \
233+
$(REMARK_EQUATIONS_OUTPUT_FLAG) || exit 1; \
234+
done
205235

206236
.PHONY: markdown-img-equations-src-urls
207237

@@ -218,10 +248,16 @@ markdown-img-equations-src-urls: $(NODE_MODULES)
218248
# @example
219249
# make markdown-img-equations-src-urls-files FILES='/foo/foo.md /foo/bar.md'
220250
markdown-img-equations-src-urls-files: $(NODE_MODULES)
221-
$(QUIET) NODE_PATH="$(NODE_PATH)" $(REMARK) $(FILES) \
222-
$(REMARK_EQUATIONS_FLAGS) \
223-
$(REMARK_IMG_EQUATIONS_SRC_URLS_PLUGIN_FLAGS) \
224-
$(REMARK_EQUATIONS_OUTPUT_FLAG)
251+
$(QUIET) for file in $(FILES); do \
252+
echo ""; \
253+
echo "Processing file: $$file"; \
254+
NODE_PATH="$(NODE_PATH)" \
255+
$(NODE) "$(REMARK)" \
256+
$$file \
257+
$(REMARK_EQUATIONS_FLAGS) \
258+
$(REMARK_IMG_EQUATIONS_SRC_URLS_PLUGIN_FLAGS) \
259+
$(REMARK_EQUATIONS_OUTPUT_FLAG) || exit 1; \
260+
done
225261

226262
.PHONY: markdown-img-equations-src-urls-files
227263

0 commit comments

Comments
 (0)