Fossil SCM

Fixes to hyperlink generation for embedded documentation.

drh 2012-08-28 17:39 trunk
Commit ed6adcaf3bc7c64f14d4b2cb8539a7bd260abef7
Parent bf079432fb2ecc1…
1 file changed +6 -6
~ src/wikiformat.c
M src/wikiformat.c
+6 -6
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1079,20 +1079,20 @@
10791079
 */
10801080
 if( isClosed ){
10811081
 if( g.perm.Hyperlink ){
10821082
 blob_appendf(p->pOut,
10831083
 "%z<span class=\"wikiTagCancelled\">[",
1084
- href("info/%s",zTarget)
1084
+ href("%R/info/%s",zTarget)
10851085
 );
10861086
 zTerm = "]</span></a>";
10871087
 }else{
10881088
 blob_appendf(p->pOut,"<span class=\"wikiTagCancelled\">[");
10891089
 zTerm = "]</span>";
10901090
 }
10911091
 }else{
10921092
 if( g.perm.Hyperlink ){
1093
- blob_appendf(p->pOut,"%z[", href("info/%s", zTarget));
1093
+ blob_appendf(p->pOut,"%z[", href("%R/info/%s", zTarget));
10941094
 zTerm = "]</a>";
10951095
 }else{
10961096
 blob_appendf(p->pOut, "[");
10971097
 zTerm = "]";
10981098
 }
@@ -1099,22 +1099,22 @@
10991099
 }
11001100
 }else if( !in_this_repo(zTarget) ){
11011101
 blob_appendf(p->pOut, "<span class=\"brokenlink\">[", zTarget);
11021102
 zTerm = "]</span>";
11031103
 }else if( g.perm.Hyperlink ){
1104
- blob_appendf(p->pOut, "%z[",href("info/%s", zTarget));
1104
+ blob_appendf(p->pOut, "%z[",href("%R/info/%s", zTarget));
11051105
 zTerm = "]</a>";
11061106
 }
11071107
 }else if( strlen(zTarget)>=10 && fossil_isdigit(zTarget[0]) && zTarget[4]=='-'
11081108
 && db_int(0, "SELECT datetime(%Q) NOT NULL", zTarget) ){
1109
- blob_appendf(p->pOut, "<a href=\"timeline?c=%T\">", zTarget);
1109
+ blob_appendf(p->pOut, "<a href=\"%R/timeline?c=%T\">", zTarget);
11101110
 }else if( strncmp(zTarget, "wiki:", 5)==0
11111111
 && wiki_name_is_wellformed((const unsigned char*)zTarget) ){
11121112
 zTarget += 5;
1113
- blob_appendf(p->pOut, "<a href=\"wiki?name=%T\">", zTarget);
1113
+ blob_appendf(p->pOut, "<a href=\"%R/wiki?name=%T\">", zTarget);
11141114
 }else if( wiki_name_is_wellformed((const unsigned char *)zTarget) ){
1115
- blob_appendf(p->pOut, "<a href=\"wiki?name=%T\">", zTarget);
1115
+ blob_appendf(p->pOut, "<a href=\"%R/wiki?name=%T\">", zTarget);
11161116
 }else{
11171117
 blob_appendf(p->pOut, "<span class=\"brokenlink\">[%h]</span>", zTarget);
11181118
 zTerm = "";
11191119
 }
11201120
 assert( strlen(zTerm)<nClose );
11211121
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1079,20 +1079,20 @@
1079 */
1080 if( isClosed ){
1081 if( g.perm.Hyperlink ){
1082 blob_appendf(p->pOut,
1083 "%z<span class=\"wikiTagCancelled\">[",
1084 href("info/%s",zTarget)
1085 );
1086 zTerm = "]</span></a>";
1087 }else{
1088 blob_appendf(p->pOut,"<span class=\"wikiTagCancelled\">[");
1089 zTerm = "]</span>";
1090 }
1091 }else{
1092 if( g.perm.Hyperlink ){
1093 blob_appendf(p->pOut,"%z[", href("info/%s", zTarget));
1094 zTerm = "]</a>";
1095 }else{
1096 blob_appendf(p->pOut, "[");
1097 zTerm = "]";
1098 }
@@ -1099,22 +1099,22 @@
1099 }
1100 }else if( !in_this_repo(zTarget) ){
1101 blob_appendf(p->pOut, "<span class=\"brokenlink\">[", zTarget);
1102 zTerm = "]</span>";
1103 }else if( g.perm.Hyperlink ){
1104 blob_appendf(p->pOut, "%z[",href("info/%s", zTarget));
1105 zTerm = "]</a>";
1106 }
1107 }else if( strlen(zTarget)>=10 && fossil_isdigit(zTarget[0]) && zTarget[4]=='-'
1108 && db_int(0, "SELECT datetime(%Q) NOT NULL", zTarget) ){
1109 blob_appendf(p->pOut, "<a href=\"timeline?c=%T\">", zTarget);
1110 }else if( strncmp(zTarget, "wiki:", 5)==0
1111 && wiki_name_is_wellformed((const unsigned char*)zTarget) ){
1112 zTarget += 5;
1113 blob_appendf(p->pOut, "<a href=\"wiki?name=%T\">", zTarget);
1114 }else if( wiki_name_is_wellformed((const unsigned char *)zTarget) ){
1115 blob_appendf(p->pOut, "<a href=\"wiki?name=%T\">", zTarget);
1116 }else{
1117 blob_appendf(p->pOut, "<span class=\"brokenlink\">[%h]</span>", zTarget);
1118 zTerm = "";
1119 }
1120 assert( strlen(zTerm)<nClose );
1121
--- src/wikiformat.c
+++ src/wikiformat.c
@@ -1079,20 +1079,20 @@
1079 */
1080 if( isClosed ){
1081 if( g.perm.Hyperlink ){
1082 blob_appendf(p->pOut,
1083 "%z<span class=\"wikiTagCancelled\">[",
1084 href("%R/info/%s",zTarget)
1085 );
1086 zTerm = "]</span></a>";
1087 }else{
1088 blob_appendf(p->pOut,"<span class=\"wikiTagCancelled\">[");
1089 zTerm = "]</span>";
1090 }
1091 }else{
1092 if( g.perm.Hyperlink ){
1093 blob_appendf(p->pOut,"%z[", href("%R/info/%s", zTarget));
1094 zTerm = "]</a>";
1095 }else{
1096 blob_appendf(p->pOut, "[");
1097 zTerm = "]";
1098 }
@@ -1099,22 +1099,22 @@
1099 }
1100 }else if( !in_this_repo(zTarget) ){
1101 blob_appendf(p->pOut, "<span class=\"brokenlink\">[", zTarget);
1102 zTerm = "]</span>";
1103 }else if( g.perm.Hyperlink ){
1104 blob_appendf(p->pOut, "%z[",href("%R/info/%s", zTarget));
1105 zTerm = "]</a>";
1106 }
1107 }else if( strlen(zTarget)>=10 && fossil_isdigit(zTarget[0]) && zTarget[4]=='-'
1108 && db_int(0, "SELECT datetime(%Q) NOT NULL", zTarget) ){
1109 blob_appendf(p->pOut, "<a href=\"%R/timeline?c=%T\">", zTarget);
1110 }else if( strncmp(zTarget, "wiki:", 5)==0
1111 && wiki_name_is_wellformed((const unsigned char*)zTarget) ){
1112 zTarget += 5;
1113 blob_appendf(p->pOut, "<a href=\"%R/wiki?name=%T\">", zTarget);
1114 }else if( wiki_name_is_wellformed((const unsigned char *)zTarget) ){
1115 blob_appendf(p->pOut, "<a href=\"%R/wiki?name=%T\">", zTarget);
1116 }else{
1117 blob_appendf(p->pOut, "<span class=\"brokenlink\">[%h]</span>", zTarget);
1118 zTerm = "";
1119 }
1120 assert( strlen(zTerm)<nClose );
1121

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button