concatenate sed commands

[populate.git] / populate.sh

diff --git a/populate.sh b/populate.sh
index 2010bd7..9a9b7e6 100755 (executable)
--- a/populate.sh
+++ b/populate.sh
@@ -116,10 +116,14 @@ function formatify() {
            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/â\80\9f/``/g;s/”/'"''"'/g;s/<lang:tex>//g;s/<\/lang:tex>//g;s/<lang:[^>]*>.*<\/lang:[^>]*>//g'
+s/â\80\9c/``/g;s/”/'"''"'/g;s/<lang:tex>//g;s/<\/lang:tex>//g;s/<lang:[^>]*>.*<\/lang:[^>]*>//g'
        elif [ "$1" = "htm" ]; then
-           sed "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'
+            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;"'
+                 s/<lang:htm>//g;s/<\/lang:htm>//g;s/<lang:[^>]*>.*<\/lang:[^>]*>//g'
        fi
     )