X-Git-Url: https://mop.ddnsfree.com/gitweb/?p=populate.git;a=blobdiff_plain;f=populate.sh;h=e39c3cd1542a071a69c9f3358ca5de2863f202a9;hp=9a9b7e6d659788cafe649e2c5acc340f34b3783e;hb=HEAD;hpb=6a3d74d0a9a59c22d1dd4dc3311cd07b920703d9

diff --git a/populate.sh b/populate.sh
index 9a9b7e6..e39c3cd 100755
--- a/populate.sh
+++ b/populate.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # set -x
-
+# export PS4='+${BASH_SOURCE}:${LINENO}:${FUNCNAME[0]}: '
 #
 #   populate.sh
 #
@@ -99,7 +99,7 @@ function unsedify() {
 	else
 	    cat
         fi
-    ) | sed 's/\(["\\\/\$]\)/\\\1/g'
+    ) | sed 's/\(["\\\/\$&]\)/\\\1/g'
 
     return 0
 }
@@ -113,16 +113,16 @@ function formatify() {
         fi
     ) | (
 	if [ "$1" = "tex" ]; then
-	    sed 's/à/\\`a/g;s/è/\\`e/g;s/ì/\\`i/g;s/ò/\\`o/g;s/ù/\\`u/g;s/áéíóú/\\'"'"'a/g;
-s/é/\\'"'"'e/g;s/í/\\'"'"'i/g;s/ó/\\'"'"'o/g;s/ú/\\'"'"'u/g;s/°/\$\^\\circ\$/g;
-s/<i>/\\textit{/g;s/<b>/\\textbf{/g;s/<\/[ib]>/}/g;s/<url>/URL: \\textit\{/g;s/<\/url>/\}/g;
-s/“/``/g;s/”/'"''"'/g;s/<lang:tex>//g;s/<\/lang:tex>//g;s/<lang:[^>]*>.*<\/lang:[^>]*>//g'
+	    sed 's/&/\\&/g;s/à/\\`a/g;s/è/\\`e/g;s/ì/\\`i/g;s/ò/\\`o/g;s/ù/\\`u/g;s/áéíóú/\\'"'"'a/g;
+                 s/é/\\'"'"'e/g;s/í/\\'"'"'i/g;s/ó/\\'"'"'o/g;s/ú/\\'"'"'u/g;s/°/\$\^\\circ\$/g;
+                 s/<i>/\\textit{/g;s/<b>/\\textbf{/g;s/<\/[ib]>/}/g;
+                 s/<url>/\n<url>\n/g;s/<\/url>/\n<\/url>\n/g;' | \
+            sed '/^<url>$/,/^<\/url>$/ { s/_/\\_/g; };' | tee -a loggone.txt | tr -d '\n' | \
+            sed 's/<url>/URL: \\textit\{/g;s/<\/url>/\}/g;
+                 s/“/``/g;s/”/'"''"'/g;s/<lang:tex>//g;s/<\/lang:tex>//g;s/<lang:[^>]*>.*<\/lang:[^>]*>//g'
 	elif [ "$1" = "htm" ]; then
-            sed 's/<url>/\n<url>\n/g;s/<\/url>/\n<\/url>\n/g;
-                 /^<url>$/,/^<\/url>$/ { s/\\_/_/g; };
-                 /^<url>$/,/^<\/url>$/ { s/\(^[^<].*\)/<a href="\1">\1<\/a>/g; };
-                 s/^<url>$//g;s/^<\/url>$//g' | tr -d '\n' | \
-	    sed "s/${NEWLI}${NEWLI}/<br>${NEWLI}/g;"'
+            sed "s/&/&amp;/g;s/${NEWLI}${NEWLI}/<br>${NEWLI}/g;"'
+                 s/<url>\([^<]*\)<\/url>/<a href="\1">\1<\/a>/g;
                  s/<lang:htm>//g;s/<\/lang:htm>//g;s/<lang:[^>]*>.*<\/lang:[^>]*>//g'
 	fi
     )
@@ -278,7 +278,7 @@ function populator() {
 			    done
 			fi
 			tag_val="`echo "${!tag_ele}" | sed "s/\$/$NEWLI/g" | tr -d '\n' | sed "s/$NEWLI\$//g" \
-                                | formatify $frmt`"
+                                | formatify "$frmt"`"
 			debecho "  tag_val: $tag_val"
 
                         # TAG replacement
@@ -343,7 +343,7 @@ function populator() {
 	    done
             # TAG replacement
 	    tag_val="`echo "${!tag_ele}" | sed "s/\$/$NEWLI/g" | tr -d '\n' | sed "s/$NEWLI\$//g" \
-                  | formatify $frmt | unsedify`"
+                  | formatify "$frmt" | unsedify`"
 	    
 		
 	    cat $TMP3FILE | sed "s/#${tag_var}#/$tag_val/g" >$TMP4FILE