Differences From:
File
src/wikiformat.c
part of check-in
[4c82c7773f]
- Fix some annoyances with "merge". This involves a schema change
to the _FOSSIL_ file. Older versions will continue to work, but
it would make since to "close" and "open" local source tree after
updating to this version of fossil, in order to update the schema.
by
drh on
2007-08-30 20:27:14.
[view]
To:
File
src/wikiformat.c
part of check-in
[11976cfdc2]
- Add the "index.wiki" wiki page. Fix a bug in the wiki rendering engine.
The page displays now, but not correctly - there are clearly additional
bugs to be found and fixed.
by
drh on
2007-09-02 02:01:35.
Also file
src/wikiformat.c
part of check-in
[bbcb6326c9]
- Pulled in the navbar and timeline changes.
by
aku on
2007-09-17 00:58:51.
[view]
@@ -320,8 +320,9 @@
while( z[n] && (z[n]!='>' || inparen) ){
if( z[n]=='"' ){
inparen = !inparen;
}
+ n++;
}
if( z[n]!='>' ) return 0;
return n+1;
}
@@ -713,12 +714,12 @@
}
/*
** Resolve a hyperlink. The argument is the content of the [...]
-** in the wiki. Append the URL to the given blob.
+** in the wiki. Append the URL to the output of the Renderer.
*/
-static void resolveHyperlink(const char *zTarget, Blob *pOut){
- blob_appendf(pOut, "http://www.fossil-scm.org/test-%T", zTarget);
+static void resolveHyperlink(const char *zTarget, Renderer *p){
+ blob_appendf(p->pOut, "http://www.fossil-scm.org/test-%T", zTarget);
}
/*
** Check to see if the given parsed markup is the correct
@@ -805,9 +806,9 @@
}else{
while( isspace(*zDisplay) ) zDisplay++;
}
blob_append(p->pOut, "<a href=\"", -1);
- resolveHyperlink(zTarget, p->pOut);
+ resolveHyperlink(zTarget, p);
blob_append(p->pOut, "\">", -1);
savedState = p->state;
p->state &= ~ALLOW_WIKI;
p->state |= FONT_MARKUP_ONLY;