Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | merge trunk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | ticket-01a2f3a346 |
Files: | files | file ages | folders |
SHA1: |
3e3f34ebcf172ff9821d726a9d485019 |
User & Date: | jan.nijtmans 2012-08-29 08:02:16 |
Context
2012-08-29
| ||
11:27 | fix for [01a2f3a346] check-in: 0357ed556e user: jan.nijtmans tags: msvc-broken | |
08:02 | merge trunk Closed-Leaf check-in: 3e3f34ebcf user: jan.nijtmans tags: ticket-01a2f3a346 | |
2012-08-28
| ||
17:39 | Fixes to hyperlink generation for embedded documentation. check-in: ed6adcaf3b user: drh tags: trunk | |
09:05 | merge trunk into ticket-01a2f3a346 branch check-in: f89bd067c2 user: jan.nijtmans tags: ticket-01a2f3a346 | |
Changes
Changes to src/rebuild.c.
︙ | ︙ | |||
839 840 841 842 843 844 845 | zMbcsPath = fossil_utf8_to_unicode(zPath); d = _wopendir(zMbcsPath); if( d ){ while( (pEntry=_wreaddir(d))!=0 ){ Blob path; char *zSubpath; | | | 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 | zMbcsPath = fossil_utf8_to_unicode(zPath); d = _wopendir(zMbcsPath); if( d ){ while( (pEntry=_wreaddir(d))!=0 ){ Blob path; char *zSubpath; if( pEntry->d_name[0]=='.' ){ continue; } zUtf8Name = fossil_unicode_to_utf8(pEntry->d_name); zSubpath = mprintf("%s/%s", zPath, zUtf8Name); fossil_mbcs_free(zUtf8Name); if( file_isdir(zSubpath)==1 ){ recon_read_dir(zSubpath); |
︙ | ︙ |
Changes to src/vfile.c.
︙ | ︙ | |||
420 421 422 423 424 425 426 | zDir = blob_str(pPath); zMbcs = fossil_utf8_to_unicode(zDir); d = _wopendir(zMbcs); if( d ){ while( (pEntry=_wreaddir(d))!=0 ){ char *zPath; char *zUtf8; | | | | 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 | zDir = blob_str(pPath); zMbcs = fossil_utf8_to_unicode(zDir); d = _wopendir(zMbcs); if( d ){ while( (pEntry=_wreaddir(d))!=0 ){ char *zPath; char *zUtf8; if( pEntry->d_name[0]=='.' ){ if( !allFlag ) continue; if( pEntry->d_name[1]==0 ) continue; if( pEntry->d_name[1]=='.' && pEntry->d_name[2]==0 ) continue; } zUtf8 = fossil_unicode_to_utf8(pEntry->d_name); blob_appendf(pPath, "/%s", zUtf8); fossil_mbcs_free(zUtf8); zPath = blob_str(pPath); if( glob_match(pIgnore, &zPath[nPrefix+1]) ){ /* do nothing */ |
︙ | ︙ |
Changes to src/wikiformat.c.
︙ | ︙ | |||
1077 1078 1079 1080 1081 1082 1083 | /* Special display processing for tickets. Display the hyperlink ** as crossed out if the ticket is closed. */ if( isClosed ){ if( g.perm.Hyperlink ){ blob_appendf(p->pOut, "%z<span class=\"wikiTagCancelled\">[", | | | | | | | | 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 | /* Special display processing for tickets. Display the hyperlink ** 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) ); zTerm = "]</span></a>"; }else{ 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>"; }else{ blob_appendf(p->pOut, "["); zTerm = "]"; } } }else if( !in_this_repo(zTarget) ){ blob_appendf(p->pOut, "<span class=\"brokenlink\">[", zTarget); zTerm = "]</span>"; }else if( g.perm.Hyperlink ){ blob_appendf(p->pOut, "%z[",href("%R/info/%s", zTarget)); zTerm = "]</a>"; } }else if( strlen(zTarget)>=10 && fossil_isdigit(zTarget[0]) && zTarget[4]=='-' && db_int(0, "SELECT datetime(%Q) NOT NULL", zTarget) ){ blob_appendf(p->pOut, "<a href=\"%R/timeline?c=%T\">", zTarget); }else if( strncmp(zTarget, "wiki:", 5)==0 && wiki_name_is_wellformed((const unsigned char*)zTarget) ){ zTarget += 5; blob_appendf(p->pOut, "<a href=\"%R/wiki?name=%T\">", zTarget); }else if( wiki_name_is_wellformed((const unsigned char *)zTarget) ){ blob_appendf(p->pOut, "<a href=\"%R/wiki?name=%T\">", zTarget); }else{ blob_appendf(p->pOut, "<span class=\"brokenlink\">[%h]</span>", zTarget); zTerm = ""; } assert( strlen(zTerm)<nClose ); sqlite3_snprintf(nClose, zClose, "%s", zTerm); } |
︙ | ︙ |
Deleted test/世界/界世.txt.
|
| < |