feat(user/mw_wc2sp.sh):Use top and bottom nav links

[BK-2020-03.git] / user / mw_wc2sp.sh

diff --git a/user/mw_wc2sp.sh b/user/mw_wc2sp.sh
index cfb6444c6bec8c41480bd4485511499bf1ff0c61..467df7a70c54f82e9fa0f927fda3b4734f0086e1 100755 (executable)
--- a/user/mw_wc2sp.sh
+++ b/user/mw_wc2sp.sh
@@ -4,7 +4,7 @@
 # Input:  arg1  path  input wikicode file
 # Output: files       wikicode file tree
 # Depends: Bash 5.1.16, GNU Coreutils 8.32
 # Input:  arg1  path  input wikicode file
 # Output: files       wikicode file tree
 # Depends: Bash 5.1.16, GNU Coreutils 8.32

-# Version: 0.3.0
+# Version: 0.4.0

 
 re_sp='^(<!-- @subpage:)(.*)([ ]*-->)$'; # subpage marker pattern
 d_out=./wikicode/; # default output dir
 
 re_sp='^(<!-- @subpage:)(.*)([ ]*-->)$'; # subpage marker pattern
 d_out=./wikicode/; # default output dir


@@ -237,6 +237,25 @@ print_wc_footer() {
     printf -- "\n<!-- End of Page -->\n";
     printf -- "\n";
 }; # print wikicode footer
     printf -- "\n<!-- End of Page -->\n";
     printf -- "\n";
 }; # print wikicode footer

+print_wc_nav() {
+    # Desc: Print navigation wikilinks
+    # Input:  var  lprev
+    #         var  lnext
+    #         var  link_prev
+    #         var  link_next
+    # Output  stdout
+
+    # Print navigation link wikicode
+    if [[ -z "$lprev" ]]; then
+        printf "\n[[%s|Next]], [[../|Up]]\n" "$link_next";
+    elif [[ -n "$lnext" ]]; then
+        printf "\n[[%s|Next]], [[%s|Previous]], [[../|Up]]\n" "$link_next" "$link_prev";
+    elif [[ -z "$lnext" ]]; then
+        printf "\n[[%s|Previous]], [[../|Up]]\n" "$link_prev";
+    else
+        yell "FATAL:Here be dragons.";
+    fi;
+}; # print wikicode navigation links

 create_output_wikicode() {
     # Desc: Use subpage list and subpage content files to create
     #   output subpage wikicode.
 create_output_wikicode() {
     # Desc: Use subpage list and subpage content files to create
     #   output subpage wikicode.


@@ -336,19 +355,10 @@ create_output_wikicode() {
         link_next+="$(prune_path_rootside "$lnext" "$fork_level_next")";
         link_prev+="$(prune_path_rootside "$lprev" "$fork_level_prev")";
 
         link_next+="$(prune_path_rootside "$lnext" "$fork_level_next")";
         link_prev+="$(prune_path_rootside "$lprev" "$fork_level_prev")";
 

-        # Print navigation link wikicode
-        if [[ -z "$lprev" ]]; then
-            printf "[[%s|Next]], [[../|Up]]\n" "$link_next" >> "$p_spwc";
-        elif [[ -n "$lnext" ]]; then
-            printf "[[%s|Next]], [[%s|Previous]], [[../|Up]]\n" "$link_next" "$link_prev" >> "$p_spwc";
-        elif [[ -z "$lnext" ]]; then
-            printf "[[%s|Previous]], [[../|Up]]\n" "$link_prev" >> "$p_spwc";
-        else
-            yell "FATAL:Here be dragons.";
-        fi;
-

         # Print subpage content
         # Print subpage content

+        print_wc_nav >> "$p_spwc";

         print_wc_content >> "$p_spwc";
         print_wc_content >> "$p_spwc";

+        print_wc_nav >> "$p_spwc";

         print_wc_footer >> "$p_spwc";
 
         declare -p i lprev lcurr lnext lprev_hier lcurr_hier lnext_hier; # debug
         print_wc_footer >> "$p_spwc";
 
         declare -p i lprev lcurr lnext lprev_hier lcurr_hier lnext_hier; # debug