diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,12 @@ # Revision history for skylighting-core +## 0.7.2 -- 2018-06-08 + + * Update syntax definitions from upstream. + * Added support for POV-Ray syntax (#46). + * Display line numbers without absolute positioning (David + Baynard, #32). + ## 0.7.1 -- 2018-03-15 * Fix benchmarks, which previously depended on a module 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.7.1 +version: 0.7.2 synopsis: syntax highlighting library description: Skylighting is a syntax highlighting library. It derives its tokenizers from XML syntax diff --git a/src/Skylighting/Format/HTML.hs b/src/Skylighting/Format/HTML.hs --- a/src/Skylighting/Format/HTML.hs +++ b/src/Skylighting/Format/HTML.hs @@ -153,13 +153,11 @@ ++ " }"] numberspec = [ "pre.numberSource a.sourceLine" - , " { position: relative; }" - , "pre.numberSource a.sourceLine:empty" - , " { position: absolute; }" + , " { position: relative; left: -4em; }" , "pre.numberSource a.sourceLine::before" , " { content: attr(data-line-number);" - , " position: absolute; left: -5em; text-align: right; vertical-align: baseline;" - , " border: none; pointer-events: all;" + , " position: relative; left: -1em; text-align: right; vertical-align: baseline;" + , " border: none; pointer-events: all; display: inline-block;" , " -webkit-touch-callout: none; -webkit-user-select: none;" , " -khtml-user-select: none; -moz-user-select: none;" , " -ms-user-select: none; user-select: none;" @@ -176,9 +174,9 @@ divspec = [ "a.sourceLine { display: inline-block; line-height: 1.25; }" , "a.sourceLine { pointer-events: none; color: inherit; text-decoration: inherit; }" - , "a.sourceLine:empty { height: 1.2em; position: absolute; }" -- correct empty line height + , "a.sourceLine:empty { height: 1.2em; }" -- correct empty line height , ".sourceCode { overflow: visible; }" -- needed for line numbers - , "code.sourceCode { white-space: pre; position: relative; }" -- position relative needed for absolute contents + , "code.sourceCode { white-space: pre; position: relative; }" -- position relative needed for relative contents , "div.sourceCode { margin: 1em 0; }" -- Collapse neighbours correctly , "pre.sourceCode { margin: 0; }" -- Collapse neighbours correctly , "@media screen {" diff --git a/test/expected/abc.cs.native b/test/expected/abc.cs.native --- a/test/expected/abc.cs.native +++ b/test/expected/abc.cs.native @@ -105,7 +105,9 @@ , [ ( NormalTok , " " ) ] , [ ( NormalTok , " " ) , ( KeywordTok , "foreach" ) - , ( NormalTok , "( var word " ) + , ( NormalTok , "( " ) + , ( DataTypeTok , "var" ) + , ( NormalTok , " word " ) , ( KeywordTok , "in" ) , ( NormalTok , " words)" ) ] @@ -222,7 +224,9 @@ , [ ( NormalTok , " _blocks = blocks;" ) ] , [ ( NormalTok , " " ) , ( KeywordTok , "foreach" ) - , ( NormalTok , " (var block " ) + , ( NormalTok , " (" ) + , ( DataTypeTok , "var" ) + , ( NormalTok , " block " ) , ( KeywordTok , "in" ) , ( NormalTok , " blocks)" ) ] @@ -318,7 +322,9 @@ ] , [ ( NormalTok , " " ) , ( KeywordTok , "foreach" ) - , ( NormalTok , " (var block " ) + , ( NormalTok , " (" ) + , ( DataTypeTok , "var" ) + , ( NormalTok , " block " ) , ( KeywordTok , "in" ) , ( NormalTok , " blocks)" ) ] diff --git a/test/expected/abc.scheme.native b/test/expected/abc.scheme.native --- a/test/expected/abc.scheme.native +++ b/test/expected/abc.scheme.native @@ -1,6 +1,6 @@ [ [ ( NormalTok , "#lang racket" ) ] , [ ( NormalTok , "(" ) - , ( KeywordTok , "define" ) + , ( ExtensionTok , "define" ) , ( FunctionTok , " block-strings" ) ] , [ ( NormalTok , " (" ) @@ -51,7 +51,7 @@ , ( NormalTok , "))" ) ] , [ ( NormalTok , "(" ) - , ( KeywordTok , "define" ) + , ( ExtensionTok , "define" ) , ( FunctionTok , " BLOCKS " ) , ( NormalTok , "(map " ) , ( KeywordTok , "string->list" ) @@ -59,12 +59,12 @@ ] , [] , [ ( NormalTok , "(" ) - , ( KeywordTok , "define" ) + , ( ExtensionTok , "define" ) , ( FunctionTok , " " ) , ( NormalTok , "(can-make-word? w)" ) ] , [ ( NormalTok , " (" ) - , ( KeywordTok , "define" ) + , ( ExtensionTok , "define" ) , ( FunctionTok , " " ) , ( NormalTok , "(usable-block blocks word-char)" ) ] @@ -76,7 +76,7 @@ ] , [ ( NormalTok , " " ) ] , [ ( NormalTok , " (" ) - , ( KeywordTok , "define" ) + , ( ExtensionTok , "define" ) , ( FunctionTok , " " ) , ( NormalTok , "(inner word-chars blocks tried-blocks)" ) ] @@ -91,7 +91,7 @@ , ( KeywordTok , "car" ) , ( NormalTok , " word-chars))" ) ] -, [ ( NormalTok , " " ) , ( KeywordTok , "=>" ) ] +, [ ( NormalTok , " " ) , ( OperatorTok , "=>" ) ] , [ ( NormalTok , " (" ) , ( KeywordTok , "lambda" ) , ( NormalTok , " (b)" ) @@ -121,7 +121,7 @@ ] , [] , [ ( NormalTok , "(" ) - , ( KeywordTok , "define" ) + , ( ExtensionTok , "define" ) , ( FunctionTok , " WORD-LIST " ) , ( NormalTok , "'(" ) , ( StringTok , "\"\"" ) @@ -142,7 +142,7 @@ , ( NormalTok , "))" ) ] , [ ( NormalTok , "(" ) - , ( KeywordTok , "define" ) + , ( ExtensionTok , "define" ) , ( FunctionTok , " " ) , ( NormalTok , "(report-word w)" ) ] diff --git a/test/expected/archive.rhtml.native b/test/expected/archive.rhtml.native --- a/test/expected/archive.rhtml.native +++ b/test/expected/archive.rhtml.native @@ -5,29 +5,29 @@ , [] , [] , [ ( KeywordTok , "<%" ) - , ( NormalTok , " form_for " ) + , ( ExtensionTok , " form_for " ) , ( StringTok , ":to_date" ) - , ( NormalTok , ", " ) + , ( ExtensionTok , ", " ) , ( OtherTok , "@to_date" ) - , ( NormalTok , ", " ) + , ( ExtensionTok , ", " ) , ( StringTok , ":url" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( CharTok , "=>" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( CharTok , "{" ) , ( StringTok , ":action" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( CharTok , "=>" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( StringTok , "'archive'" ) , ( CharTok , "}" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( KeywordTok , "do" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( CharTok , "|" ) - , ( NormalTok , "f" ) + , ( ExtensionTok , "f" ) , ( CharTok , "|" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( KeywordTok , "%>" ) ] , [ ( NormalTok , " " ) @@ -40,15 +40,17 @@ ] , [ ( NormalTok , " " ) , ( KeywordTok , "<%=" ) - , ( NormalTok , " select_date " ) + , ( ExtensionTok , " " ) + , ( NormalTok , "select_date" ) + , ( ExtensionTok , " " ) , ( OtherTok , "@from_date" ) - , ( NormalTok , ", " ) + , ( ExtensionTok , ", " ) , ( StringTok , ":prefix" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( CharTok , "=>" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( StringTok , "'from'" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( KeywordTok , "%>" ) ] , [ ( NormalTok , " " ) @@ -61,21 +63,23 @@ ] , [ ( NormalTok , " " ) , ( KeywordTok , "<%=" ) - , ( NormalTok , " select_date " ) + , ( ExtensionTok , " " ) + , ( NormalTok , "select_date" ) + , ( ExtensionTok , " " ) , ( OtherTok , "@to_date" ) - , ( NormalTok , ", " ) + , ( ExtensionTok , ", " ) , ( StringTok , ":prefix" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( CharTok , "=>" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( StringTok , "'to'" ) - , ( NormalTok , ", " ) + , ( ExtensionTok , ", " ) , ( StringTok , ":start_year" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( CharTok , "=>" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( DecValTok , "2000" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( KeywordTok , "%>

" ) ] , [ ( NormalTok , " " ) @@ -88,46 +92,54 @@ ] , [ ( NormalTok , " " ) , ( KeywordTok , "<%=" ) - , ( NormalTok , " select_tag " ) + , ( ExtensionTok , " " ) + , ( NormalTok , "select_tag" ) + , ( ExtensionTok , " " ) , ( StringTok , "\"series\"" ) - , ( NormalTok , ", options_for_select(series_list(" ) + , ( ExtensionTok , ", " ) + , ( NormalTok , "options_for_select" ) + , ( ExtensionTok , "(series_list(" ) , ( StringTok , "'All'" ) - , ( NormalTok , "), " ) + , ( ExtensionTok , "), " ) , ( OtherTok , "@series" ) - , ( NormalTok , ") " ) + , ( ExtensionTok , ") " ) , ( KeywordTok , "%>" ) ] , [ ( NormalTok , " " ) , ( KeywordTok , "<%=" ) - , ( NormalTok , " f.submit " ) + , ( ExtensionTok , " f" ) + , ( NormalTok , ".submit" ) + , ( ExtensionTok , " " ) , ( StringTok , "'Show events'" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( KeywordTok , "%>" ) ] , [ ( NormalTok , " " ) , ( KeywordTok , "

" ) ] , [ ( KeywordTok , "<%" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( KeywordTok , "end" ) - , ( NormalTok , " " ) + , ( ExtensionTok , " " ) , ( KeywordTok , "%>" ) ] , [] , [ ( KeywordTok , "