diff.jsf (7372B)
1 # JOE syntax highlight file for diff/patch files 2 # 3 # 2017-02-03 : 4 # 5 # Rework color definitions for color schemes 6 # 7 # 2007-05-11 : 8 # 9 # This file is just udiff.jsf, ndiff.jsf and cdiff.jsf merged together 10 # into one file, to handle cases where A) it's difficult to tell what 11 # type of diff might be inside the file to highlight and B) the file to 12 # highlight may contain hunks of different types of diffs (unlikely). 13 # Of course it can be used to replace the 3 abovementioned files 14 # completely. If you want that, you need to edit ftyperc accordingly. 15 # 16 # Dirk Schenkewitz <Dirk.Schenkewitz (AT) gmx.de> 17 18 # Color definitions 19 =Idle 20 =Garbage +Comment 21 =DiffCmd +Statement 22 =File +Type 23 =FileOld +File 24 =FileNew +File 25 =Hunk +File 26 =HunkHead +Hunk 27 =HunkMid +Hunk 28 # Inheritances here are admittedly bizarre 29 =DelLine +Escape 30 =AddLine +DefinedIdent 31 =ChgLine +Preproc 32 =CtxLine 33 34 35 :reset Idle 36 * garbage recolor=-1 37 "\n" reset 38 "d" garbage buffer recolor=-1 # may be a "diff" command 39 "-" udiff_o1 # may start a unified diff hunk 40 "*" cdiff_o1 # may start a context diff hunk 41 "0-9" ndiff_r0 mark recolor=-1 # may start a "normal" diff hunk 42 43 :garbage Garbage 44 * garbage strings 45 "diff" diff_cmd recolor=-3 46 done 47 "\n" reset 48 49 :diff_cmd DiffCmd 50 * diff_cmd 51 "\n" reset 52 53 #---------------------------------------------- 54 55 # unified diffs: 56 57 :udiff_o1 Idle 58 * garbage recolor=-2 buffer 59 "-" udiff_o2 60 61 :udiff_o2 Idle 62 * garbage recolor=-3 buffer 63 "-" udiff_o3 64 65 :udiff_o3 Idle 66 * garbage recolor=-4 buffer 67 " " udiff_o4 68 69 :udiff_o4 Idle 70 * udiff_oldf recolor=-5 71 " " garbage recolor=-5 buffer 72 73 :udiff_n0 Idle 74 * garbage recolor=-1 buffer 75 "+" udiff_n1 76 77 :udiff_n1 Idle 78 * garbage recolor=-2 buffer 79 "+" udiff_n2 80 81 :udiff_n2 Idle 82 * garbage recolor=-3 buffer 83 "+" udiff_n3 84 85 :udiff_n3 Idle 86 * garbage recolor=-4 buffer 87 " " udiff_newf recolor=-4 88 89 :udiff_oldf FileOld 90 * udiff_oldf 91 "\n" udiff_n0 92 93 :udiff_newf FileNew 94 * udiff_newf 95 "\n" udiff_prehunk1 96 97 :udiff_prehunk1 Idle 98 * garbage 99 "@" udiff_prehunk2 100 "\n" reset 101 102 :udiff_prehunk2 Idle 103 * garbage recolor=-1 104 "@" udiff_prehunk3 105 "\n" reset 106 107 :udiff_prehunk3 Idle 108 * garbage recolor=-1 109 " " udiff_hunkhead recolor=-3 110 "\n" reset 111 112 :udiff_hunkhead HunkHead 113 * udiff_hunkhead 114 "\n" udiff_hunkbody 115 116 :udiff_hunkbody Idle 117 * reset noeat 118 "d" garbage recolor=-1 buffer 119 "-" udiff_minus1 120 "+" udiff_add recolor=-1 121 " " udiff_ctx recolor=-1 122 "@" udiff_prehunk2 123 124 :udiff_minus1 Idle 125 * udiff_del noeat recolor=-2 126 "-" udiff_minus2 127 128 :udiff_minus2 Idle 129 * udiff_del noeat recolor=-3 130 "-" udiff_minus3 131 132 :udiff_minus3 Idle 133 * udiff_del noeat recolor=-4 134 " " udiff_minus4 135 136 :udiff_minus4 Idle 137 * udiff_oldf recolor=-5 138 "\n" udiff_hunkbody 139 " " udiff_del recolor=-5 140 141 :udiff_del DelLine 142 * udiff_del 143 "\n" udiff_hunkbody 144 145 :udiff_add AddLine 146 * udiff_add 147 "\n" udiff_hunkbody 148 149 :udiff_ctx CtxLine 150 * udiff_ctx 151 "\n" udiff_hunkbody 152 153 #---------------------------------------------- 154 155 # "normal" diffs: 156 157 :ndiff_r0 Idle 158 * garbage noeat recolormark 159 "0-9" ndiff_r0 160 "," ndiff_r1 161 "adc" ndiff_r2 162 "\n" reset markend 163 164 :ndiff_r1 Idle 165 * garbage recolormark 166 "0-9" ndiff_r1 167 "adc" ndiff_r2 168 "\n" reset markend 169 170 :ndiff_r2 Idle 171 * garbage noeat recolormark 172 "0-9" ndiff_r2 173 "," ndiff_r3 174 "\n" ndiff_re noeat recolormark 175 176 :ndiff_r3 Idle 177 * garbage noeat recolormark 178 "0-9" ndiff_r3 179 "\n" ndiff_re noeat recolormark 180 181 :ndiff_re HunkHead 182 "\n" ndiff_hunk0 183 184 :ndiff_hunk0 HunkHead 185 * reset noeat 186 "<" ndiff_o1 187 ">" ndiff_n1 188 "\\" ndiff_t1 189 190 191 :ndiff_hunk1 HunkHead 192 * reset noeat 193 "<" ndiff_o1 194 ">" ndiff_n1 195 "-" ndiff_m1 recolor=-1 196 "\\" ndiff_t1 197 198 199 :ndiff_t1 Idle 200 * garbage recolor=-3 201 "\n" reset 202 " " ndiff_txt recolor=-3 203 204 :ndiff_o1 Idle 205 * garbage recolor=-3 206 "\n" reset 207 " " ndiff_del recolor=-3 208 209 :ndiff_n1 Idle 210 * garbage recolor=-3 211 "\n" reset 212 " " ndiff_add recolor=-3 213 214 :ndiff_txt CtxLine 215 * ndiff_txt 216 "\n" ndiff_hunk1 217 218 :ndiff_del DelLine 219 * ndiff_del 220 "\n" ndiff_hunk1 221 222 :ndiff_add AddLine 223 * ndiff_add 224 "\n" ndiff_hunk1 225 226 227 :ndiff_m1 Idle 228 * garbage recolor=-2 229 "-" ndiff_m2 230 "\n" reset recolor=-2 231 232 :ndiff_m2 Idle 233 * garbage recolor=-3 234 "-" ndiff_m3 recolor=-3 235 236 :ndiff_m3 HunkMid 237 * garbage recolor=-4 238 "\n" ndiff_hunk0 239 240 #---------------------------------------------- 241 242 # context diffs: 243 244 :cdiff_o1 Idle 245 * garbage recolor=-2 buffer 246 "*" cdiff_o2 247 248 :cdiff_o2 Idle 249 * garbage recolor=-3 buffer 250 "*" cdiff_o3 251 252 :cdiff_o3 Idle 253 * garbage recolor=-4 buffer 254 " " cdiff_o4 255 256 :cdiff_o4 Idle 257 * cdiff_oldf recolor=-5 258 " " garbage recolor=-5 buffer 259 260 :cdiff_oldf FileOld 261 * cdiff_oldf 262 "\n" cdiff_n0 263 264 :cdiff_n0 Idle 265 * garbage recolor=-1 buffer 266 "-" cdiff_n1 267 268 :cdiff_n1 Idle 269 * garbage recolor=-2 buffer 270 "-" cdiff_n2 271 272 :cdiff_n2 Idle 273 * garbage recolor=-3 buffer 274 "-" cdiff_n3 275 276 :cdiff_n3 Idle 277 * garbage recolor=-4 buffer 278 " " cdiff_newf recolor=-4 279 280 :cdiff_newf FileNew 281 * cdiff_newf 282 "\n" cdiff_prehunk0 283 284 :cdiff_prehunk0 Idle 285 * manystars buffer 286 287 :manystars Idle 288 * garbage noeat strings 289 "***************" cdiff_prehunk1 290 done 291 "*" manystars 292 293 294 :cdiff_prehunk1 HunkHead 295 * cdiff_ho0 296 297 :cdiff_ho0 Idle 298 * garbage recolor=-1 buffer 299 "*" cdiff_ho1 300 301 :cdiff_ho1 Idle 302 * garbage recolor=-2 buffer 303 "*" cdiff_ho2 304 305 :cdiff_ho2 Idle 306 * garbage recolor=-3 buffer 307 "*" cdiff_ho3 308 309 :cdiff_ho3 Idle 310 * garbage recolor=-4 buffer 311 " " cdiff_ho4 recolor=-4 mark 312 313 :cdiff_ho4 HunkHead 314 * garbage recolormark buffer 315 "0-9," cdiff_ho4 316 " " cdiff_ho5 recolormark buffer 317 "\n" reset markend 318 319 :cdiff_ho5 HunkHead 320 * garbage recolor=-1 buffer 321 "*" cdiff_ho6 322 323 :cdiff_ho6 Idle 324 * garbage recolor=-2 buffer 325 "*" cdiff_ho7 326 327 :cdiff_ho7 Idle 328 * garbage recolor=-3 buffer 329 "*" cdiff_ho8 330 331 :cdiff_ho8 Idle 332 * garbage recolor=-4 buffer 333 "*" cdiff_ho9 recolor=-4 334 335 :cdiff_ho9 HunkHead 336 * garbage recolor=-5 buffer 337 "\n" cdiff_hunk 338 339 340 :cdiff_hn0 Idle 341 * garbage recolor=-1 buffer 342 "-" cdiff_hn1 343 344 :cdiff_hn1 Idle 345 * garbage recolor=-2 buffer 346 "-" cdiff_hn2 347 348 :cdiff_hn2 Idle 349 * garbage recolor=-3 buffer 350 "-" cdiff_hn3 351 352 :cdiff_hn3 Idle 353 * garbage recolor=-4 buffer 354 " " cdiff_hn4 recolor=-4 mark 355 356 :cdiff_hn4 HunkHead 357 * garbage recolormark buffer 358 "0-9," cdiff_hn4 359 " " cdiff_hn5 recolormark buffer 360 "\n" reset markend 361 362 :cdiff_hn5 HunkHead 363 * garbage recolor=-1 buffer 364 "-" cdiff_hn6 365 366 :cdiff_hn6 Idle 367 * garbage recolor=-2 buffer 368 "-" cdiff_hn7 369 370 :cdiff_hn7 Idle 371 * garbage recolor=-3 buffer 372 "-" cdiff_hn8 373 374 :cdiff_hn8 Idle 375 * garbage recolor=-4 buffer 376 "-" cdiff_hn9 recolor=-4 377 378 :cdiff_hn9 HunkHead 379 * garbage recolor=-5 buffer 380 "\n" cdiff_hunk 381 382 383 384 :cdiff_hunk Idle 385 * garbage recolor=-1 buffer 386 " " cdiff_h_c0 387 "+" cdiff_h_p0 388 "!" cdiff_h_x0 389 "-" cdiff_h_m0 390 "*" manystars buffer 391 392 :cdiff_h_c0 Idle 393 * garbage recolor=-2 buffer 394 " " cdiff_h_c1 recolor=-2 395 "\n" reset 396 397 :cdiff_h_c1 CtxLine 398 * cdiff_h_c1 399 "\n" cdiff_hunk 400 401 :cdiff_h_p0 Idle 402 * garbage recolor=-2 buffer 403 " " cdiff_h_p1 recolor=-2 404 "\n" reset 405 406 :cdiff_h_p1 AddLine 407 * cdiff_h_p1 408 "\n" cdiff_hunk 409 410 :cdiff_h_x0 Idle 411 * garbage recolor=-2 buffer 412 " " cdiff_h_x1 recolor=-2 413 "\n" reset 414 415 :cdiff_h_x1 ChgLine 416 * cdiff_h_x1 417 "\n" cdiff_hunk 418 419 :cdiff_h_m0 Idle 420 * garbage recolor=-2 buffer 421 " " cdiff_h_m1 recolor=-2 422 "-" cdiff_hn2 recolor=-2 423 "\n" reset 424 425 :cdiff_h_m1 DelLine 426 * cdiff_h_m1 427 "\n" cdiff_hunk