Hello community,
here is the log from the commit of package ghc-skylighting-core for
openSUSE:Factory checked in at 2019-07-29 17:26:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-skylighting-core (Old)
and /work/SRC/openSUSE:Factory/.ghc-skylighting-core.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-skylighting-core"
Mon Jul 29 17:26:53 2019 rev:9 rq:715420 version:0.8.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/ghc-skylighting-core/ghc-skylighting-core.changes
2019-06-19 21:12:50.518768248 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-skylighting-core.new.4126/ghc-skylighting-core.changes
2019-07-29 17:27:02.486287773 +0200
@@ -1,0 +2,21 @@
+Mon Jul 15 02:01:57 UTC 2019 - [email protected]
+
+- Update skylighting-core to version 0.8.2.
+ ## 0.8.2 -- 2019-07-14
+
+ * Change matchRegex so it gives "no match" on a regex error
+ instead of raising an exception. This seems to be how Kate
+ works. Fixes an error on long integer literals (#81).
+
+ ## 0.8.1.2 -- 2019-07-14
+
+ * Fix HlCChar for one-character octal escapes like '\0' (#82).
+ Due to a bug in pCStringChar, only multi-character octal
+ escapes were being recognized. This affects not just C
+ highlighting, but all of the following highlighters which
+ use HlCChar: fasm eiffel pike objectivec ruby vhdl scala
+ java jsp nasm protobuf pure go objectivecpp gnuassembler povray
+ actionscript c cs opencl boo rhtml elixir. This fixes a
+ regression introduced in version 0.3.1.
+
+-------------------------------------------------------------------
Old:
----
skylighting-core-0.8.1.1.tar.gz
New:
----
skylighting-core-0.8.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-skylighting-core.spec ++++++
--- /var/tmp/diff_new_pack.bt6y4d/_old 2019-07-29 17:27:03.686287328 +0200
+++ /var/tmp/diff_new_pack.bt6y4d/_new 2019-07-29 17:27:03.690287327 +0200
@@ -19,7 +19,7 @@
%global pkg_name skylighting-core
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.8.1.1
+Version: 0.8.2
Release: 0
Summary: Syntax highlighting library
License: BSD-3-Clause
++++++ skylighting-core-0.8.1.1.tar.gz -> skylighting-core-0.8.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.8.1.1/changelog.md
new/skylighting-core-0.8.2/changelog.md
--- old/skylighting-core-0.8.1.1/changelog.md 2019-06-14 03:43:56.000000000
+0200
+++ new/skylighting-core-0.8.2/changelog.md 2019-07-14 19:04:54.000000000
+0200
@@ -1,5 +1,22 @@
# Revision history for skylighting and skylighting-core
+## 0.8.2 -- 2019-07-14
+
+ * Change matchRegex so it gives "no match" on a regex error
+ instead of raising an exception. This seems to be how Kate
+ works. Fixes an error on long integer literals (#81).
+
+## 0.8.1.2 -- 2019-07-14
+
+ * Fix HlCChar for one-character octal escapes like '\0' (#82).
+ Due to a bug in pCStringChar, only multi-character octal
+ escapes were being recognized. This affects not just C
+ highlighting, but all of the following highlighters which
+ use HlCChar: fasm eiffel pike objectivec ruby vhdl scala
+ java jsp nasm protobuf pure go objectivecpp gnuassembler povray
+ actionscript c cs opencl boo rhtml elixir. This fixes a
+ regression introduced in version 0.3.1.
+
## 0.8.1.1 -- 2019-06-13
* Improved LaTeX escaping (#78).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.8.1.1/skylighting-core.cabal
new/skylighting-core-0.8.2/skylighting-core.cabal
--- old/skylighting-core-0.8.1.1/skylighting-core.cabal 2019-06-14
03:43:56.000000000 +0200
+++ new/skylighting-core-0.8.2/skylighting-core.cabal 2019-07-14
19:04:00.000000000 +0200
@@ -1,5 +1,5 @@
name: skylighting-core
-version: 0.8.1.1
+version: 0.8.2
synopsis: syntax highlighting library
description: Skylighting is a syntax highlighting library.
It derives its tokenizers from XML syntax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skylighting-core-0.8.1.1/src/Skylighting/Format/HTML.hs
new/skylighting-core-0.8.2/src/Skylighting/Format/HTML.hs
--- old/skylighting-core-0.8.1.1/src/Skylighting/Format/HTML.hs 2019-05-30
17:44:51.000000000 +0200
+++ new/skylighting-core-0.8.2/src/Skylighting/Format/HTML.hs 2019-07-14
18:19:49.000000000 +0200
@@ -167,23 +167,22 @@
" padding-left: 4px; }"
]
divspec = [
- "code.sourceCode > span { display: inline-block; line-height:
1.25; }"
+ "pre > code.sourceCode { white-space: pre; position: relative; }"
-- position relative needed for relative contents
+ , "pre > code.sourceCode > span { display: inline-block;
line-height: 1.25; }"
+ , "pre > code.sourceCode > span:empty { height: 1.2em; }" -- correct
empty line height
, "code.sourceCode > span { color: inherit; text-decoration:
inherit; }"
- , "code.sourceCode > span: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 relative contents
, "div.sourceCode { margin: 1em 0; }" -- Collapse neighbours
correctly
, "pre.sourceCode { margin: 0; }" -- Collapse neighbours correctly
, "@media screen {"
, "div.sourceCode { overflow: auto; }" -- do not overflow on screen
, "}"
, "@media print {"
- , "code.sourceCode { white-space: pre-wrap; }"
- , "code.sourceCode > span { text-indent: -5em; padding-left: 5em; }"
+ , "pre > code.sourceCode { white-space: pre-wrap; }"
+ , "pre > code.sourceCode > span { text-indent: -5em; padding-left:
5em; }"
, "}"
]
linkspec = [ "@media screen {"
- , "code.sourceCode > span > a:first-child::before { text-decoration:
underline; }"
+ , "pre > code.sourceCode > span > a:first-child::before {
text-decoration: underline; }"
, "}"
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.8.1.1/src/Skylighting/Regex.hs
new/skylighting-core-0.8.2/src/Skylighting/Regex.hs
--- old/skylighting-core-0.8.1.1/src/Skylighting/Regex.hs 2018-03-03
17:47:19.000000000 +0100
+++ new/skylighting-core-0.8.2/src/Skylighting/Regex.hs 2019-07-14
18:56:37.000000000 +0200
@@ -94,8 +94,9 @@
matchRegex r s = case unsafePerformIO (regexec r s) of
Right (Just (_, mat, _ , capts)) ->
Just (mat : capts)
- Right Nothing -> Nothing
- Left (_rc, msg) -> E.throw $ RegexException msg
+ Right Nothing -> Nothing
+ -- treat match error as no match, like Kate: #81
+ Left (_rc, _msg) -> Nothing
-- functions to marshall bytestrings to text
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skylighting-core-0.8.1.1/src/Skylighting/Tokenizer.hs
new/skylighting-core-0.8.2/src/Skylighting/Tokenizer.hs
--- old/skylighting-core-0.8.1.1/src/Skylighting/Tokenizer.hs 2019-06-04
08:44:17.000000000 +0200
+++ new/skylighting-core-0.8.2/src/Skylighting/Tokenizer.hs 2019-07-14
18:24:21.000000000 +0200
@@ -624,7 +624,7 @@
next <- A.anyChar
case next of
c | c == 'x' || c == 'X' -> () <$ A.takeWhile1 (A.inClass "0-9a-fA-F")
- | c == '0' -> () <$ A.takeWhile1 (A.inClass "0-7")
+ | c == '0' -> () <$ A.takeWhile (A.inClass "0-7")
| A.inClass "abefnrtv\"'?\\" c -> return ()
| otherwise -> mzero
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skylighting-core-0.8.1.1/test/test-skylighting.hs
new/skylighting-core-0.8.2/test/test-skylighting.hs
--- old/skylighting-core-0.8.1.1/test/test-skylighting.hs 2019-06-04
08:44:17.000000000 +0200
+++ new/skylighting-core-0.8.2/test/test-skylighting.hs 2019-07-14
19:01:29.000000000 +0200
@@ -90,7 +90,9 @@
let perl = maybe (error "could not find Perl syntax") id
(lookupSyntax "Perl" sMap)
cpp = maybe (error "could not find CPP syntax") id
- (lookupSyntax "cpp" sMap) in
+ (lookupSyntax "cpp" sMap)
+ c = maybe (error "could not find C syntax") id
+ (lookupSyntax "c" sMap) in
[ testCase "perl NUL case" $ Right
[[(KeywordTok,"s\NUL")
,(OtherTok,"b")
@@ -145,8 +147,15 @@
"0.1f\n1.0f\n-0.1f\n-1.0F\n-1.0L\n1e3\n-15e+3\n0.f\n1.F\n1.E3"
, testCase "cpp identifier (#76)" $ Right
[ [ (NormalTok,"ng_or") ]
- ] @=? tokenize defConfig cpp
- "ng_or"
+ ] @=? tokenize defConfig cpp "ng_or"
+
+ , testCase "c '\\0' (#82)" $ Right
+ [ [ (CharTok,"'\\0'") ]
+ ] @=? tokenize defConfig c "'\\0'"
+
+ , testCase "c very long integer (#81)" $ Right
+ [ [ (DecValTok, "1111111111111111111111") ]
+ ] @=? tokenize defConfig c "1111111111111111111111"
]
]
