From ed8b0376b890466f9ab553485f12a8b7a3b7c63c Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Sat, 5 Jan 2019 22:54:01 -0500 Subject: Rework regexp for .md extension replacement (www) Related issue #570 The markdown file extension was not consistently replaced with an HTML extension due to a bug in the regexps used in www/publish.sh caused by the A-Z character range not being included in the character alternative. Along with correcting the aforementioned, this patch allows for more robust link anchor capturing by allowing the use and replacement of characters within the ranges a-z, A-Z, 0-9, _ (underscore), and - (hyphen). --- www/publish.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/www/publish.sh b/www/publish.sh index 9a8a6abc..eb8df8c6 100755 --- a/www/publish.sh +++ b/www/publish.sh @@ -56,12 +56,12 @@ if [[ $FILE != "./docs/fdl-1.3" && $FILE != "docs/fdl-1.3" && fi # change out .md -> .html -sed -i -e 's/\.md\(#[a-z\-]*\)*)/.html\1)/g' "$TMPFILE" -sed -i -e 's/\.md\(#[a-z\-]*\)*]/.html\1]/g' "$TMPFILE" +sed -i -e 's/\.md\(#[a-zA-Z0-9_-]*\)\?)/.html\1)/g' "$TMPFILE" +sed -i -e 's/\.md\(#[a-zA-Z0-9_-]*\)\?]/.html\1]/g' "$TMPFILE" # change out .md -> .html -sed -i -e 's/\.md\(#[a-z\-]*\)*)/.html\1)/g' "$TMPFILE" -sed -i -e 's/\.md\(#[a-z\-]*\)*]/.html\1]/g' "$TMPFILE" +sed -i -e 's/\.md\(#[a-zA-Z0-9_-]*\)\?)/.html\1)/g' "$TMPFILE" +sed -i -e 's/\.md\(#[a-zA-Z0-9_-]*\)\?]/.html\1]/g' "$TMPFILE" # work around issue #2872 TOC=$(grep -q "^x-toc-enable: true$" "$TMPFILE" && printf '%s\n' "--toc --toc-depth=2") || TOC="" -- cgit v1.2.3-70-g09d2 From 919c74c8f8a252e82f0b9dcccc97ab8170733d9a Mon Sep 17 00:00:00 2001 From: Andrew Robbins Date: Sat, 5 Jan 2019 22:57:31 -0500 Subject: Condense sed invocations in publish.sh --- www/publish.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/www/publish.sh b/www/publish.sh index eb8df8c6..d2924a48 100755 --- a/www/publish.sh +++ b/www/publish.sh @@ -56,12 +56,7 @@ if [[ $FILE != "./docs/fdl-1.3" && $FILE != "docs/fdl-1.3" && fi # change out .md -> .html -sed -i -e 's/\.md\(#[a-zA-Z0-9_-]*\)\?)/.html\1)/g' "$TMPFILE" -sed -i -e 's/\.md\(#[a-zA-Z0-9_-]*\)\?]/.html\1]/g' "$TMPFILE" - -# change out .md -> .html -sed -i -e 's/\.md\(#[a-zA-Z0-9_-]*\)\?)/.html\1)/g' "$TMPFILE" -sed -i -e 's/\.md\(#[a-zA-Z0-9_-]*\)\?]/.html\1]/g' "$TMPFILE" +sed -i -e 's/\.md\(#[a-zA-Z0-9_-]*\)\?\([])]*\)/.html\1\2/g' "$TMPFILE" # work around issue #2872 TOC=$(grep -q "^x-toc-enable: true$" "$TMPFILE" && printf '%s\n' "--toc --toc-depth=2") || TOC="" -- cgit v1.2.3-70-g09d2