lib/navbar.awk: renamed the functions genNavbarHTML and genNavbarGMI to genHTMLNavbar and genGemtextNavbar; changed the loops at lib/path.awk to use < instead of <= as their condition statement
This commit is contained in:
parent
cd9997ecb0
commit
447d45108e
|
@ -1,4 +1,4 @@
|
|||
function genNavbarHTML(filename, sourcePath) {
|
||||
function genHTMLNavbar(filename, sourcePath) {
|
||||
if (filename == "-" || filename == "/dev/stdout/")
|
||||
return ""
|
||||
|
||||
|
@ -21,7 +21,7 @@ function genNavbarHTML(filename, sourcePath) {
|
|||
getRelativePath(dirname, sourcePath "/feed.atom"))
|
||||
}
|
||||
|
||||
function genNavbarGMI(filename, sourcePath) {
|
||||
function genGemtextNavbar(filename, sourcePath) {
|
||||
if (filename == "-" || filename == "/dev/stdout/")
|
||||
return ""
|
||||
|
||||
|
|
18
lib/path.awk
18
lib/path.awk
|
@ -7,7 +7,7 @@ function getDirname(path, pathComponents, dirname) {
|
|||
|
||||
if (length(pathComponents) < 2) return "."
|
||||
|
||||
for (i = 1; i <= length(pathComponents) - 1; i++)
|
||||
for (i = 1; i < length(pathComponents); i++)
|
||||
dirname = dirname pathComponents[i] "/"
|
||||
|
||||
return dirname
|
||||
|
@ -20,7 +20,7 @@ function resolvePath(path, resolvedPath, pathComponents) {
|
|||
sub(/\/+$/, "", path)
|
||||
split(path, pathComponents, "/")
|
||||
|
||||
for (i = 1; i <= length(pathComponents); i++)
|
||||
for (i = 1; i < length(pathComponents) + 1; i++)
|
||||
if (pathComponents[i] == "." || pathComponents[i] == "")
|
||||
continue
|
||||
else if (pathComponents[i+1] == "..") {
|
||||
|
@ -37,7 +37,7 @@ function resolvePath(path, resolvedPath, pathComponents) {
|
|||
function getRelativePath(base, path, resolvedPath, baseComponents, pathComponents, commonPrefix) {
|
||||
pathComponents[1] = ""
|
||||
baseComponents[1] = ""
|
||||
commonPrefixEndPosition = 1
|
||||
endOfCommonPrefix = 1
|
||||
resolvedPath = ""
|
||||
|
||||
base = resolvePath(base)
|
||||
|
@ -46,15 +46,15 @@ function getRelativePath(base, path, resolvedPath, baseComponents, pathComponent
|
|||
split(path, pathComponents, "/")
|
||||
split(base, baseComponents, "/")
|
||||
|
||||
while (pathComponents[commonPrefixEndPosition] == baseComponents[commonPrefixEndPosition] &&
|
||||
commonPrefixEndPosition < length(baseComponents) &&
|
||||
commonPrefixEndPosition < length(pathComponents))
|
||||
commonPrefixEndPosition++
|
||||
while (pathComponents[endOfCommonPrefix] == baseComponents[endOfCommonPrefix] &&
|
||||
endOfCommonPrefix < length(baseComponents) &&
|
||||
endOfCommonPrefix < length(pathComponents))
|
||||
endOfCommonPrefix++
|
||||
|
||||
for (i = commonPrefixEndPosition; i <= length(baseComponents); i++)
|
||||
for (i = endOfCommonPrefix; i < length(baseComponents) + 1; i++)
|
||||
resolvedPath = resolvedPath "../"
|
||||
|
||||
for (i = commonPrefixEndPosition; i <= length(pathComponents); i++)
|
||||
for (i = endOfCommonPrefix; i <= length(pathComponents); i++)
|
||||
resolvedPath = resolvedPath pathComponents[i] "/"
|
||||
|
||||
sub(/\/+$/, "", resolvedPath)
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
BEGIN {
|
||||
printf "%s", genNavbarGMI(FILENAME, sourcePath)
|
||||
printf "%s", genGemtextNavbar(FILENAME, sourcePath)
|
||||
}
|
||||
|
||||
{ print }
|
||||
|
|
|
@ -138,7 +138,7 @@ BEGIN {
|
|||
}
|
||||
|
||||
END {
|
||||
delete subHeadings[0]
|
||||
delete subHeadings[0] # this index at subHeadings contains nothing
|
||||
|
||||
if (length(subHeadings) > 0) {
|
||||
tocText = "<details id='toc'> <summary>Table of content</summary> <ol>\n"
|
||||
|
@ -155,7 +155,7 @@ END {
|
|||
tocText = tocText "</ol> </details>\n"
|
||||
}
|
||||
|
||||
navbarText = genNavbarHTML(FILENAME, sourcePath)
|
||||
navbarText = genHTMLNavbar(FILENAME, sourcePath)
|
||||
|
||||
dirname = getDirname(FILENAME)
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
# - sourcePath
|
||||
|
||||
BEGIN {
|
||||
printf "%s", genNavbarGMI(FILENAME, sourcePath)
|
||||
printf "%s", genGemtextNavbar(FILENAME, sourcePath)
|
||||
}
|
||||
|
||||
{
|
||||
|
|
|
@ -55,6 +55,6 @@ END {
|
|||
</body>\n\
|
||||
</html>", \
|
||||
stylesheetPath, \
|
||||
genNavbarHTML(FILENAME, sourcePath), \
|
||||
genHTMLNavbar(FILENAME, sourcePath), \
|
||||
body
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue