Index: src/branch.c
==================================================================
--- src/branch.c
+++ src/branch.c
@@ -506,11 +506,11 @@
     "   AND tag.tagname GLOB 'sym-*'",
     rid
   );
   while( db_step(&q)==SQLITE_ROW ){
     const char *zTagName = db_column_text(&q, 0);
-    @ %z(href("%R/timeline?r=%T&n=200",zTagName))[timeline]</a>
+    @ [%z(href("%R/timeline?r=%T&n=200",zTagName))timeline</a>]
   }
   db_finalize(&q);
 }
 
 /*

Index: src/browse.c
==================================================================
--- src/browse.c
+++ src/browse.c
@@ -1040,18 +1040,18 @@
   zGlob = P("glob");
   compute_fileage(rid,zGlob);
   db_multi_exec("CREATE INDEX fileage_ix1 ON fileage(mid,pathname);");
 
   @ <h2>Files in
-  @ %z(href("%R/info/%!S",zUuid))[%S(zUuid)]</a>
+  @ [%z(href("%R/info/%!S",zUuid))%S(zUuid)</a>]
   if( zGlob && zGlob[0] ){
     @ that match "%h(zGlob)" and
   }
   @ ordered by check-in time</h2>
   @
   @ <p>Times are relative to the check-in time for
-  @ %z(href("%R/ci/%!S",zUuid))[%S(zUuid)]</a> which is
+  @ [%z(href("%R/ci/%!S",zUuid))%S(zUuid)</a>] which is
   @ %z(href("%R/timeline?c=%t",zNow))%s(zNow)</a>.</p>
   @
   @ <div class='fileage'><table>
   @ <tr><th>Time</th><th>Files</th><th>Check-in</th></tr>
   db_prepare(&q1,
@@ -1095,11 +1095,11 @@
       }
     }
     db_reset(&q2);
     @ </td>
     @ <td>
-    @ %z(href("%R/info/%!S",zUuid))[%S(zUuid)]</a>
+    @ [%z(href("%R/info/%!S",zUuid))%S(zUuid)</a>]
     if( showId ){
       @ (%d(mid))
     }
     @ %W(zComment) (user:
     @ %z(href("%R/timeline?u=%t&c=%!S&nd&n=200",zUser,zUuid))%h(zUser)</a>,

Index: src/diff.c
==================================================================
--- src/diff.c
+++ src/diff.c
@@ -2366,16 +2366,16 @@
 #if 0
       if( i>0 ){
         char *zLink = xhref("target='infowindow'",
                             "%R/fdiff?v1=%S&v2=%S&sbs=1",
                             p->zFUuid,ann.aVers[0].zFUuid);
-        @ %z(zLink)[diff-to-top]</a>
+        @ [%z(zLink)diff-to-top</a>]
         if( i>1 ){
            zLink = xhref("target='infowindow'",
                          "%R/fdiff?v1=%S&v2=%S&sbs=1",
                          p->zFUuid,p[-1].zFUuid);
-           @ %z(zLink)[diff-to-previous]</a>
+           @ [%z(zLink)diff-to-previous</a>]
         }
       }
 #endif
     }
     @ </ol>

Index: src/finfo.c
==================================================================
--- src/finfo.c
+++ src/finfo.c
@@ -489,11 +489,11 @@
         char *zPrevName = db_text(0, "SELECT name FROM filename WHERE fnid=%d",
                                   pfnid);
         @ <b>Renamed</b> from
         @ %z(href("%R/finfo?name=%t", zPrevName))%h(zPrevName)</a>
       }
-      @ %z(href("%R/artifact/%!S",zUuid))[%S(zUuid)]</a>
+      @ [%z(href("%R/artifact/%!S",zUuid))%S(zUuid)</a>]
       if( fShowId ){
         @ (%d(frid))
       }
       @ part of check-in
     }else{
@@ -519,17 +519,15 @@
     @ %W(zCom) (user:
     hyperlink_to_user(zUser, zDate, "");
     @ branch: %z(href("%R/timeline?t=%T&n=200",zBr))%h(zBr)</a>)
     if( g.perm.Hyperlink && zUuid ){
       const char *z = zFilename;
-      @ %z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))
-      @ [annotate]</a>
-      @ %z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))
-      @ [blame]</a>
-      @ %z(href("%R/timeline?n=200&uf=%!S",zUuid))[check-ins&nbsp;using]</a>
+      @ [%z(href("%R/annotate?filename=%h&checkin=%s",z,zCkin))annotate</a>]
+      @ [%z(href("%R/blame?filename=%h&checkin=%s",z,zCkin))blame</a>]
+      @ [%z(href("%R/timeline?n=200&uf=%!S",zUuid))check-ins&nbsp;using</a>]
       if( fpid>0 ){
-        @ %z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))[diff]</a>
+        @ [%z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zPUuid,zUuid))diff</a>]
       }
     }
     if( fDebug & FINFO_DEBUG_MLINK ){
       int ii;
       char *zAncLink;
@@ -539,11 +537,11 @@
         for(ii=1; ii<nParent; ii++){
           @ %d(aParent[ii])
         }
       }
       zAncLink = href("%R/finfo?name=%T&ci=%!S&debug=1",zFilename,zCkin);
-      @ %z(zAncLink)[ancestry]</a>
+      @ [%z(zAncLink)ancestry</a>]
     }
     tag_private_status(frid);
     @ </td></tr>
   }
   db_finalize(&q);

Index: src/info.c
==================================================================
--- src/info.c
+++ src/info.c
@@ -397,12 +397,12 @@
     }
   }else{
     if( zOld && zNew ){
       if( fossil_strcmp(zOld, zNew)!=0 ){
         @ Modified %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
-        @ from %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>
-        @ to %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
+        @ from [%z(href("%R/artifact/%!S",zOld))%S(zOld)</a>]
+        @ to [%z(href("%R/artifact/%!S",zNew))%S(zNew)</a>].
       }else if( zOldName!=0 && fossil_strcmp(zName,zOldName)!=0 ){
         @ Name change
         @ from %z(href("%R/finfo?name=%T",zOldName))%h(zOldName)</a>
         @ to %z(href("%R/finfo?name=%T",zName))%h(zName)</a>.
       }else{
@@ -412,24 +412,24 @@
         }else if( mperm==PERM_LNK ){
           @ a symlink with target
         }else{
           @ a regular file with contents
         }
-        @ %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
+        @ [%z(href("%R/artifact/%!S",zNew))%S(zNew)</a>].
       }
     }else if( zOld ){
       @ Deleted %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
-      @ version %z(href("%R/artifact/%!S",zOld))[%S(zOld)]</a>.
+      @ version [%z(href("%R/artifact/%!S",zOld))%S(zOld)</a>].
     }else{
       @ Added %z(href("%R/finfo?name=%T",zName))%h(zName)</a>
-      @ version %z(href("%R/artifact/%!S",zNew))[%S(zNew)]</a>.
+      @ version [%z(href("%R/artifact/%!S",zNew))%S(zNew)</a>].
     }
     if( diffFlags ){
       append_diff(zOld, zNew, diffFlags, pRe);
     }else if( zOld && zNew && fossil_strcmp(zOld,zNew)!=0 ){
       @ &nbsp;&nbsp;
-      @ %z(href("%R/fdiff?v1=%!S&v2=%!S&sbs=1",zOld,zNew))[diff]</a>
+      @ [%z(href("%R/fdiff?v1=%!S&v2=%!S&sbs=1",zOld,zNew))diff</a>]
     }
   }
   @ </p>
 }
 
@@ -1226,11 +1226,11 @@
     int mPerm = db_column_int(&q, 5);
     const char *zBr = db_column_text(&q, 6);
     int sameFilename = prevName!=0 && fossil_strcmp(zName,prevName)==0;
     if( sameFilename && !showDetail ){
       if( cnt==1 ){
-        @ %z(href("%R/whatis/%!S",zUuid))[more...]</a>
+        @ [%z(href("%R/whatis/%!S",zUuid))more...</a>]
       }
       cnt++;
       continue;
     }
     if( !sameFilename ){
@@ -1269,15 +1269,14 @@
       @ on branch %z(href("%R/timeline?r=%T",zBr))%h(zBr)</a>
     }
     @ &mdash; %!W(zCom) (user:
     hyperlink_to_user(zUser,zDate,")");
     if( g.perm.Hyperlink ){
-      @ %z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))[ancestry]</a>
-      @ %z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
-      @ [annotate]</a>
-      @ %z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))
-      @ [blame]</a>
+      @ [%z(href("%R/finfo?name=%T&ci=%!S",zName,zVers))ancestry</a>]
+      @ [%z(href("%R/annotate?filename=%T&checkin=%!S",zName,zVers))
+      @ annotate</a>]
+      @ [%z(href("%R/blame?filename=%T&checkin=%!S",zName,zVers))blame</a>]
     }
     cnt++;
     if( pDownloadName && blob_size(pDownloadName)==0 ){
       blob_append(pDownloadName, zName, -1);
     }
@@ -1523,17 +1522,17 @@
                           g.zTop, P("v1"), P("v2"), zW);
   }
 
   if( P("smhdr")!=0 ){
     @ <h2>Differences From Artifact
-    @ %z(href("%R/artifact/%!S",zV1))[%S(zV1)]</a> To
-    @ %z(href("%R/artifact/%!S",zV2))[%S(zV2)]</a>.</h2>
+    @ [%z(href("%R/artifact/%!S",zV1))%S(zV1)</a>] To
+    @ [%z(href("%R/artifact/%!S",zV2))%S(zV2)</a>].</h2>
   }else{
     @ <h2>Differences From
-    @ Artifact %z(href("%R/artifact/%!S",zV1))[%S(zV1)]</a>:</h2>
+    @ Artifact [%z(href("%R/artifact/%!S",zV1))%S(zV1)</a>]:</h2>
     object_description(v1, objdescFlags, 0);
-    @ <h2>To Artifact %z(href("%R/artifact/%!S",zV2))[%S(zV2)]</a>:</h2>
+    @ <h2>To Artifact [%z(href("%R/artifact/%!S",zV2))%S(zV2)</a>]:</h2>
     object_description(v2, objdescFlags, 0);
   }
   if( pRe ){
     @ <b>Only differences that match regular expression "%h(zRe)"
     @ are shown.</b>

Index: src/setup.c
==================================================================
--- src/setup.c
+++ src/setup.c
@@ -404,11 +404,11 @@
     zLogin = P("login");
     if( strlen(zLogin)==0 ){
       style_header("User Creation Error");
       @ <span class="loginError">Empty login not allowed.</span>
       @
-      @ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p>
+      @ <p>[<a href="setup_uedit?id=%d(uid)">Bummer</a>]</p>
       style_footer();
       return;
     }
     if( isValidPwString(zPw) ){
       zPw = sha1_shared_secret(zPw, zLogin, 0);
@@ -419,11 +419,11 @@
     if( db_exists("SELECT 1 FROM user WHERE login=%Q AND uid!=%d", zLogin, uid) ){
       style_header("User Creation Error");
       @ <span class="loginError">Login "%h(zLogin)" is already used by
       @ a different user.</span>
       @
-      @ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p>
+      @ <p>[<a href="setup_uedit?id=%d(uid)">Bummer</a>]</p>
       style_footer();
       return;
     }
     login_verify_csrf_secret();
     db_multi_exec(
@@ -464,11 +464,11 @@
       if( zErr ){
         style_header("User Change Error");
         admin_log( "Error updating user '%q': %s'.", zLogin, zErr );
         @ <span class="loginError">%s(zErr)</span>
         @
-        @ <p><a href="setup_uedit?id=%d(uid)">[Bummer]</a></p>
+        @ <p>[<a href="setup_uedit?id=%d(uid)">Bummer</a>]</p>
         style_footer();
         return;
       }
     }
     cgi_redirect("setup_ulist");

Index: src/timeline.c
==================================================================
--- src/timeline.c
+++ src/timeline.c
@@ -41,11 +41,11 @@
 /*
 ** Generate a hyperlink to a version.
 */
 void hyperlink_to_uuid(const char *zUuid){
   if( g.perm.Hyperlink ){
-    @ %z(xhref("class='timelineHistLink'","%R/info/%!S",zUuid))[%S(zUuid)]</a>
+    @ [%z(xhref("class='timelineHistLink'","%R/info/%!S",zUuid))%S(zUuid)</a>]
   }else{
     @ <span class="timelineHistDsp">[%S(zUuid)]</span>
   }
 }
 
@@ -573,23 +573,23 @@
           if( isMergeNew ){
             @ (added by merge)
           }else{
             @ (new file)
           }
-          @ &nbsp; %z(href("%R/artifact/%!S",zNew))[view]</a></li>
+          @ &nbsp; [%z(href("%R/artifact/%!S",zNew))view</a>]</li>
         }else if( isDel ){
           @ <li> %s(zA)%h(zFilename)</a> (deleted)</li>
         }else if( fossil_strcmp(zOld,zNew)==0 && zOldName!=0 ){
           @ <li> %h(zOldName) &rarr; %s(zA)%h(zFilename)</a>%s(zId)
-          @ %s(zUnpub) %z(href("%R/artifact/%!S",zNew))[view]</a></li>
+          @ %s(zUnpub) [%z(href("%R/artifact/%!S",zNew))view</a>]</li>
         }else{
           if( zOldName!=0 ){
             @ <li>%h(zOldName) &rarr; %s(zA)%h(zFilename)%s(zId)</a> %s(zUnpub)
           }else{
             @ <li>%s(zA)%h(zFilename)</a>%s(zId) &nbsp; %s(zUnpub)
           }
-          @ %z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zOld,zNew))[diff]</a></li>
+          @ [%z(href("%R/fdiff?sbs=1&v1=%!S&v2=%!S",zOld,zNew))diff</a>]</li>
         }
         fossil_free(zA);
       }
       db_reset(&fchngQuery);
       if( inUl ){
@@ -1441,13 +1441,13 @@
       p = p->u.pTo;
     }
     blob_append(&sql, ")", -1);
     path_reset();
     blob_append(&desc, "All nodes on the path from ", -1);
-    blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h", zFrom), zFrom);
+    blob_appendf(&desc, "[%z%h</a>]", href("%R/info/%h", zFrom), zFrom);
     blob_append(&desc, " to ", -1);
-    blob_appendf(&desc, "%z[%h]</a>", href("%R/info/%h",zTo), zTo);
+    blob_appendf(&desc, "[%z%h</a>]", href("%R/info/%h",zTo), zTo);
     tmFlags |= TIMELINE_DISJOINT;
     db_multi_exec("%s", blob_sql_text(&sql));
   }else if( (p_rid || d_rid) && g.perm.Read ){
     /* If p= or d= is present, ignore all other parameters other than n= */
     char *zUuid;
@@ -1481,12 +1481,11 @@
         blob_appendf(&desc, "%d ancestors", np);
         db_multi_exec("%s", blob_sql_text(&sql));
       }
       if( useDividers ) selectedRid = p_rid;
     }
-    blob_appendf(&desc, " of %z[%S]</a>",
-                   href("%R/info/%!S", zUuid), zUuid);
+    blob_appendf(&desc, " of [%z%S</a>]", href("%R/info/%!S", zUuid), zUuid);
     if( d_rid ){
       if( p_rid ){
         /* If both p= and d= are set, we don't have the uuid of d yet. */
         zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", d_rid);
       }
@@ -1508,11 +1507,11 @@
     blob_append_sql(&sql, " AND event.objid IN ok");
     db_multi_exec("%s", blob_sql_text(&sql));
     if( useDividers ) selectedRid = f_rid;
     blob_appendf(&desc, "Parents and children of check-in ");
     zUuid = db_text("", "SELECT uuid FROM blob WHERE rid=%d", f_rid);
-    blob_appendf(&desc, "%z[%S]</a>", href("%R/info/%!S", zUuid), zUuid);
+    blob_appendf(&desc, "[%z%S</a>]", href("%R/info/%!S", zUuid), zUuid);
     tmFlags |= TIMELINE_DISJOINT;
     style_submenu_binary("v","With Files","Without Files",
                          zType[0]!='a' && zType[0]!='c');
     if( (tmFlags & TIMELINE_UNHIDE)==0 ){
       timeline_submenu(&url, "Unhide", "unhide", "", 0);

Index: src/wiki.c
==================================================================
--- src/wiki.c
+++ src/wiki.c
@@ -839,11 +839,11 @@
 ** Function called to output extra text at the end of each line in
 ** a wiki history listing.
 */
 static void wiki_history_extra(int rid){
   if( db_exists("SELECT 1 FROM tagxref WHERE rid=%d", rid) ){
-    @ %z(href("%R/wdiff?name=%t&a=%d",zWikiPageName,rid))[diff]</a>
+    @ [%z(href("%R/wdiff?name=%t&a=%d",zWikiPageName,rid))diff</a>]
   }
 }
 
 /*
 ** WEBPAGE: whistory

Index: src/wikiformat.c
==================================================================
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1225,37 +1225,36 @@
       ** as crossed out if the ticket is closed.
       */
       if( isClosed ){
         if( g.perm.Hyperlink ){
           blob_appendf(p->pOut,
-             "%z<span class=\"wikiTagCancelled\">[",
-             href("%R/info/%s",zTarget)
+             "[%z<span class=\"wikiTagCancelled\">", href("%R/info/%s",zTarget)
           );
-          zTerm = "]</span></a>";
+          zTerm = "</span></a>]";
         }else{
-          blob_appendf(p->pOut,"<span class=\"wikiTagCancelled\">[");
-          zTerm = "]</span>";
+          blob_appendf(p->pOut,"[<span class=\"wikiTagCancelled\">");
+          zTerm = "</span>]";
         }
       }else{
         if( g.perm.Hyperlink ){
-          blob_appendf(p->pOut,"%z[", href("%R/info/%s", zTarget));
-          zTerm = "]</a>";
+          blob_appendf(p->pOut,"[%z", href("%R/info/%s", zTarget));
+          zTerm = "</a>]";
         }else{
           blob_appendf(p->pOut, "[");
           zTerm = "]";
         }
       }
     }else if( !in_this_repo(zTarget) ){
       if( (p->state & (WIKI_LINKSONLY|WIKI_NOBADLINKS))!=0 ){
         zTerm = "";
       }else{
-        blob_appendf(p->pOut, "<span class=\"brokenlink\">[");
-        zTerm = "]</span>";
+        blob_appendf(p->pOut, "[<span class=\"brokenlink\">");
+        zTerm = "</span>]";
       }
     }else if( g.perm.Hyperlink ){
-      blob_appendf(p->pOut, "%z[",href("%R/info/%s", zTarget));
-      zTerm = "]</a>";
+      blob_appendf(p->pOut, "[%z",href("%R/info/%s", zTarget));
+      zTerm = "</a>]";
     }else{
       zTerm = "";
     }
   }else if( strlen(zTarget)>=10 && fossil_isdigit(zTarget[0]) && zTarget[4]=='-'
             && db_int(0, "SELECT datetime(%Q) NOT NULL", zTarget) ){
@@ -1266,12 +1265,12 @@
     /* Probably an array subscript in code */
     zTerm = "";
   }else if( (p->state & (WIKI_NOBADLINKS|WIKI_LINKSONLY))!=0 ){
     zTerm = "";
   }else{
-    blob_appendf(p->pOut, "<span class=\"brokenlink\">[%h]", zTarget);
-    zTerm = "</span>";
+    blob_appendf(p->pOut, "[<span class=\"brokenlink\">%h", zTarget);
+    zTerm = "</span>]";
   }
   assert( strlen(zTerm)<nClose );
   sqlite3_snprintf(nClose, zClose, "%s", zTerm);
 }
 
@@ -1452,11 +1451,11 @@
           while( fossil_isspace(*zDisplay) ) zDisplay++;
         }
         openHyperlink(p, zTarget, zClose, sizeof(zClose), zOrig);
         if( linksOnly || zClose[0]==0 || p->inVerbatim ){
           if( cS1 ) z[iS1] = cS1;
-          if( zClose[0]!=']' ){
+          if( zClose[strlen(zClose) - 1]!=']' ){
             blob_appendf(p->pOut, "[%h]%s", zTarget, zClose);
           }else{
             blob_appendf(p->pOut, "%h%s", zTarget, zClose);
           }
         }else{