diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Revision history for skylighting and skylighting-core +## 0.12.3 + + * Add scss, sass, systemverilog, orgmode. + + * Update xml definitions from upstream: bash, css, python, r, zsh. + + ## 0.12.2 * Parser: handle context shift to external context, e.g., diff --git a/skylighting-core.cabal b/skylighting-core.cabal --- a/skylighting-core.cabal +++ b/skylighting-core.cabal @@ -1,5 +1,5 @@ name: skylighting-core -version: 0.12.2 +version: 0.12.3 synopsis: syntax highlighting library description: Skylighting is a syntax highlighting library. It derives its tokenizers from XML syntax diff --git a/xml/bash.xml b/xml/bash.xml --- a/xml/bash.xml +++ b/xml/bash.xml @@ -39,7 +39,7 @@ ]> - + @@ -786,8 +788,8 @@ - - + + @@ -1415,10 +1417,13 @@ - + + + + @@ -1465,7 +1470,7 @@ - + diff --git a/xml/css.xml b/xml/css.xml --- a/xml/css.xml +++ b/xml/css.xml @@ -38,7 +38,7 @@ --> - + @@ -665,6 +665,7 @@ none hidden + initial dotted dashed solid @@ -729,23 +730,9 @@ katakana hiragana-iroha katakana-iroha - inline - inline-block - block list-item - run-in compact marker - table - inline-table - table-row-group - table-header-group - table-footer-group - table-row - table-column-group - table-column - table-cell - table-caption crosshair default pointer @@ -765,15 +752,20 @@ absolute always avoid + avoid-page + avoid-column + avoid-region below bidi-override blink both + break-word capitalize caption clip close-quote collapse + column condensed crop cross @@ -843,6 +835,41 @@ contain cover + + + block + inline + run-in + + flow + flow-root + table + flex + grid + ruby + + list-item + + table-row-group + table-header-group + table-footer-group + table-row + table-cell + table-column-group + table-column + table-caption + ruby-base + ruby-text + ruby-base-container + ruby-text-container + + contents + + inline-block + inline-table + inline-flex + inline-grid + all ease @@ -991,6 +1018,7 @@ pink plum powderblue + rebeccapurple rosybrown royalblue saddlebrown @@ -1060,6 +1088,22 @@ var url + + min + max + clamp + toggle + hwb + device-cmyk + color + element + image + image-set + conic-gradient + + + symbols + rect @@ -1678,6 +1722,7 @@ + diff --git a/xml/orgmode.xml b/xml/orgmode.xml new file mode 100644 --- /dev/null +++ b/xml/orgmode.xml @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + +]> + + + + + + + TODO + + + DONE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/python.xml b/xml/python.xml --- a/xml/python.xml +++ b/xml/python.xml @@ -52,7 +52,7 @@ - + import @@ -408,9 +408,15 @@ - + + + + + + + diff --git a/xml/r.xml b/xml/r.xml --- a/xml/r.xml +++ b/xml/r.xml @@ -8,7 +8,7 @@ R : http://www.r-project.org/ RKWard : http://rkward.kde.org/ --> - + @@ -117,12 +117,14 @@ - + + + diff --git a/xml/sass.xml b/xml/sass.xml new file mode 100644 --- /dev/null +++ b/xml/sass.xml @@ -0,0 +1,468 @@ + + + + +]> + + + + + + properties##SCSS + sub-properties##SCSS + + special values##SCSS + value keywords##SCSS + values##SCSS + colors##SCSS + functions##SCSS + medias##SCSS + pseudoelements##SCSS + pseudoclasses##SCSS + pseudoclass-selector##SCSS + pseudoclasses-@page##SCSS + at-rules##SCSS + nested at-rules##SCSS + inline and nested at-rules##SCSS + @extend##SCSS + @if##SCSS + @else##SCSS + @mixin##SCSS + @viewport##SCSS + @page##SCSS + + @font-face##SCSS + @keyframes##SCSS + + media operators##SCSS + operators##SCSS + annotations##SCSS + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/scss.xml b/xml/scss.xml new file mode 100644 --- /dev/null +++ b/xml/scss.xml @@ -0,0 +1,1040 @@ + + + + +]> + + + + + + + + properties##CSS + + + + adjust + after + align-all + align + align-last + alternates + anchor + area + areas + attachment + auto-columns + auto-flow + auto-rows + baseline + basis + before + bidi + blend-mode + block-color + block-end-color + block-end + block-end-style + block-end-width + block + block-start-color + block-start + block-start-style + block-start-width + block-style + block-width + border-mode + border-outset + border-repeat + border-slice + border-source + bottom-color + bottom-left-radius + bottom-right-radius + bottom-style + bottom-width + boundary + box + break + caps + cells + change + character + chars + collapse + column-end + column + column-start + combine-upright + composite + count + decoration-break + decoration-color + decoration + decoration-line + decoration-skip-ink + decoration-skip + decoration-style + decoration-width + defer + delay + distance + down + duration + during + east-asian + emoji + emphasis-color + emphasis + emphasis-position + emphasis-skip + emphasis-style + end-color + end + end-style + end-width + events + family + feature-settings + fill-mode + filters + fit + flow + fragment + from + function + grow + gutter + header + height-step + image + image-outset + image-repeat + image-slice + image-source + image-threshold + image-transform + image-width + increment + indent + inline-color + inline-end-color + inline-end + inline-end-style + inline-end-width + inline + inline-start-color + inline-start + inline-start-style + inline-start-width + inline-style + inline-width + insert + inside + interpolation-filters + into + items + iteration-count + justify + kerning + knockout-left + knockout-right + label + language-override + last + layout + left-color + left-radius + left-style + left-width + letter-align + letter + letter-wrap + level + ligatures + limit-chars + limit-last + limit-lines + limit-zone + line + lines + loop + max-size + merge + mid + min-size + mode + name + numeral + numeric + optical-sizing + orientation + orientation-vertical + origin + outset + outside + override + palette + path + pattern + play-state + point + policy + property + punctuation + radius + range + rate + reference + rendering + repeat + reset + resolution + right-color + right-radius + right-style + right-width + rotate + round + row-end + row + rows + row-start + rule-color + rule + rule-style + rule-width + segment + select + self + set + settings + shadow + shape + shift + shrink + side + size-adjust + sizing + skip-ink + skip + slice + snap + source + space-collapse + space + space-trim + spacing + span + speed + start-color + start + start-style + start-width + state + step-align + step-insert + step + step-round + step-size + stretch + style-image + style + style-position + style-type + synthesis + template-areas + template-columns + template + template-rows + threshold + through + timing-function + top-color + top-left-radius + top-right-radius + top-style + top-width + trim + type + underline-offset + underline-position + up + upright + variant-alternates + variant-caps + variant-east-asian + variant-emoji + variant + variant-ligatures + variant-numeric + variant-position + variation-settings + vertical + weight + wrap + x + y + zone + + + + true + false + null + + + + value keywords##CSS + + + + values##CSS + + + + colors##CSS + + + + functions##CSS + + + red + green + blue + mix + hue + saturation + lightness + adjust-hue + lighten + darken + saturate + desaturate + grayscale + complement + invert + alpha + opacify + transparentize + adjust-color + scale-color + change-color + ie-hex-str + unquote + quote + str-length + str-insert + str-index + str-slice + to-upper-case + to-lower-case + percentage + round + ceil + floor + abs + min + max + random + length + nth + set-nth + join + append + zip + index + list-separator + is-bracketed + map-get + map-merge + map-remove + map-keys + map-values + map-has-key + keywords + selector-nest + selector-append + selector-extend + selector-replace + selector-unify + is-superselector + simple-selectors + selector-parse + feature-exists + variable-exists + global-variable-exists + function-exists + mixin-exists + content-exists + inspect + type-of + unit + unitless + comparable + call + get-function + if + unique-id + + + + medias##CSS + + + + + pseudoelements##CSS + + + + + pseudoclasses##CSS + + + + pseudoclass-selector##CSS + + + + pseudoclasses-@page##CSS + + + + at-rules##CSS + + + @debug + @warn + @error + @content + @return + + + + nested at-rules##CSS + + + @at-rule + @for + @each + @while + + + + + + @include + + + + @extend + + + + @if + + + + @else + + + + @mixin + @function + + + + @viewport + + + + within-@viewport##CSS + + + + @page + + + + within-@page##CSS + + + + @font-face + + + + within-@font-face##CSS + + + + @keyframes + + + + within-@keyframes##CSS + + + + media operators##CSS + + + + and + or + not + + + + important + default + global + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/systemverilog.xml b/xml/systemverilog.xml new file mode 100644 --- /dev/null +++ b/xml/systemverilog.xml @@ -0,0 +1,993 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + defparam + deassign + + + + DPI + DPI-C + import + export + context + + + + assert + assume + cover + expect + disable + iff + binsof + intersect + first_match + throughout + within + + + + coverpoint + cross + wildcard + bins + ignore_bins + illegal_bins + + + + genvar + + + + if + else + unique + priority + matches + + + + default + + + + forever + repeat + while + for + do + foreach + break + continue + return + + + + pulsestyle_onevent + pulsestyle_ondetect + noshowcancelled + showcancelled + ifnone + + + + initial + final + always + always_comb + always_ff + always_latch + + + + alias + assign + force + release + + + + posedge + negedge + edge + wait + wait_order + + + + timeunit + timeprecision + s + ms + ns + us + ns + ps + fs + step + + + + new + extends + this + super + protected + local + rand + randc + bind + + + + constraint + solve + before + dist + inside + with + + + + virtual + pure + extern + forkjoin + + + + design + instance + cell + liblist + use + + + + library + incdir + include + + + + modport + + + + sync_accept_on + reject_on + accept_on + sync_reject_on + restrict + let + until + until_with + unique0 + eventually + s_until + s_always + s_eventually + s_nexttime + s_until_with + global + untyped + implies + weak + strong + nexttime + + + + + parameter + localparam + specparam + + input + output + inout + ref + + byte + shortint + int + integer + longint + time + + bit + logic + reg + + supply0 + supply1 + tri + triand + trior + trireg + tri0 + tri1 + wire + uwire + wand + wor + + signed + unsigned + + shortreal + real + realtime + + type + void + + struct + union + tagged + + const + var + automatic + static + packed + vectored + scalared + + typedef + enum + string + chandle + event + + null + + + + `__FILE__ + `__LINE__ + `begin_keywords + `celldefine + `default_nettype + `define + `else + `elsif + `end_keywords + `endcelldefine + `endif + `ifdef + `ifndef + `include + `line + `nounconnected_drive + `pragma + `resetall + `timescale + `unconnected_drive + `undef + `undefineall + + + + $finish + $stop + $exit + $realtime + $stime + $time + $printtimescale + $timeformat + $bitstoreal + $realtobits + $bitstoshortreal + $shortrealtobits + $itor + $rtoi + $signed + $unsigned + $cast + $bits + $isunbounded + $typename + $unpacked_dimensions + $dimensions + $left + $right + $low + $high + $increment + $size + $clog2 + $asin + $ln + $acos + $log10 + $atan + $exp + $atan2 + $sqrt + $hypot + $pow + $sinh + $floor + $cosh + $ceil + $tanh + $sin + $asinh + $cos + $acosh + $tan + $atanh + $fatal + $error + $warning + $info + $fatal + $error + $warning + $info + $asserton + $assertoff + $assertkill + $assertpasson + $assertpassoff + $assertfailon + $assertfailoff + $assertnonvacuouson + $assertvacuousoff + $onehot + $onehot0 + $isunknown + $sampled + $rose + $fell + $stable + $changed + $past + $countones + $past_gclk + $rose_gclk + $fell_gclk + $stable_gclk + $changed_gclk + $future_gclk + $rising_gclk + $falling_gclk + $steady_gclk + $changing_gclk + $coverage_control + $coverage_get_max + $coverage_get + $coverage_merge + $coverage_save + $get_coverage + $set_coverage_db_name + $load_coverage_db + $random + $dist_chi_square + $dist_erlang + $dist_exponential + $dist_normal + $dist_poisson + $dist_t + $dist_uniform + $q_initialize + $q_add + $q_remove + $q_full + $q_exam + $async$and$array + $async$and$plane + $async$nand$array + $async$nand$plane + $async$or$array + $async$or$plane + $async$nor$array + $async$nor$plane + $sync$and$array + $sync$and$plane + $sync$nand$array + $sync$nand$plane + $sync$or$array + $sync$or$plane + $sync$nor$array + $sync$nor$plane + $system + $display + $write + $displayb + $writeb + $displayh + $writeh + $displayo + $writeo + $strobe + $monitor + $strobeb + $monitorb + $strobeh + $monitorh + $strobeo + $monitoro + $monitoroff + $monitoron + $fclose + $fopen + $fdisplay + $fwrite + $fdisplayb + $fwriteb + $fdisplayh + $fwriteh + $fdisplayo + $fwriteo + $fstrobe + $fmonitor + $fstrobeb + $fmonitorb + $fstrobeh + $fmonitorh + $fstrobeo + $fmonitoro + $swrite + $sformat + $swriteb + $sformatf + $swriteh + $fgetc + $swriteo + $ungetc + $fscanf + $fgets + $fread + $sscanf + $fseek + $rewind + $fflush + $ftell + $feof + $ferror + $readmemb + $readmemh + $writememb + $writememh + $test$plusargs + $value$plusargs + $dumpfile + $dumpvars + $dumpoff + $dumpon + $dumpall + $dumplimit + $dumpflush + $dumpports + $dumpportsoff + $dumpportson + $dumpportsall + $dumpportslimit + $dumpportsflush + + + + pullup + pulldown + cmos + rcmos + nmos + pmos + rnmos + rpmos + and + nand + or + nor + xor + xnor + not + buf + tran + rtran + tranif0 + tranif1 + rtranif0 + rtranif1 + bufif0 + bufif1 + notif0 + notif1 + + + + + strong0 + strong1 + pull0 + pull1 + weak0 + weak1 + highz0 + highz1 + + small + medium + large + + + randomize + mailbox + semaphore + put + get + try_put + try_get + peek + try_peek + process + state + self + status + kill + await + suspend + resume + + size + delete + insert + num + first + last + next + prev + pop_front + pop_back + push_front + push_back + find + find_index + find_first + find_last + find_last_index + min + max + unique_index + reverse + sort + rsort + shuffle + sum + product + + List + List_Iterator + neq + eq + data + empty + front + back + start + finish + insert_range + erase + erase_range + set + swap + clear + purge + + + + begin + + + end + + + package + + + endpackage + + + macromodule + + + module + + + endmodule + + + generate + + + endgenerate + + + program + + + endprogram + + + class + + + endclass + + + function + + + endfunction + + + case + + + casex + + + casez + + + randcase + + + endcase + + + interface + + + endinterface + + + clocking + + + endclocking + + + task + + + endtask + + + primitive + + + endprimitive + + + fork + + + join + + + join_any + + + join_none + + + covergroup + + + endgroup + + + checker + + + endchecker + + + property + + + endproperty + + + randsequence + + + sequence + + + endsequence + + + specify + + + endspecify + + + config + + + endconfig + + + table + + + endtable + + + extern + + + pure + + + typedef + + + import + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/zsh.xml b/xml/zsh.xml --- a/xml/zsh.xml +++ b/xml/zsh.xml @@ -57,7 +57,7 @@ ]> - + @@ -249,6 +249,8 @@ + + @@ -1515,10 +1517,10 @@ - + - + @@ -1529,20 +1531,26 @@ - + - + + + + - + + + + @@ -1561,7 +1569,10 @@ - + + + + @@ -1569,14 +1580,17 @@ - + - + + + +