rpm/ghc-skylighting
SHA256
1
0
Fork 0
forked from pool/ghc-skylighting
Code Pull Requests Activity

Accepting request 607884 from devel:languages:haskell

Browse Source 
Update ghc-skylighting to the latest version.

OBS-URL: https://build.opensuse.org/request/show/607884
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ghc-skylighting?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2018-05-30 10:13:28 +00:00 committed by Git OBS Bridge
commit 41f7126e2c
4 changed files with 200 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

184
ghc-skylighting.changes
View File

@ -1,3 +1,187 @@
-------------------------------------------------------------------
Mon May 14 17:02:11 UTC 2018 - psimons@suse.com
- Update skylighting to version 0.7.1.
* Split skylighting into skylighting-core (BSD3) and skylighting (GPL)
(#37, Jonathan Daugherty). skylighting-core (BSD3 licensed) includes
the core library functionality and the source of the XML syntax, but
not the compiled Syntax modules, and skylighting (GPL2 licensed)
includes Syntax modules compiled from the XML syntax files.
* We discontinue support for GHC before 7.10 (because we need to support the
reexport-modules Cabal directive.)
* Print message about loaded syntax defs to stderr (#36).
* New module Skylighting.Loader, exporting
`loadSyntaxFromFile` and `loadSyntaxesFromDir` (Jonathan Daugherty).
* Adjust tests to load xml definitions dynamically.
* Add ANSI color output (Alexander Ronald Altman, #22).
+ New package dependencies: `ansi-terminal` and `colour`.
+ New module: `Skylighting.Format.ANSI`, exporting `formatANSI`,
(also reexported from the module `Skylighting`).
+ In `Skylighting.Types`, new types `ANSIColorLevel` and
`Xterm256ColorCode`, and a new field `ansiColorLevel` in
`FormatOptions`.
+ Main `skylighting` executable now supports ANSI output (use
`ansi` as argument to `--format`), which is now the default output
format. A new flag `--color-level` has been added to select
the number of colors (with options `16`, `256`, `true`, and
the default `auto`).
* Reword error for missing contexts in IncludeRules.
* Use ordNub instead of nub for missingIncludes.
* Fixed tokenizer exceptions (#31). Previously `throwError`
did not actually generate `Left` results in `tokenize`,
because of the way the MonadPlus instance worked. Rewrote
the TokenizerM monad from scratch so that exceptions would
not be skipped.
* Improved error message about undefined contexts.
* Makefile: use cabal for bootstrap target.
* README: remove stack bootstrap instructions.
You can no longer bootstrap with stack, because it
insists on building ALL the executables the first time,
and of course that can't be done with this library.
* Use quickcheck for fuzz test.
* Small improvements to fuzz tests in test suite. We now
ensure that we print the random text on test failure. Also,
we now run the test with many smaller samples rather than
one big one.
* Add aeson lower bound (because of toEncoding) (#28).
* Fix line spacing and overflowing content in generated HTML
(David Baynard, #25, see jgm/pandoc#4128).
+ Fix empty line height, explicitly
+ Ensure long lines scroll on screen
+ Only apply colour to the outer div
+ Don't reset line number colour
+ Fix borders on empty code lines
+ Collapse divs correctly.
* Changes to Style types and JSON instances. Previously we could not
successfully round-trip through JSON.
+ `tokenStyles` is now a map rather than an association list.
+ We now use `line-number-color` instead of `line-numbers` at
the top level in the JSON instances, falling back to
`line-numbers` in `editor-colors`, for KDE theme compatibility.
+ We use `line-number-background-color` at the top level, falling
back to the text background color.
+ We use `text-color` at the top level, falling back to the `text-color`
of the `Normal` token style if it exists, for KDE compatibility.
+ We use `background-color` at the top level, falling back to
the `background-color` in `editor-colors`, for KDE compatibility.
+ A round-trip JSON test has been added.
* HTML formatting: fix color, bgcolor when numbering enabled.
Previously, the code got the color and background color
the numbers were supposed to get. See jgm/pandoc #4103.
* Updated syntax descriptions for bash, clojure, commonlisp, diff,
dockerfile, doxygen, doxygenlua, fsharp, hamlet, haskell, haxe,
java, javascript, julia, latex, literate-curry, literate-haskell,
makefile, mediawiki, monobasic, ocaml, prolog, r, relaxng, scala,
sci, sql-mysql, sql-postgresql, sql, xslt.
* test program: use --accept instead of --regen.
* HTML formatter: always use an a element (rather than a div)
for source lines. The divs were invalid, because code
elements must contain phrasing content. Previously we used
a elements when line anchors were called for, but there is
no clear reason not to use them always.
* skylighting binary: add doctype to generated HTML.
* Fixed regression in `data-line-number` attributes in HTML
output. We should not include the `lineIdPrefix` in
front of this.
* Fixed typo in css (Artymort).
* Fixed travis build times.
* `FormatOptions`: added `lineIdPrefix` (jgm/pandoc#4031).
This is needed because a web page may contain several
code samples, and we need to make sure that the ids on
lines are unique.
* HTML formatter: use `lineIdPrefix` in ids for lines.
* HTML formatter: Don't put href attributes on divs.
* HTML output: remove outer div. This prevented margin
collapsing between the pre and surrounding block elements,
and often gave us excess white space around code blocks.
See jgm/pandoc#3996.
* Updated XML definitions from KDE repository.
Changed: actionscript, ada, agda, alert, alert_indent, asn1, awk, bash,
boo, c, changelog, clojure, cmake, coldfusion, commonlisp, cpp, cs, css,
curry, d, dockerfile, dot, doxygen, doxygenlua, eiffel, email, erlang,
fortran, fsharp, gcc, haskell, haxe, isocpp, java, javascript, jsp, julia,
lilypond, lua, m4, makefile, matlab, maxima, mips, modelines, modula-2,
monobasic, objectivec, objectivecpp, ocaml, octave, opencl, pascal, perl,
php, pike, postscript, prolog, purebasic, python, r, relaxng,
relaxngcompact, rest, rhtml, ruby, rust, scala, scheme, sci, sql-mysql,
sql-postgresql, sql, tcl, tcsh, verilog, vhdl, xml, xslt, xul, zsh.
* Added support for powershell, using definition from KDE repository.
* Stop terminating long builds on TravisCI (Kyle Ondy).
* Removed ToJSON/FromJSON instances for KeywordAttr,
WordSet, Matcher, Context, ContextSwitch, Rule, Syntax
(added in 0.3.5). Creating these increased the memory
requirements for compiling skylighting to a degree not
justified by the usefulness of these instances.
* Added ToJSON/FromJSON instances for all basic types.
* Added some background colors to 'kate' style, matching default.theme,
and made FromJSON for Style sensitive to background-color.
* HTML formatting: do not use `div` elements for source
lines in inline output.
* HTML formatting changes (David Baynard). Note that these
changes may require changes in hard-coded CSS that is
used with skylighting's HTML output.
+ Wrap lines of source code in a `div` with `display` set to
`inline-block`. The `div`s make per-line processing easier.
They cannot be set as `display: block` as that introduces extra
new lines when copying and pasting.
+ Render line numbers in html using CSS pseudo elements rather than
a table. The line numbers are always produced, as `data-line-number`
attributes, and css to display them as `::before` elements are
always produced. The option to switch on line numbering only
toggles a class; this means it is possible to toggle line numbering
without re-running skylighting.
+ If the `linkAnchors` option is set, wrap with an `a` element rather
than a `div`, set so that clicking the line number (and only the
line number) will jump to that line.
+ Code wraps by default when html is printed, with wrapped lines
indented.
* Updated xml syntax definitions and clojure test.
* Improved 'make update-xml' target.
* Updated version bound for criterion.
* Revert change from 0.3.2; now entities from a DTD are
resolved if the DTD element is included. This is needed
for agda.xml and some others. If you want to use a custom
xml definition without needing language.dtd, just remove
the reference to language.dtd in your xml file.
* Added `case` keyword for ats (Hanwen (Steinway) Wu).
* Parse xml definitions without resolving entities from
language.dtd. This allows xml definitions to be used even
when language.dtd isn't available. Existing definitions
don't rely on the two or three entities definied in
language.dtd, so this is harmless.
* Small optimizations.
* Use handwritten parser for Float instead of regex. Fixes
jgm/highlighting-kate#57 (again).
* Added float parsing tests.
* Use parsec parsers, not regex, for CStringChar and CChar.
* Rewrote Int, Hex, Oct, CStringChar, CCHar parsers with parsec
instead of regex. This speeds things up.
* Don't include leading + in Int, Hex, Oct parsers. That gives
bad results for things like `i+1`.
* Store literal binary-encoded representations of the Syntax
structure in Skylighting.Syntax.*.hs, instead of the
structure itself. This works around a problem ghc has
compiling modules with large structures. This indirect method
produces faster compile times and avoids massive memory usage by
ghc (especially in profiling builds). For background see
http://stackoverflow.com/questions/16348340/. Closes #7.
* Types: Internals of 'WordSet' are no longer exposed.
* Restore Data, Typeable, Generic instances for basic types.
To do this, we remove reCompiled field from RE (API change). Instead, we
have the tokenizer compile regexes the first time it encounters them,
memoizing the results. Performance is not significantly worse.
* Skylighting.Syntax.*: use string representation of the Syntax,
which is then 'read', rather than including the code for the data
structure directly (#7). This indirect method produces faster compile
times and avoids massive memory usage by ghc (especially in profiling
builds). For background see
http://stackoverflow.com/questions/16348340/compiling-very-large-constants-with-ghc
* Use -fprof-auto-exported for profiling builds.
* Added benchmark for xml syntax definition parsing.
* Patched perl.xml (improperly escaped regex) (#8).
This fixes a perl regex compilation error for regex patterns
with backslash as delimiter, e.g. m\a\.
* Add a flag to build with system pcre (Felix Yan).
-------------------------------------------------------------------
Thu Aug 3 15:38:38 UTC 2017 - psimons@suse.com

32
ghc-skylighting.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ghc-skylighting
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -16,22 +16,25 @@
#
%global without_prof 1
%global pkg_name skylighting
%bcond_with tests
Name: ghc-%{pkg_name}
Version: 0.1.1.5
Version: 0.7.1
Release: 0
Summary: Syntax highlighting library
License: GPL-2.0+
License: GPL-2.0-or-later
Group: Development/Libraries/Haskell
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-aeson-devel
BuildRequires: ghc-ansi-terminal-devel
BuildRequires: ghc-attoparsec-devel
BuildRequires: ghc-base64-bytestring-devel
BuildRequires: ghc-binary-devel
BuildRequires: ghc-blaze-html-devel
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-case-insensitive-devel
BuildRequires: ghc-colour-devel
BuildRequires: ghc-containers-devel
BuildRequires: ghc-directory-devel
BuildRequires: ghc-filepath-devel
@ -40,24 +43,18 @@ BuildRequires: ghc-mtl-devel
BuildRequires: ghc-regex-pcre-builtin-devel
BuildRequires: ghc-rpm-macros
BuildRequires: ghc-safe-devel
BuildRequires: ghc-skylighting-core-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-utf8-string-devel
%if %{with tests}
BuildRequires: ghc-Diff-devel
BuildRequires: ghc-HUnit-devel
BuildRequires: ghc-pretty-show-devel
BuildRequires: ghc-random-devel
BuildRequires: ghc-tasty-devel
BuildRequires: ghc-tasty-golden-devel
BuildRequires: ghc-tasty-hunit-devel
%endif
%description
Skylighting is a syntax highlighting library with support for over one hundred
languages. It derives its tokenizers from XML syntax definitions used by KDE's
KSyntaxHighlighting framework, so any syntax supported by that framework can be
added. An optional command-line program is provided. Skylighting is intended to
be the successor to highlighting-kate.
be the successor to highlighting-kate. This package provides generated syntax
modules based on the KDE XML definitions provided by the 'skylighting-core'
package. As a result this package is licensed under the GPL.
%package devel
Summary: Haskell %{pkg_name} library development files
@ -79,9 +76,6 @@ This package provides the Haskell %{pkg_name} library development files.
%install
%ghc_lib_install
%check
%cabal_test
%post devel
%ghc_pkg_recache
@ -89,7 +83,7 @@ This package provides the Haskell %{pkg_name} library development files.
%ghc_pkg_recache
%files -f %{name}.files
%doc LICENSE
%license LICENSE
%files devel -f %{name}-devel.files
%doc README.md changelog.md

3
skylighting-0.1.1.5.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a4b666b2ccfeed35386bd364d663e919adc1815547e6360e83487253e33b13c
size 584235

3
skylighting-0.7.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c0bcd4f0075c77226052ab9a04f90ff8d2f2c8e97e5083d9e65843635bb0f574
size 491234