Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch kkinnell-exp Excluding Merge-Ins
This is equivalent to a diff from f8f8baf945 to 51868cb12f
2009-01-30
| ||
21:18 | Changed update docs, ** ADDED A _SPECIAL_ (but MUTYPE_BLOCK) wikitag <annotation> to put html comments in wikimarkup Leaf check-in: 51868cb12f user: kkennell tags: kkinnell-exp | |
2009-01-29
| ||
23:04 | Merge in kkinnell's documentation updates. check-in: 24c045f373 user: drh tags: trunk | |
19:11 | Add link to branching page. check-in: f8f8baf945 user: kejoki tags: trunk | |
2009-01-23
| ||
21:24 | First draft of the "branching" document. check-in: 2e275c1420 user: drh tags: trunk | |
Changes to src/wikiformat.c.
1 | 1 2 3 4 5 6 7 8 9 | - + | /* |
︙ | |||
154 155 156 157 158 159 160 | 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + | ** and in numerical sequence. The first markup type must be zero. ** The value for MARKUP_XYZ must correspond to the <xyz> entry ** in aAllowedMarkup[]. */ #define MARKUP_INVALID 0 #define MARKUP_A 1 #define MARKUP_ADDRESS 2 #define MARKUP_ANNOTATION 3 |
︙ | |||
235 236 237 238 239 240 241 242 243 244 245 246 247 248 | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | + | short int iType; /* The MUTYPE_* code */ int allowedAttr; /* Allowed attributes on this markup */ } aMarkup[] = { { 0, MARKUP_INVALID, 0, 0 }, { "a", MARKUP_A, MUTYPE_HYPERLINK, AMSK_HREF|AMSK_NAME }, { "address", MARKUP_ADDRESS, MUTYPE_BLOCK, 0 }, { "annotation", MARKUP_ANNOTATION, MUTYPE_BLOCK, 0 }, { "b", MARKUP_B, MUTYPE_FONT, 0 }, { "big", MARKUP_BIG, MUTYPE_FONT, 0 }, { "blockquote", MARKUP_BLOCKQUOTE, MUTYPE_BLOCK, 0 }, { "br", MARKUP_BR, MUTYPE_SINGLE, AMSK_CLEAR }, { "center", MARKUP_CENTER, MUTYPE_BLOCK, 0 }, { "cite", MARKUP_CITE, MUTYPE_FONT, 0 }, { "code", MARKUP_CODE, MUTYPE_FONT, 0 }, |
︙ | |||
1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 | 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 | + + + + + + | blob_append(p->pOut, z, n); break; } case TOKEN_MARKUP: { const char *zId; int iDiv; parseMarkup(&markup, z); /* Annotation markup turns into HTML comment */ if( markup.iCode==MARKUP_ANNOTATION && markup.endTag ){ blob_append(p->pOut, "-->", 3); break; } /* Markup of the form </div id=ID> where there is a matching ** ID somewhere on the stack. Exit the verbatim if were are in ** it. Pop the stack up to the matching <div>. Discard the ** </div> */ if( markup.iCode==MARKUP_DIV && markup.endTag && |
︙ | |||
1164 1165 1166 1167 1168 1169 1170 | 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 | - + | p->state &= ~ALLOW_WIKI; } assert( p->nStack==iDiv+1 ); p->nStack--; }else /* If within <verbatim id=ID> ignore everything other than |
︙ | |||
1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 | 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 | + + + + + + + | } p->inVerbatim = 1; p->preVerbState = p->state; p->state &= ~ALLOW_WIKI; blob_append(p->pOut, "<pre class='verbatim'>",-1); p->wantAutoParagraph = 0; }else /* Annotation markup starts an HTML comment */ if( markup.iCode==MARKUP_ANNOTATION ){ p->wantAutoParagraph = 0; blob_append(p->pOut, "<!-- ", 5); }else if( markup.iType==MUTYPE_LI ){ if( backupToType(p, MUTYPE_LIST)==0 ){ pushStack(p, MARKUP_UL); blob_append(p->pOut, "<ul>", 4); } pushStack(p, MARKUP_LI); renderMarkup(p->pOut, &markup); |
︙ |
Changes to www/cmd_sync.wiki.
︙ | |||
15 16 17 18 19 20 21 22 | 15 16 17 18 19 20 21 22 23 | + | If you have cloned a repository you will automatically sync with the original if you [./cmd_commit.wiki | commit] changes to your local version <em>unless</em> you customize your configuration. See also: [./cmd_pull.wiki | fossil pull], [./cmd_push.wiki | fossil push], [./cmd_setting.wiki | fossil setting], [./branching.wiki | <i>branching, merging, forking and tagging</i>], [./reference.wiki | Reference] |
Changes to www/cmd_update.wiki.
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 | - + - - + - - + - - + - - + + + + + + + - - + + + + + + - + + + + - + - | <h2>update</h2> |
Changes to www/reference.wiki.
︙ | |||
109 110 111 112 113 114 115 | 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | - + | <tr> <td><a href="#commit">commit</a></td> <td><a href="#info">info</a></td> <td><a href="#reconstruct">reconstruct</a></td> <td><a href="#tag">tag</a></td> </tr> </table><nowiki><pre> |
︙ |