Hello community, here is the log from the commit of package highlight for openSUSE:Factory checked in at 2019-06-12 13:02:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/highlight (Old) and /work/SRC/openSUSE:Factory/.highlight.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "highlight" Wed Jun 12 13:02:21 2019 rev:24 rq:706187 version:3.52 Changes: -------- --- /work/SRC/openSUSE:Factory/highlight/highlight.changes 2019-05-21 10:35:33.943274859 +0200 +++ /work/SRC/openSUSE:Factory/.highlight.new.4811/highlight.changes 2019-06-12 13:02:22.853282378 +0200 @@ -1,0 +2,16 @@ +Wed May 29 05:31:04 UTC 2019 - antoine.belv...@opensuse.org + +- Update to version 3.52: + * Added negation `~` to test state indicators + (gl#saalen/highlight#122). + * Added support for Hugo. + * Added 5 duotone themes. + * CLI: fixed segfault with `--force` (gl#saalen/highlight#125). + * GUI: limited font selection to monospace fonts + (gl#saalen/highlight#124). +- Rebase optflags patch: + * Remove highlight-3.42-use_optflags.patch. + * Add highlight-3.52-use_optflags.patch. +- Remove obsolete conditionals. + +------------------------------------------------------------------- Old: ---- highlight-3.42-use_optflags.patch highlight-3.51.tar.bz2 highlight-3.51.tar.bz2.asc New: ---- highlight-3.52-use_optflags.patch highlight-3.52.tar.bz2 highlight-3.52.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ highlight.spec ++++++ --- /var/tmp/diff_new_pack.LtFLLO/_old 2019-06-12 13:02:23.393282152 +0200 +++ /var/tmp/diff_new_pack.LtFLLO/_new 2019-06-12 13:02:23.393282152 +0200 @@ -18,7 +18,7 @@ %bcond_without gui Name: highlight -Version: 3.51 +Version: 3.52 Release: 0 Summary: Universal Source Code to Formatted Text Converter License: GPL-3.0-or-later @@ -29,16 +29,12 @@ Source99: highlight.keyring # PATCH-FIX-OPENSUSE highlight-3.45-fix-doc-dir.patch Patch0: highlight-3.45-fix-doc-dir.patch -# PATCH-FIX-OPENSUSE highlight-3.42-use_optflags.patch -Patch1: highlight-3.42-use_optflags.patch +# PATCH-FIX-OPENSUSE highlight-3.52-use_optflags.patch +Patch1: highlight-3.52-use_optflags.patch BuildRequires: dos2unix BuildRequires: gcc-c++ -BuildRequires: lua-devel -%if 0%{?suse_version} > 1325 BuildRequires: libboost_headers-devel -%else -BuildRequires: boost-devel -%endif +BuildRequires: lua-devel %description A utility that converts sourcecode to HTML, XHTML, RTF, LaTeX, TeX, XML or ANSI @@ -55,10 +51,6 @@ BuildRequires: libqt5-qtbase-devel BuildRequires: update-desktop-files Requires: %{name} = %{version} -%if 0%{?suse_version} < 1330 -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -%endif %description gui This package provides graphical interface for %{name}. @@ -99,14 +91,6 @@ rm %{buildroot}%{_docdir}/%{name}/INSTALL -%if %{with gui} && 0%{?suse_version} < 1330 -%post gui -%desktop_database_post - -%postun gui -%desktop_database_postun -%endif - %files %{_bindir}/%{name} %{_docdir}/%{name} ++++++ highlight-3.42-use_optflags.patch -> highlight-3.52-use_optflags.patch ++++++ --- /work/SRC/openSUSE:Factory/highlight/highlight-3.42-use_optflags.patch 2018-01-26 13:56:09.506619519 +0100 +++ /work/SRC/openSUSE:Factory/.highlight.new.4811/highlight-3.52-use_optflags.patch 2019-06-12 13:02:22.677282452 +0200 @@ -12,7 +12,7 @@ -CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 +OPTFLAGS=-O2 +CFLAGS:=-Wall -DNDEBUG -std=c++11 $(OPTFLAGS) - #CFLAGS:=-ggdb ${CFLAGS} -std=c++11 + #CFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++11 CFLAGS_DILU=-fno-strict-aliasing @@ -114,7 +115,7 @@ gui-qt: highlight-gui ++++++ highlight-3.51.tar.bz2 -> highlight-3.52.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/ChangeLog.adoc new/highlight-3.52/ChangeLog.adoc --- old/highlight-3.51/ChangeLog.adoc 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/ChangeLog.adoc 2019-05-28 20:47:06.000000000 +0200 @@ -6,6 +6,17 @@ :toc: left :toclevels: 1 + +== highlight 3.52 + +28.05.2019 + + - added negation `~` to test state indicators (https://gitlab.com/saalen/highlight/issues/122) + - added support for Hugo (https://gitlab.com/saalen/highlight/merge_requests/113) + - added 5 duotone themes (https://gitlab.com/saalen/highlight/merge_requests/115) + - CLI: fixed segfault with `--force` (https://gitlab.com/saalen/highlight/issues/125) + - GUI: limited font selection to monospace fonts (https://gitlab.com/saalen/highlight/issues/124) + == highlight 3.51 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/README_LANGLIST.adoc new/highlight-3.52/README_LANGLIST.adoc --- old/highlight-3.51/README_LANGLIST.adoc 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/README_LANGLIST.adoc 2019-05-28 20:47:06.000000000 +0200 @@ -1,6 +1,6 @@ = HIGHLIGHT LANGUAGES LIST André Simon -v3.50, March 2019 +v3.51, May 2019 :lang: en :experimental: :icons: font @@ -16,9 +16,9 @@ endif::[] //// -***************************************** +***************************************** * THIS IS AN AUTO-GENERATED DOCUMENT!!! * -***************************************** +***************************************** Any manual changes to this document will be overwritten by automated scripted updates! //// @@ -44,239 +44,241 @@ |========================================== | Language | Filename | Extensions -| (G)AWK | link:./langDefs/awk.lang[`awk.lang`,title="View source file"] | +| (G)AWK | link:./langDefs/awk.lang[`awk.lang`,title="View source file"] | | ABAP/4 | link:./langDefs/abap4.lang[`abap4.lang`,title="View source file"] | abp -| ABC | link:./langDefs/abc.lang[`abc.lang`,title="View source file"] | +| ABC | link:./langDefs/abc.lang[`abc.lang`,title="View source file"] | | Abstract | link:./langDefs/aspect.lang[`aspect.lang`,title="View source file"] | was wud | ActionScript | link:./langDefs/actionscript.lang[`actionscript.lang`,title="View source file"] | as | Active Server Pages | link:./langDefs/asp.lang[`asp.lang`,title="View source file"] | ascx ashx aspx | ADA95 | link:./langDefs/ada.lang[`ada.lang`,title="View source file"] | a adb ads gnad -| Advanced Backus-Naur Form | link:./langDefs/abnf.lang[`abnf.lang`,title="View source file"] | -| Agda | link:./langDefs/agda.lang[`agda.lang`,title="View source file"] | +| Advanced Backus-Naur Form | link:./langDefs/abnf.lang[`abnf.lang`,title="View source file"] | +| Agda | link:./langDefs/agda.lang[`agda.lang`,title="View source file"] | | ALAN Interactive Fiction Language | link:./langDefs/alan.lang[`alan.lang`,title="View source file"] | alan i | ALGOL 68 | link:./langDefs/algol.lang[`algol.lang`,title="View source file"] | alg | AMPL | link:./langDefs/ampl.lang[`ampl.lang`,title="View source file"] | dat run | AMTrix | link:./langDefs/amtrix.lang[`amtrix.lang`,title="View source file"] | hnd s4 s4h s4t t4 | Ansible YAML | link:./langDefs/yaml.lang[`yaml.lang`,title="View source file"] | yml -| Apache Config | link:./langDefs/httpd.lang[`httpd.lang`,title="View source file"] | -| AppleScript | link:./langDefs/applescript.lang[`applescript.lang`,title="View source file"] | +| Apache Config | link:./langDefs/httpd.lang[`httpd.lang`,title="View source file"] | +| AppleScript | link:./langDefs/applescript.lang[`applescript.lang`,title="View source file"] | | Applied Type System | link:./langDefs/ats.lang[`ats.lang`,title="View source file"] | dats -| Arc | link:./langDefs/arc.lang[`arc.lang`,title="View source file"] | -| ARM | link:./langDefs/arm.lang[`arm.lang`,title="View source file"] | -| AS/400 CL | link:./langDefs/as400cl.lang[`as400cl.lang`,title="View source file"] | +| Arc | link:./langDefs/arc.lang[`arc.lang`,title="View source file"] | +| ARM | link:./langDefs/arm.lang[`arm.lang`,title="View source file"] | +| AS/400 CL | link:./langDefs/as400cl.lang[`as400cl.lang`,title="View source file"] | | ASCEND | link:./langDefs/ascend.lang[`ascend.lang`,title="View source file"] | a4c +| AsciiDoc | link:./langDefs/asciidoc.lang[`asciidoc.lang`,title="View source file"] | | AutoHotKey | link:./langDefs/autohotkey.lang[`autohotkey.lang`,title="View source file"] | ahk | AutoIt | link:./langDefs/autoit.lang[`autoit.lang`,title="View source file"] | au3 -| Avenue | link:./langDefs/avenue.lang[`avenue.lang`,title="View source file"] | -| Backus-Naur Form | link:./langDefs/bnf.lang[`bnf.lang`,title="View source file"] | +| Avenue | link:./langDefs/avenue.lang[`avenue.lang`,title="View source file"] | +| Backus-Naur Form | link:./langDefs/bnf.lang[`bnf.lang`,title="View source file"] | | Bash | link:./langDefs/sh.lang[`sh.lang`,title="View source file"] | bash ebuild eclass zsh -| BBcode | link:./langDefs/bbcode.lang[`bbcode.lang`,title="View source file"] | -| BCPL | link:./langDefs/bcpl.lang[`bcpl.lang`,title="View source file"] | +| BBcode | link:./langDefs/bbcode.lang[`bbcode.lang`,title="View source file"] | +| BCPL | link:./langDefs/bcpl.lang[`bcpl.lang`,title="View source file"] | | BibTeX | link:./langDefs/bibtex.lang[`bibtex.lang`,title="View source file"] | bib | Biferno | link:./langDefs/biferno.lang[`biferno.lang`,title="View source file"] | bfr | Bison | link:./langDefs/bison.lang[`bison.lang`,title="View source file"] | y | Blitz Basic | link:./langDefs/blitzbasic.lang[`blitzbasic.lang`,title="View source file"] | bb -| BM Script | link:./langDefs/bms.lang[`bms.lang`,title="View source file"] | -| Boo | link:./langDefs/boo.lang[`boo.lang`,title="View source file"] | +| BM Script | link:./langDefs/bms.lang[`bms.lang`,title="View source file"] | +| Boo | link:./langDefs/boo.lang[`boo.lang`,title="View source file"] | | C and C++ | link:./langDefs/c.lang[`c.lang`,title="View source file"] | c++ cc cpp cu cxx h hh hpp hxx | C# | link:./langDefs/csharp.lang[`csharp.lang`,title="View source file"] | cs -| Ceylon | link:./langDefs/ceylon.lang[`ceylon.lang`,title="View source file"] | -| Chapel | link:./langDefs/chpl.lang[`chpl.lang`,title="View source file"] | +| Ceylon | link:./langDefs/ceylon.lang[`ceylon.lang`,title="View source file"] | +| Chapel | link:./langDefs/chpl.lang[`chpl.lang`,title="View source file"] | | Charmm | link:./langDefs/charmm.lang[`charmm.lang`,title="View source file"] | inp | CHILL | link:./langDefs/chill.lang[`chill.lang`,title="View source file"] | chl | Clean | link:./langDefs/clean.lang[`clean.lang`,title="View source file"] | icl | ClearBasic | link:./langDefs/clearbasic.lang[`clearbasic.lang`,title="View source file"] | cb -| Clipper | link:./langDefs/clipper.lang[`clipper.lang`,title="View source file"] | -| Clips | link:./langDefs/clp.lang[`clp.lang`,title="View source file"] | +| Clipper | link:./langDefs/clipper.lang[`clipper.lang`,title="View source file"] | +| Clips | link:./langDefs/clp.lang[`clp.lang`,title="View source file"] | | Clojure | link:./langDefs/clojure.lang[`clojure.lang`,title="View source file"] | clj -| CMake | link:./langDefs/cmake.lang[`cmake.lang`,title="View source file"] | +| CMake | link:./langDefs/cmake.lang[`cmake.lang`,title="View source file"] | | COBOL | link:./langDefs/cobol.lang[`cobol.lang`,title="View source file"] | cbl cob -| Coffeescript | link:./langDefs/coffee.lang[`coffee.lang`,title="View source file"] | -| Coffeescript Block Regex | link:./langDefs/cs_block_regex.lang[`cs_block_regex.lang`,title="View source file"] | +| Coffeescript | link:./langDefs/coffee.lang[`coffee.lang`,title="View source file"] | +| Coffeescript Block Regex | link:./langDefs/cs_block_regex.lang[`cs_block_regex.lang`,title="View source file"] | | ColdFusion MX | link:./langDefs/coldfusion.lang[`coldfusion.lang`,title="View source file"] | cfc cfm -| Crack | link:./langDefs/crk.lang[`crk.lang`,title="View source file"] | +| Crack | link:./langDefs/crk.lang[`crk.lang`,title="View source file"] | | Crystal | link:./langDefs/crystal.lang[`crystal.lang`,title="View source file"] | cr -| CSS | link:./langDefs/css.lang[`css.lang`,title="View source file"] | -| D | link:./langDefs/d.lang[`d.lang`,title="View source file"] | -| Dart | link:./langDefs/dart.lang[`dart.lang`,title="View source file"] | +| CSS | link:./langDefs/css.lang[`css.lang`,title="View source file"] | +| D | link:./langDefs/d.lang[`d.lang`,title="View source file"] | +| Dart | link:./langDefs/dart.lang[`dart.lang`,title="View source file"] | | delphi | link:./langDefs/delphi.lang[`delphi.lang`,title="View source file"] | dpr pas | Device Tree Source | link:./langDefs/dts.lang[`dts.lang`,title="View source file"] | dtsi | Diff | link:./langDefs/diff.lang[`diff.lang`,title="View source file"] | patch | Dockerfile | link:./langDefs/docker.lang[`docker.lang`,title="View source file"] | dockerfile -| Dylan | link:./langDefs/dylan.lang[`dylan.lang`,title="View source file"] | -| EBNF2 | link:./langDefs/ebnf2.lang[`ebnf2.lang`,title="View source file"] | +| Dylan | link:./langDefs/dylan.lang[`dylan.lang`,title="View source file"] | +| EBNF2 | link:./langDefs/ebnf2.lang[`ebnf2.lang`,title="View source file"] | | Eiffel | link:./langDefs/eiffel.lang[`eiffel.lang`,title="View source file"] | e se | Elixir | link:./langDefs/elixir.lang[`elixir.lang`,title="View source file"] | ex exs -| E-Mail treated as Markup | link:./langDefs/email.lang[`email.lang`,title="View source file"] | -| ERB Templates | link:./langDefs/erb.lang[`erb.lang`,title="View source file"] | +| E-Mail treated as Markup | link:./langDefs/email.lang[`email.lang`,title="View source file"] | +| ERB Templates | link:./langDefs/erb.lang[`erb.lang`,title="View source file"] | | Erlang | link:./langDefs/erlang.lang[`erlang.lang`,title="View source file"] | erl hrl | Euphoria | link:./langDefs/euphoria.lang[`euphoria.lang`,title="View source file"] | eu ew exw wxu -| Excel Formulas | link:./langDefs/excel.lang[`excel.lang`,title="View source file"] | +| EXAPUNKS | link:./langDefs/exapunks.lang[`exapunks.lang`,title="View source file"] | exa exapunks +| Excel Formulas | link:./langDefs/excel.lang[`excel.lang`,title="View source file"] | | Express | link:./langDefs/express.lang[`express.lang`,title="View source file"] | exp -| Extended Backus-Naur Form | link:./langDefs/ebnf.lang[`ebnf.lang`,title="View source file"] | +| Extended Backus-Naur Form | link:./langDefs/ebnf.lang[`ebnf.lang`,title="View source file"] | | F# | link:./langDefs/fsharp.lang[`fsharp.lang`,title="View source file"] | fs fsx | FAME | link:./langDefs/fame.lang[`fame.lang`,title="View source file"] | fame | fasm | link:./langDefs/fasm.lang[`fasm.lang`,title="View source file"] | inc | Felix | link:./langDefs/felix.lang[`felix.lang`,title="View source file"] | flx | Fortran 77 | link:./langDefs/fortran77.lang[`fortran77.lang`,title="View source file"] | f for ftn | Fortran 90 | link:./langDefs/fortran90.lang[`fortran90.lang`,title="View source file"] | f90 f95 -| Frink | link:./langDefs/frink.lang[`frink.lang`,title="View source file"] | -| fstab config file | link:./langDefs/fstab.lang[`fstab.lang`,title="View source file"] | +| Frink | link:./langDefs/frink.lang[`frink.lang`,title="View source file"] | +| fstab config file | link:./langDefs/fstab.lang[`fstab.lang`,title="View source file"] | | Gambas | link:./langDefs/gambas.lang[`gambas.lang`,title="View source file"] | class -| gdb | link:./langDefs/gdb.lang[`gdb.lang`,title="View source file"] | +| gdb | link:./langDefs/gdb.lang[`gdb.lang`,title="View source file"] | | GDScript | link:./langDefs/gdscript.lang[`gdscript.lang`,title="View source file"] | gd | Generic Assembler | link:./langDefs/assembler.lang[`assembler.lang`,title="View source file"] | 29k 68s 68x a51 asm x86 | Generic config files | link:./langDefs/conf.lang[`conf.lang`,title="View source file"] | anacrontab | GitHub Flavored Markdown | link:./langDefs/md.lang[`md.lang`,title="View source file"] | markdown -| Go | link:./langDefs/go.lang[`go.lang`,title="View source file"] | +| Go | link:./langDefs/go.lang[`go.lang`,title="View source file"] | | Graphviz | link:./langDefs/graphviz.lang[`graphviz.lang`,title="View source file"] | dot | Haskell | link:./langDefs/haskell.lang[`haskell.lang`,title="View source file"] | hs -| Haskell LHS | link:./langDefs/lhs.lang[`lhs.lang`,title="View source file"] | +| Haskell LHS | link:./langDefs/lhs.lang[`lhs.lang`,title="View source file"] | | haXe | link:./langDefs/haxe.lang[`haxe.lang`,title="View source file"] | hx -| Hecl | link:./langDefs/hcl.lang[`hcl.lang`,title="View source file"] | +| Hecl | link:./langDefs/hcl.lang[`hcl.lang`,title="View source file"] | | HTML | link:./langDefs/html.lang[`html.lang`,title="View source file"] | htm jinja twig xhtml | Icon | link:./langDefs/icon.lang[`icon.lang`,title="View source file"] | icn -| IDL | link:./langDefs/idl.lang[`idl.lang`,title="View source file"] | +| IDL | link:./langDefs/idl.lang[`idl.lang`,title="View source file"] | | Informix | link:./langDefs/informix.lang[`informix.lang`,title="View source file"] | 4gl -| INI | link:./langDefs/ini.lang[`ini.lang`,title="View source file"] | desktop doxyfile +| INI | link:./langDefs/ini.lang[`ini.lang`,title="View source file"] | desktop doxyfile kdev3 | Inno Setup | link:./langDefs/innosetup.lang[`innosetup.lang`,title="View source file"] | iss -| Interactive Data Language | link:./langDefs/idlang.lang[`idlang.lang`,title="View source file"] | +| Interactive Data Language | link:./langDefs/idlang.lang[`idlang.lang`,title="View source file"] | | INTERLIS | link:./langDefs/interlis.lang[`interlis.lang`,title="View source file"] | ili -| IO | link:./langDefs/io.lang[`io.lang`,title="View source file"] | +| IO | link:./langDefs/io.lang[`io.lang`,title="View source file"] | | Jasmin | link:./langDefs/jasmin.lang[`jasmin.lang`,title="View source file"] | j | Java | link:./langDefs/java.lang[`java.lang`,title="View source file"] | gradle groovy grv jenkinsfile -| Java FX | link:./langDefs/fx.lang[`fx.lang`,title="View source file"] | -| Javascript | link:./langDefs/js.lang[`js.lang`,title="View source file"] | -| Javascript Regex | link:./langDefs/js_regex.lang[`js_regex.lang`,title="View source file"] | -| JavaServer Pages | link:./langDefs/jsp.lang[`jsp.lang`,title="View source file"] | -| JSON | link:./langDefs/json.lang[`json.lang`,title="View source file"] | -| JSX | link:./langDefs/jsx.lang[`jsx.lang`,title="View source file"] | +| Java FX | link:./langDefs/fx.lang[`fx.lang`,title="View source file"] | +| Javascript | link:./langDefs/js.lang[`js.lang`,title="View source file"] | +| Javascript Regex | link:./langDefs/js_regex.lang[`js_regex.lang`,title="View source file"] | +| JavaServer Pages | link:./langDefs/jsp.lang[`jsp.lang`,title="View source file"] | +| JSON | link:./langDefs/json.lang[`json.lang`,title="View source file"] | +| JSX | link:./langDefs/jsx.lang[`jsx.lang`,title="View source file"] | | Julia | link:./langDefs/julia.lang[`julia.lang`,title="View source file"] | jl | Kotlin | link:./langDefs/kotlin.lang[`kotlin.lang`,title="View source file"] | kt -| LDAP | link:./langDefs/ldif.lang[`ldif.lang`,title="View source file"] | -| LESS | link:./langDefs/less.lang[`less.lang`,title="View source file"] | +| LDAP | link:./langDefs/ldif.lang[`ldif.lang`,title="View source file"] | +| LESS | link:./langDefs/less.lang[`less.lang`,title="View source file"] | | Lilypond | link:./langDefs/lilypond.lang[`lilypond.lang`,title="View source file"] | ly | Limbo | link:./langDefs/limbo.lang[`limbo.lang`,title="View source file"] | b | Linden Script | link:./langDefs/lindenscript.lang[`lindenscript.lang`,title="View source file"] | lsl | Lisp | link:./langDefs/lisp.lang[`lisp.lang`,title="View source file"] | cl clisp el fas lsp sbcl scm scom | Logtalk | link:./langDefs/logtalk.lang[`logtalk.lang`,title="View source file"] | lgt -| Lotos | link:./langDefs/lotos.lang[`lotos.lang`,title="View source file"] | +| Lotos | link:./langDefs/lotos.lang[`lotos.lang`,title="View source file"] | | Lotus | link:./langDefs/lotus.lang[`lotus.lang`,title="View source file"] | ls -| Lua | link:./langDefs/lua.lang[`lua.lang`,title="View source file"] | -| Lua (for LuaTeX) | link:./langDefs/inc_luatex.lang[`inc_luatex.lang`,title="View source file"] | +| Lua | link:./langDefs/lua.lang[`lua.lang`,title="View source file"] | +| Lua (for LuaTeX) | link:./langDefs/inc_luatex.lang[`inc_luatex.lang`,title="View source file"] | | Luban | link:./langDefs/luban.lang[`luban.lang`,title="View source file"] | lbn -| Magic eXtensible Markup | link:./langDefs/mxml.lang[`mxml.lang`,title="View source file"] | +| Magic eXtensible Markup | link:./langDefs/mxml.lang[`mxml.lang`,title="View source file"] | | Make | link:./langDefs/make.lang[`make.lang`,title="View source file"] | mak makefile mk | Maple | link:./langDefs/maple.lang[`maple.lang`,title="View source file"] | mpl | Matlab | link:./langDefs/matlab.lang[`matlab.lang`,title="View source file"] | m -| MaxScript | link:./langDefs/ms.lang[`ms.lang`,title="View source file"] | +| MaxScript | link:./langDefs/ms.lang[`ms.lang`,title="View source file"] | | Maya | link:./langDefs/maya.lang[`maya.lang`,title="View source file"] | mel -| Mercury | link:./langDefs/mercury.lang[`mercury.lang`,title="View source file"] | -| Meson | link:./langDefs/meson.lang[`meson.lang`,title="View source file"] | -| Microsoft PowerShell | link:./langDefs/ps1.lang[`ps1.lang`,title="View source file"] | -| Miranda | link:./langDefs/miranda.lang[`miranda.lang`,title="View source file"] | +| Mercury | link:./langDefs/mercury.lang[`mercury.lang`,title="View source file"] | +| Meson | link:./langDefs/meson.lang[`meson.lang`,title="View source file"] | +| Microsoft PowerShell | link:./langDefs/ps1.lang[`ps1.lang`,title="View source file"] | +| Miranda | link:./langDefs/miranda.lang[`miranda.lang`,title="View source file"] | | mIRC Scripting | link:./langDefs/msl.lang[`msl.lang`,title="View source file"] | nbs | Modelica | link:./langDefs/modelica.lang[`modelica.lang`,title="View source file"] | mo | Modula2 | link:./langDefs/mod2.lang[`mod2.lang`,title="View source file"] | def mod | Modula3 | link:./langDefs/mod3.lang[`mod3.lang`,title="View source file"] | i3 m3 -| MoonScript | link:./langDefs/moon.lang[`moon.lang`,title="View source file"] | +| MoonScript | link:./langDefs/moon.lang[`moon.lang`,title="View source file"] | | MS DOS Batch | link:./langDefs/bat.lang[`bat.lang`,title="View source file"] | cmd -| MSSQL | link:./langDefs/mssql.lang[`mssql.lang`,title="View source file"] | +| MSSQL | link:./langDefs/mssql.lang[`mssql.lang`,title="View source file"] | | Nasal | link:./langDefs/nasal.lang[`nasal.lang`,title="View source file"] | nas | Nemerle | link:./langDefs/nemerle.lang[`nemerle.lang`,title="View source file"] | n | NetRexx | link:./langDefs/netrexx.lang[`netrexx.lang`,title="View source file"] | nrx -| NeXT Byte Codes | link:./langDefs/nbc.lang[`nbc.lang`,title="View source file"] | -| Nginx configuration | link:./langDefs/nginx.lang[`nginx.lang`,title="View source file"] | -| Nice | link:./langDefs/nice.lang[`nice.lang`,title="View source file"] | -| Nim | link:./langDefs/nim.lang[`nim.lang`,title="View source file"] | -| Not eXactly C | link:./langDefs/nxc.lang[`nxc.lang`,title="View source file"] | +| NeXT Byte Codes | link:./langDefs/nbc.lang[`nbc.lang`,title="View source file"] | +| Nginx configuration | link:./langDefs/nginx.lang[`nginx.lang`,title="View source file"] | +| Nice | link:./langDefs/nice.lang[`nice.lang`,title="View source file"] | +| Nim | link:./langDefs/nim.lang[`nim.lang`,title="View source file"] | +| Not eXactly C | link:./langDefs/nxc.lang[`nxc.lang`,title="View source file"] | | Notation3 (N3), N-Triples, Turtle, SPARQL | link:./langDefs/n3.lang[`n3.lang`,title="View source file"] | nt ttl | NSIS | link:./langDefs/nsis.lang[`nsis.lang`,title="View source file"] | nsh nsi | Oberon | link:./langDefs/oberon.lang[`oberon.lang`,title="View source file"] | ooc -| Object Script | link:./langDefs/os.lang[`os.lang`,title="View source file"] | -| Objective C | link:./langDefs/objc.lang[`objc.lang`,title="View source file"] | +| Object Script | link:./langDefs/os.lang[`os.lang`,title="View source file"] | +| Objective C | link:./langDefs/objc.lang[`objc.lang`,title="View source file"] | | Objective Caml | link:./langDefs/ocaml.lang[`ocaml.lang`,title="View source file"] | ml mli -| Octave | link:./langDefs/octave.lang[`octave.lang`,title="View source file"] | -| OpenObjectRexx | link:./langDefs/oorexx.lang[`oorexx.lang`,title="View source file"] | -| OpenSCAD | link:./langDefs/scad.lang[`scad.lang`,title="View source file"] | -| Oz | link:./langDefs/oz.lang[`oz.lang`,title="View source file"] | +| Octave | link:./langDefs/octave.lang[`octave.lang`,title="View source file"] | +| OpenObjectRexx | link:./langDefs/oorexx.lang[`oorexx.lang`,title="View source file"] | +| OpenSCAD | link:./langDefs/scad.lang[`scad.lang`,title="View source file"] | +| Oz | link:./langDefs/oz.lang[`oz.lang`,title="View source file"] | | Paradox | link:./langDefs/paradox.lang[`paradox.lang`,title="View source file"] | sc -| Pascal | link:./langDefs/pas.lang[`pas.lang`,title="View source file"] | -| PATROL | link:./langDefs/psl.lang[`psl.lang`,title="View source file"] | +| Pascal | link:./langDefs/pas.lang[`pas.lang`,title="View source file"] | +| PATROL | link:./langDefs/psl.lang[`psl.lang`,title="View source file"] | | Perl | link:./langDefs/perl.lang[`perl.lang`,title="View source file"] | cgi perl pl plex plx pm | PHP | link:./langDefs/php.lang[`php.lang`,title="View source file"] | php3 php4 php5 php6 | Pike | link:./langDefs/pike.lang[`pike.lang`,title="View source file"] | pmod | PL/1 | link:./langDefs/pl1.lang[`pl1.lang`,title="View source file"] | bdy ff fp fpp rpp sf sp spb spe spp sps wf wp wpb wpp wps -| PL/Perl | link:./langDefs/plperl.lang[`plperl.lang`,title="View source file"] | -| PL/Python | link:./langDefs/plpython.lang[`plpython.lang`,title="View source file"] | -| PL/SQL | link:./langDefs/sql.lang[`sql.lang`,title="View source file"] | -| PL/Tcl | link:./langDefs/pltcl.lang[`pltcl.lang`,title="View source file"] | +| PL/Perl | link:./langDefs/plperl.lang[`plperl.lang`,title="View source file"] | +| PL/Python | link:./langDefs/plpython.lang[`plpython.lang`,title="View source file"] | +| PL/SQL | link:./langDefs/sql.lang[`sql.lang`,title="View source file"] | +| PL/Tcl | link:./langDefs/pltcl.lang[`pltcl.lang`,title="View source file"] | | Plain text | link:./langDefs/txt.lang[`txt.lang`,title="View source file"] | text -| PO translation | link:./langDefs/po.lang[`po.lang`,title="View source file"] | +| PO translation | link:./langDefs/po.lang[`po.lang`,title="View source file"] | | Polygen | link:./langDefs/polygen.lang[`polygen.lang`,title="View source file"] | grm -| Pony | link:./langDefs/pony.lang[`pony.lang`,title="View source file"] | -| Portable Document Format | link:./langDefs/pdf.lang[`pdf.lang`,title="View source file"] | -| PostScript | link:./langDefs/ps.lang[`ps.lang`,title="View source file"] | -| POV-Ray | link:./langDefs/pov.lang[`pov.lang`,title="View source file"] | -| PowerPC Assembler | link:./langDefs/s.lang[`s.lang`,title="View source file"] | +| Pony | link:./langDefs/pony.lang[`pony.lang`,title="View source file"] | +| Portable Document Format | link:./langDefs/pdf.lang[`pdf.lang`,title="View source file"] | +| PostScript | link:./langDefs/ps.lang[`ps.lang`,title="View source file"] | +| POV-Ray | link:./langDefs/pov.lang[`pov.lang`,title="View source file"] | +| PowerPC Assembler | link:./langDefs/s.lang[`s.lang`,title="View source file"] | | Progress | link:./langDefs/progress.lang[`progress.lang`,title="View source file"] | p w | Prolog | link:./langDefs/pro.lang[`pro.lang`,title="View source file"] | pro -| Pure | link:./langDefs/pure.lang[`pure.lang`,title="View source file"] | +| Pure | link:./langDefs/pure.lang[`pure.lang`,title="View source file"] | | PureBASIC | link:./langDefs/purebasic.lang[`purebasic.lang`,title="View source file"] | pb pbf pbi | Pyrex | link:./langDefs/pyrex.lang[`pyrex.lang`,title="View source file"] | pyx | Python | link:./langDefs/python.lang[`python.lang`,title="View source file"] | py -| QMake Project | link:./langDefs/qmake.lang[`qmake.lang`,title="View source file"] | -| QML | link:./langDefs/qml.lang[`qml.lang`,title="View source file"] | -| Qore | link:./langDefs/q.lang[`q.lang`,title="View source file"] | -| Qu | link:./langDefs/qu.lang[`qu.lang`,title="View source file"] | -| R | link:./langDefs/r.lang[`r.lang`,title="View source file"] | -| Rebol | link:./langDefs/rebol.lang[`rebol.lang`,title="View source file"] | -| Relax NG | link:./langDefs/rnc.lang[`rnc.lang`,title="View source file"] | +| QMake Project | link:./langDefs/qmake.lang[`qmake.lang`,title="View source file"] | +| QML | link:./langDefs/qml.lang[`qml.lang`,title="View source file"] | +| Qore | link:./langDefs/q.lang[`q.lang`,title="View source file"] | +| Qu | link:./langDefs/qu.lang[`qu.lang`,title="View source file"] | +| R | link:./langDefs/r.lang[`r.lang`,title="View source file"] | +| Rebol | link:./langDefs/rebol.lang[`rebol.lang`,title="View source file"] | +| Relax NG | link:./langDefs/rnc.lang[`rnc.lang`,title="View source file"] | | Rexx | link:./langDefs/rexx.lang[`rexx.lang`,title="View source file"] | rex rx the -| RPG | link:./langDefs/rpg.lang[`rpg.lang`,title="View source file"] | -| RPL Programming Language | link:./langDefs/rpl.lang[`rpl.lang`,title="View source file"] | -| RPM Spec | link:./langDefs/spec.lang[`spec.lang`,title="View source file"] | +| RPG | link:./langDefs/rpg.lang[`rpg.lang`,title="View source file"] | +| RPL Programming Language | link:./langDefs/rpl.lang[`rpl.lang`,title="View source file"] | +| RPM Spec | link:./langDefs/spec.lang[`spec.lang`,title="View source file"] | | Ruby | link:./langDefs/ruby.lang[`ruby.lang`,title="View source file"] | gemfile pp rakefile rb rjs ruby -| Rust | link:./langDefs/rs.lang[`rs.lang`,title="View source file"] | -| SAS | link:./langDefs/sas.lang[`sas.lang`,title="View source file"] | -| SASS/SCSS | link:./langDefs/scss.lang[`scss.lang`,title="View source file"] | -| Scala | link:./langDefs/scala.lang[`scala.lang`,title="View source file"] | +| Rust | link:./langDefs/rs.lang[`rs.lang`,title="View source file"] | +| SAS | link:./langDefs/sas.lang[`sas.lang`,title="View source file"] | +| SASS/SCSS | link:./langDefs/scss.lang[`scss.lang`,title="View source file"] | +| Scala | link:./langDefs/scala.lang[`scala.lang`,title="View source file"] | | Scilab | link:./langDefs/scilab.lang[`scilab.lang`,title="View source file"] | sce sci -| Slim (experimental) | link:./langDefs/slim.lang[`slim.lang`,title="View source file"] | +| Slim (experimental) | link:./langDefs/slim.lang[`slim.lang`,title="View source file"] | | SMALL | link:./langDefs/small.lang[`small.lang`,title="View source file"] | sma | Smalltalk | link:./langDefs/smalltalk.lang[`smalltalk.lang`,title="View source file"] | gst sq st | SNMP | link:./langDefs/snmp.lang[`snmp.lang`,title="View source file"] | mib smi | SNOBOL | link:./langDefs/snobol.lang[`snobol.lang`,title="View source file"] | sno | Solidity | link:./langDefs/solidity.lang[`solidity.lang`,title="View source file"] | sol -| SPIN SQL | link:./langDefs/spn.lang[`spn.lang`,title="View source file"] | +| SPIN SQL | link:./langDefs/spn.lang[`spn.lang`,title="View source file"] | | Squirrel | link:./langDefs/squirrel.lang[`squirrel.lang`,title="View source file"] | nut -| Standard ML | link:./langDefs/sml.lang[`sml.lang`,title="View source file"] | -| Stylus | link:./langDefs/styl.lang[`styl.lang`,title="View source file"] | -| SuperX++ | link:./langDefs/xpp.lang[`xpp.lang`,title="View source file"] | -| SVG | link:./langDefs/svg.lang[`svg.lang`,title="View source file"] | -| Swift | link:./langDefs/swift.lang[`swift.lang`,title="View source file"] | -| Sybase SQL | link:./langDefs/sybase.lang[`sybase.lang`,title="View source file"] | +| Standard ML | link:./langDefs/sml.lang[`sml.lang`,title="View source file"] | +| Stylus | link:./langDefs/styl.lang[`styl.lang`,title="View source file"] | +| SuperX++ | link:./langDefs/xpp.lang[`xpp.lang`,title="View source file"] | +| SVG | link:./langDefs/svg.lang[`svg.lang`,title="View source file"] | +| Swift | link:./langDefs/swift.lang[`swift.lang`,title="View source file"] | +| Sybase SQL | link:./langDefs/sybase.lang[`sybase.lang`,title="View source file"] | | Tcl/Tk | link:./langDefs/tcl.lang[`tcl.lang`,title="View source file"] | itcl wish -| TCSH | link:./langDefs/tcsh.lang[`tcsh.lang`,title="View source file"] | -| Terraform | link:./langDefs/terraform.lang[`terraform.lang`,title="View source file"] | +| TCSH | link:./langDefs/tcsh.lang[`tcsh.lang`,title="View source file"] | +| Terraform | link:./langDefs/terraform.lang[`terraform.lang`,title="View source file"] | | TeX and LaTeX | link:./langDefs/tex.lang[`tex.lang`,title="View source file"] | cls sty -| TOML | link:./langDefs/toml.lang[`toml.lang`,title="View source file"] | -| Transact-SQL | link:./langDefs/tsql.lang[`tsql.lang`,title="View source file"] | -| TSX (TypeScript with React) | link:./langDefs/tsx.lang[`tsx.lang`,title="View source file"] | -| TTCN3 | link:./langDefs/ttcn3.lang[`ttcn3.lang`,title="View source file"] | -| TypeScript | link:./langDefs/ts.lang[`ts.lang`,title="View source file"] | -| UPC (and C, technically) | link:./langDefs/upc.lang[`upc.lang`,title="View source file"] | -| Vala | link:./langDefs/vala.lang[`vala.lang`,title="View source file"] | +| TOML | link:./langDefs/toml.lang[`toml.lang`,title="View source file"] | +| Transact-SQL | link:./langDefs/tsql.lang[`tsql.lang`,title="View source file"] | +| TSX (TypeScript with React) | link:./langDefs/tsx.lang[`tsx.lang`,title="View source file"] | +| TTCN3 | link:./langDefs/ttcn3.lang[`ttcn3.lang`,title="View source file"] | +| TypeScript | link:./langDefs/ts.lang[`ts.lang`,title="View source file"] | +| UPC (and C, technically) | link:./langDefs/upc.lang[`upc.lang`,title="View source file"] | +| Vala | link:./langDefs/vala.lang[`vala.lang`,title="View source file"] | | Verilog | link:./langDefs/verilog.lang[`verilog.lang`,title="View source file"] | v -| VHDL | link:./langDefs/vhd.lang[`vhd.lang`,title="View source file"] | +| VHDL | link:./langDefs/vhd.lang[`vhd.lang`,title="View source file"] | | vimscript | link:./langDefs/vimscript.lang[`vimscript.lang`,title="View source file"] | vim vimrc | Visual Basic | link:./langDefs/vb.lang[`vb.lang`,title="View source file"] | bas basic bi vbs -| vue.js (beta) | link:./langDefs/vue.lang[`vue.lang`,title="View source file"] | -| Whiley | link:./langDefs/whiley.lang[`whiley.lang`,title="View source file"] | +| vue.js (beta) | link:./langDefs/vue.lang[`vue.lang`,title="View source file"] | +| Whiley | link:./langDefs/whiley.lang[`whiley.lang`,title="View source file"] | | XML | link:./langDefs/xml.lang[`xml.lang`,title="View source file"] | csproj dtd ecf ent glade hdr hub jnlp nrm resx sgm sgml tld vxml wml xsd xsl -| Yaiff | link:./langDefs/yaiff.lang[`yaiff.lang`,title="View source file"] | -| Yang | link:./langDefs/yang.lang[`yang.lang`,title="View source file"] | -| Zonnon | link:./langDefs/znn.lang[`znn.lang`,title="View source file"] | +| Yaiff | link:./langDefs/yaiff.lang[`yaiff.lang`,title="View source file"] | +| Yang | link:./langDefs/yang.lang[`yang.lang`,title="View source file"] | +| Zonnon | link:./langDefs/znn.lang[`znn.lang`,title="View source file"] | |========================================== [NOTE] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/README_TESTCASES.adoc new/highlight-3.52/README_TESTCASES.adoc --- old/highlight-3.51/README_TESTCASES.adoc 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/README_TESTCASES.adoc 2019-05-28 20:47:06.000000000 +0200 @@ -1,6 +1,6 @@ = HIGHLIGHT TESTCASES MANUAL André Simon -v3.47, October 2018 +v3.52, May 2019 :lang: en :icons: font :toc: left @@ -68,6 +68,8 @@ A test will succeed at a position with whitespace if the enclosing state is matched or if `ws` is tested specifically. +Starting with release 3.52, you can negate the state with a leading `~`. + === Example diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/filetypes.conf new/highlight-3.52/filetypes.conf --- old/highlight-3.51/filetypes.conf 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/filetypes.conf 2019-05-28 20:47:06.000000000 +0200 @@ -55,6 +55,7 @@ { Lang="gambas", Extensions={"class"} }, { Lang="gdscript", Extensions={"gd"} }, { Lang="haskell", Extensions={"hs"} }, + { Lang="hugo", Extensions={"hug"} }, { Lang="ini", Extensions={"doxyfile", "desktop", "kdev3"} }, { Lang="java", Extensions={"groovy", "grv", "jenkinsfile", "gradle"} }, { Lang="julia", Extensions={"jl"} }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/gui_files/ext/fileopenfilter.conf new/highlight-3.52/gui_files/ext/fileopenfilter.conf --- old/highlight-3.51/gui_files/ext/fileopenfilter.conf 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/gui_files/ext/fileopenfilter.conf 2019-05-28 20:47:06.000000000 +0200 @@ -87,6 +87,7 @@ Hecl (*.hcl) HTML (*.html *.htm *.xhtml) Httpd (*.httpd) +Hugo (*.hug) Icon (*.icn) IDL (*.idl) Informix (*.4gl) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/langDefs/hugo.lang new/highlight-3.52/langDefs/hugo.lang --- old/highlight-3.51/langDefs/hugo.lang 1970-01-01 01:00:00.000000000 +0100 +++ new/highlight-3.52/langDefs/hugo.lang 2019-05-28 20:47:06.000000000 +0200 @@ -0,0 +1,155 @@ +-- ******************************** +-- * Hugo Interactive Fiction * v1.0.0 || by Tristano Ajmone: +-- * www.generalcoffee.com/hugo * 2019/05/24 || https://github.com/tajmone +-- ******************************** public domain || http://unlicense.org +-------------------------------------------------------------------------------- +-- Syntax definition for Hugo language v3.1.03 (2006). +-- http://www.generalcoffee.com/hugo/gethugo.html + +-- The Hugo Interactive Fiction Development System (1995-2006) is a language and +-- a set of cross-platform tools for creating text-adventures with sound and +-- graphics, developed by Kent Tessman for The General Coffee Company Film +-- Productions, released under BSD-2-Clause License. +-------------------------------------------------------------------------------- +-- file extensions: +-- .hug -- adventure source +-- .h -- library source +-- .g -- grammar source +-------------------------------------------------------------------------------- +Description = "Hugo" Categories = {"source", "interactive fiction"} +IgnoreCase = true EnableIndentation = false +-------------------------------------------------------------------------------- +Identifiers = [[ [\$]?[a-zA-Z_]\w*[#\$]? ]] +Comments = {{ + Block = true, + Nested = false, + Delimiter = { [[ ^(?:\s*)!\\ ]], + [[ \\!$ ]]}},{ + Block = false, + Delimiter = { [[ (?<!\\)!(?!\\) ]]}}} +Strings = { + Delimiter = [=[ (?<!\\)" ]=], + AssertEqualLength = true, +--[[---------------------------------------------------------------------------- + ESCAPE SEQUENCES +-------------------------------------------------------------------------------- +Hugo allows various escape sequences inside strings, some of them have been +defined as Interpolation for visual improvement. + +Basic escapes: + \" quotation marks + \\ a literal backslash character + \_ a forced space, overriding left-justification for the rest of the string + \n a newline + +Formatting sequences for styles: + \B boldface on + \b boldface off + \I italics on + \i italics off + \P proportional printing on + \p proportional printing off + \U underlining on + \u underlining off + +ASCII Escapes: + \#xxx any ASCII or Latin-1 character where xxx represents the three-digit + ASCII number (or Latin-1 code). --]] + Escape = [=[ (\\(?:["\\_nBbIiPpUu]|#\d{3})) ]=], +--[[---------------------------------------------------------------------------- + INTERPOLATIONP +-------------------------------------------------------------------------------- +We define the special char sequences as Interpolation to allow visual separation +between them and the other escape sequences, which will make the code easier to +read since in real-code the prose strings might contain many of both in a same +string, side by side. + +Special characters formatting sequences (ISO-8859-1): + \` accent grave followed by a letter (e.g. "\`a" -> "à") + \’ accent acute followed by a letter (e.g. "\’E" -> "É") + \~ tilde followed by a letter (e.g. "\~n" -> "ñ") + \^ circumflex followed by a letter (e.g. "\^i" -> "î") + \: umlaut followed by a letter (e.g. "\:u" -> "ü") + \, cedilla followed by c or C (e.g. "\,c" -> "ç") + \< or \> Spanish quotation marks (« ») + \! upside-down exclamation point (¡) + \? upside-down question mark (¿) + \ae ae ligature (æ) + \AE AE ligature (Æ) + \c cents symbol (¢) + \L British pound (£) + \Y Japanese Yen (¥) + +NOTE: The RegEx below defines twice the acute accent (´) char because depending + on wether the source is in ASCII/ISO-8859-1 or UTF-8 its encoding will + differ (the former is the expected encoding for Hugo sourceS, but the + latter might be encountered in documentation projects). --]] + Interpolation = [=[ (?x)(\\(?: + \xC2\xB4[a-zA-Z] | # Acute accent (´) in UTF-8 docs will be $c2 $b4. + [`´~\^:][a-zA-Z] | # Note: acute accent in ASCII format also found here. + ,[cC] | # Cedilla. + [<>!?] | # Square brackets and upside-down ¡ ¿ marks. + ae|AE | # Æ ligatures. + [cLY] # Currencies: ¢ £ ¥. + )) ]=] } +PreProcessor = { + Prefix = [[ # ]], + Continuation = "\\" } +Operators = [[ \&|<|>|\||\=|\/|\*|\+|\-|~ ]] +Digits = [[ \d+ ]] +Keywords = {{ + ------------------------------------------------------------------------------ + Id = 1, List = { -- Hugo keywords # 1 + ------------------------------------------------------------------------------ + "addcontext", "and", "anything", "array", "arraydata#", "attr#", "break", + "call", "capital", "case", "child", "children", "cls", "color", "colour", + "debugdata#", "dict", "dictentry#", "do", "elder", "eldest", "else", + "elseif", "eol#", "false", "for", "graphics", "held", "hex", "if", "in", + "input", "is", "jump", "label#", "local", "locate", "move", "multi", + "multiheld", "multinotheld", "music", "newline", "not", "notheld", "number", + "object", "objectnum#", "or", "parent", "parse$", "pause", "picture", + "playback", "print", "printchar", "prop#", "quit", "random", "readfile", + "readval", "recordoff", "recordon", "remove", "repeat", "restart", "restore", + "return", "routine#", "run", "runevents", "save", "scriptoff", "scripton", + "select", "serial$", "sibling", "sound", "string", "stringdata#", "system", + "text", "textdata#", "to", "true", "undo", "value#", "var#", "verb", "video", + "while", "window", "word", "writefile", "writeval", "xobject", "xverb", + "younger", "youngest" }},{ + ------------------------------------------------------------------------------ + Id = 2, -- ASCII Chars constants # 2 + ------------------------------------------------------------------------------ + Regex = [=[ '[\x00-\x7F]' ]=] },{ + ------------------------------------------------------------------------------ + Id = 3, -- Limit Settings # 3 + ------------------------------------------------------------------------------ + Regex = [=[ (?x-i) + (\$MAX(?: + ATTRIBUTES|GLOBALS|LOCALS|ALIASES|ARRAYS|CONSTANTS|DICTEXTEND|DICT| + DIRECTORIES|EVENTS|FLAGS|LABELS|OBJECTS|PROPERTIES|ROUTINES|SPECIALWORDS + )) ]=], + Group = 0 + }} +function OnStateChange(oldState, newState, token, kwgroup) --[[ + ============================================================================== + #01 -- Ignore Escape Sequences Outside Strings + ============================================================================== + This function ensures that escape sequences outside strings are ignored: + tokens matching an escape sequence are rejected if the previously parsed token + was not a string, an interpolation or another escape sequence. + + Based on André Simon's reply to Issue #23: + https://github.com/andre-simon/highlight/issues/23#issuecomment-332002639 + ----------------------------------------------------------------------------]] + if newState == HL_ESC_SEQ and + oldState ~= HL_STRING and + oldState ~= HL_ESC_SEQ and + oldState ~= HL_INTERPOLATION then + return HL_REJECT + end + return newState +end +--[[============================================================================ + CHANGELOG +================================================================================ +v1.0.0 (2019/05/24) | Highlight v3.51 + - First release. --]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/src/ci_test.sh new/highlight-3.52/src/ci_test.sh --- old/highlight-3.51/src/ci_test.sh 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/src/ci_test.sh 2019-05-28 20:47:06.000000000 +0200 @@ -62,6 +62,78 @@ exit 1 fi +${HL_BIN} ${TEST_DIR}/exapunks/syntax_test_macros.exa +if [ $? -eq 0 ]; then + echo "exapunks test #1 OK" +else + echo "exapunks test #1 FAILED" + exit 1 +fi +${HL_BIN} ${TEST_DIR}/exapunks/syntax_test_labels.exa +if [ $? -eq 0 ]; then + echo "exapunks test #2 OK" +else + echo "exapunks test #2 FAILED" + exit 1 +fi +${HL_BIN} ${TEST_DIR}/exapunks/syntax_test_numbers.exa +if [ $? -eq 0 ]; then + echo "exapunks test #3 OK" +else + echo "exapunks test #3 FAILED" + exit 1 +fi +${HL_BIN} ${TEST_DIR}/exapunks/syntax_test_registers.exa +if [ $? -eq 0 ]; then + echo "exapunks test #4 OK" +else + echo "exapunks test #4 FAILED" + exit 1 +fi +${HL_BIN} ${TEST_DIR}/exapunks/syntax_test_comments.exa +if [ $? -eq 0 ]; then + echo "exapunks test #5 OK" +else + echo "exapunks test #5 FAILED" + exit 1 +fi + +${HL_BIN} ${TEST_DIR}/hugo/syntax_test_comments.hug +if [ $? -eq 0 ]; then + echo "hugo test #1 OK" +else + echo "hugo test #1 FAILED" + exit 1 +fi +${HL_BIN} ${TEST_DIR}/hugo/syntax_test_keywords.hug +if [ $? -eq 0 ]; then + echo "hugo test #2 OK" +else + echo "hugo test #2 FAILED" + exit 1 +fi +${HL_BIN} ${TEST_DIR}/hugo/syntax_test_strings.hug +if [ $? -eq 0 ]; then + echo "hugo test #3 OK" +else + echo "hugo test #3 FAILED" + exit 1 +fi +${HL_BIN} ${TEST_DIR}/hugo/syntax_test_chars.hug +if [ $? -eq 0 ]; then + echo "hugo test #4 OK" +else + echo "hugo test #4 FAILED" + exit 1 +fi +${HL_BIN} ${TEST_DIR}/hugo/syntax_test_compiler-directives.hug +if [ $? -eq 0 ]; then + echo "hugo test #5 OK" +else + echo "hugo test #5 FAILED" + exit 1 +fi + echo '#!/usr/bin/perl' | ${HL_BIN} --verbose 2>&1 >/dev/null | grep 'Description: Perl' if [ $? -eq 0 ]; then echo "stdin shebang test #1 OK" @@ -78,6 +150,14 @@ exit 1 fi +echo 'ENFORCER' | ${HL_BIN} --force --fragment -O html | grep 'ENFORCER' +if [ $? -eq 0 ]; then + echo "force option test #1 OK" +else + echo "force option test #1 FAILED" + exit 1 +fi + #if [ "$OUTPUT" == "BEGIN ... END" ]; then # echo "Output is correct, OK" #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/src/core/codegenerator.cpp new/highlight-3.52/src/core/codegenerator.cpp --- old/highlight-3.51/src/core/codegenerator.cpp 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/src/core/codegenerator.cpp 2019-05-28 20:47:06.000000000 +0200 @@ -2360,11 +2360,22 @@ unsigned int assertGroup=0; size_t typeDescPos=line.find_first_not_of("\t ^", lineIndex); State assertState=_UNKNOWN; - + bool negation=false; + bool testFailed=false; + + ostringstream errMsg; + string prefix; //printTrace("trace 2"); if (typeDescPos!=string::npos) { + if (line[typeDescPos]=='~') { + + negation=true; + prefix="~"; + ++typeDescPos; + } + if (line.find(STY_NAME_NUM, typeDescPos)==typeDescPos) assertState=NUMBER; else if (line.find(STY_NAME_STR, typeDescPos)==typeDescPos) @@ -2394,14 +2405,26 @@ assertGroup=line[typeDescPos+2] - 'a' +1; } - if ( (assertState!=_WS && stateTraceTest[column].state != assertState && !stateTraceTest[column].isWhiteSpace ) + if ( (assertState!=_WS && stateTraceTest[column].state != assertState && !stateTraceTest[column].isWhiteSpace ) || (assertState==_WS && !stateTraceTest[column].isWhiteSpace) || assertGroup != stateTraceTest[column].kwClass) { - ostringstream err; - err << inFile << " line " << lineNumber << ", column "<< column - << ": got " << getTestcaseName(stateTraceTest[column].state, stateTraceTest[column].kwClass) - << " instead of " << getTestcaseName(assertState, assertGroup); - failedPosTests.push_back(err.str()); + + testFailed=!negation; + + } else if (negation ) { + + //TODO Fix ~ws + if (assertState!=_WS && !stateTraceTest[column].isWhiteSpace ) + testFailed=true; + + } + + if (testFailed) { + errMsg << inFile << " line " << lineNumber << ", column "<< column + << ": got " << getTestcaseName(stateTraceTest[column].state, stateTraceTest[column].kwClass) + << " instead of " << prefix << getTestcaseName(assertState, assertGroup); + + failedPosTests.push_back(errMsg.str()); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/src/core/datadir.cpp new/highlight-3.52/src/core/datadir.cpp --- old/highlight-3.51/src/core/datadir.cpp 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/src/core/datadir.cpp 2019-05-28 20:47:06.000000000 +0200 @@ -241,7 +241,6 @@ // This copies all the data to a new buffer, uses the data to get the // first line, then makes cin use the new buffer that underlies the // stringstream instance - stringstream cin_bufcopy; cin_bufcopy << cin.rdbuf(); getline ( cin_bufcopy, firstLine ); cin_bufcopy.seekg ( 0, ios::beg ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/src/gui-qt/mainwindow.cpp new/highlight-3.52/src/gui-qt/mainwindow.cpp --- old/highlight-3.51/src/gui-qt/mainwindow.cpp 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/src/gui-qt/mainwindow.cpp 2019-05-28 20:47:06.000000000 +0200 @@ -866,6 +866,10 @@ themePath=getDistThemePath(); } +#ifdef Q_OS_WIN + themePath = getWindowsShortPath(themePath); +#endif + for (int i=0; i<ui->lvPluginScripts->count(); i++) { if (ui->lvPluginScripts->item(i)->checkState()==Qt::Checked) { if (!generator->initPluginScript(ui->lvPluginScripts->item(i)->data(Qt::UserRole).toString().toStdString()) ) { @@ -1015,6 +1019,10 @@ langDefPath = (userLangPath.isEmpty()) ? getDistLangPath(getFileType(getFileSuffix(currentFile), currentFile)) : userLangPath; +#ifdef Q_OS_WIN + langDefPath = getWindowsShortPath(langDefPath); +#endif + loadRes=generator->loadLanguage(langDefPath.toStdString()); if (loadRes==highlight::LOAD_FAILED_REGEX) { QMessageBox::warning(this, tr("Language definition error"), @@ -1242,6 +1250,10 @@ langPath = getDistLangPath(suffix); } +#ifdef Q_OS_WIN + langPath = getWindowsShortPath(langPath); +#endif + if ( generator->loadLanguage(langPath.toStdString()) != highlight::LOAD_FAILED) { QString clipBoardData; if (getDataFromCP) { @@ -1393,6 +1405,10 @@ langInfo=""; langPath = getDistLangPath(suffix); } + +#ifdef Q_OS_WIN + langPath = getWindowsShortPath(langPath); +#endif QString themePath = getUserScriptPath("theme"); QString themeInfo=tr("(user script)"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/src/gui-qt/mainwindow.ui new/highlight-3.52/src/gui-qt/mainwindow.ui --- old/highlight-3.51/src/gui-qt/mainwindow.ui 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/src/gui-qt/mainwindow.ui 2019-05-28 20:47:06.000000000 +0200 @@ -778,7 +778,7 @@ <enum>QTabWidget::Rounded</enum> </property> <property name="currentIndex"> - <number>0</number> + <number>2</number> </property> <property name="movable"> <bool>false</bool> @@ -2353,9 +2353,12 @@ <property name="toolTip"> <string>Select or enter the font name. HTML supports a list of fonts, separated with comma.</string> </property> + <property name="fontFilters"> + <set>QFontComboBox::MonospacedFonts</set> + </property> <property name="currentFont"> <font> - <family>DejaVu Sans</family> + <family>cursor.pcf</family> </font> </property> </widget> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/src/include/datadir.h new/highlight-3.52/src/include/datadir.h --- old/highlight-3.51/src/include/datadir.h 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/src/include/datadir.h 2019-05-28 20:47:06.000000000 +0200 @@ -60,6 +60,9 @@ void readLuaList(const string& paramName, const string& langName,Diluculum::LuaValue &luaVal, StringMap* extMap); + // object needs to life until cin is no longer used + stringstream cin_bufcopy; + public: StringMap assocByExtension, assocByFilename, assocByShebang; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/src/include/version.h new/highlight-3.52/src/include/version.h --- old/highlight-3.51/src/include/version.h 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/src/include/version.h 2019-05-28 20:47:06.000000000 +0200 @@ -28,7 +28,7 @@ #ifndef VERSION_H #define VERSION_H -#define HIGHLIGHT_VERSION "3.51" +#define HIGHLIGHT_VERSION "3.52" #define HIGHLIGHT_URL "http://www.andre-simon.de/" #define HIGHLIGHT_EMAIL "a.si...@mailbox.org" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/src/makefile new/highlight-3.52/src/makefile --- old/highlight-3.51/src/makefile 2019-05-17 21:04:13.000000000 +0200 +++ new/highlight-3.52/src/makefile 2019-05-28 20:47:06.000000000 +0200 @@ -20,11 +20,11 @@ # Added -std=c++11 because of auto_ptr to unique_ptr transition CFLAGS:=-Wall -O2 ${CFLAGS} -DNDEBUG -std=c++11 -#CFLAGS:=-ggdb ${CFLAGS} -std=c++11 +#CFLAGS:=-ggdb -O0 ${CFLAGS} -std=c++11 CFLAGS_DILU=-fno-strict-aliasing -SO_VERSION=3.51 +SO_VERSION=3.52 # Source paths CORE_DIR=./core/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/themes/duotone-dark-earth.theme new/highlight-3.52/themes/duotone-dark-earth.theme --- old/highlight-3.51/themes/duotone-dark-earth.theme 1970-01-01 01:00:00.000000000 +0100 +++ new/highlight-3.52/themes/duotone-dark-earth.theme 2019-05-28 20:47:06.000000000 +0200 @@ -0,0 +1,66 @@ +--[[ 2019/05/26 | Highlight v3.51 | Lua 5.3 +================================================================================ +Scheme: "DuoTone Dark Earth" +Author: simurai +License: MIT License +Source: https://github.com/simurai/duotone-dark-earth-syntax +================================================================================ +Ported to Highlight by Tristano Ajmone <tajm...@gmail.com> + https://github.com/tajmone + https://gitlab.com/tajmone +-------------------------------------------------------------------------------- +Based on the DuoTone Themes project by simurai: + http://simurai.com/projects/2016/01/01/duotone-themes +------------------------------------------------------------------------------]] +Description = "DuoTone Dark Earth" +Categories = {"dark", "duotone"} +-------------------------------------------------------------------------------- +Canvas = { Colour = "#2c2826" } +Default = { Colour = "#bd987f" } +LineNum = { Colour = "#564b43" } + +Number = { Colour = "#fecb52" } +Operator = { Colour = "#ffdac2" } + +String = { Colour = "#b09045" } +Escape = { Colour = "#ffdac2" } +Interpolation = { Colour = "#fecb52" } + +PreProcessor = { Colour = "#98755d" } +StringPreProc = String + +LineComment = { Colour = "#705e51", Italic = true } +BlockComment = LineComment + +Keywords = { + { Colour = "#ffdac2" }, --> kwd 1 + { Colour = "#fecb52" }, --> kwd 2 + { Colour = "#bd987f" }, --> kwd 3 + { Colour = "#b09045" }, --> kwd 4 + { Colour = "#98755d" }, --> kwd 5 + { Colour = "#726546" }, --> kwd 6 +} +--[[---------------------------------------------------------------------------- +The MIT License + +Copyright (c) 2018 Tristano Ajmone +Copyright (c) 2015 simurai + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/themes/duotone-dark-forest.theme new/highlight-3.52/themes/duotone-dark-forest.theme --- old/highlight-3.51/themes/duotone-dark-forest.theme 1970-01-01 01:00:00.000000000 +0100 +++ new/highlight-3.52/themes/duotone-dark-forest.theme 2019-05-28 20:47:06.000000000 +0200 @@ -0,0 +1,66 @@ +--[[ 2019/05/26 | Highlight v3.51 | Lua 5.3 +================================================================================ +Scheme: "DuoTone Dark Forest" +Author: simurai +License: MIT License +Source: https://github.com/simurai/duotone-dark-forest-syntax +================================================================================ +Ported to Highlight by Tristano Ajmone <tajm...@gmail.com> + https://github.com/tajmone + https://gitlab.com/tajmone +-------------------------------------------------------------------------------- +Based on the DuoTone Themes project by simurai: + http://simurai.com/projects/2016/01/01/duotone-themes +------------------------------------------------------------------------------]] +Description = "DuoTone Dark Forest" +Categories = {"dark", "duotone"} +-------------------------------------------------------------------------------- +Canvas = { Colour = "#2a2d2a" } +Default = { Colour = "#a9bca9" } +LineNum = { Colour = "#585f58" } + +Number = { Colour = "#e7f98b" } +Operator = { Colour = "#ddf8dd" } + +String = { Colour = "#99a659" } +Escape = { Colour = "#ddf8dd" } +Interpolation = { Colour = "#e7f98b" } + +PreProcessor = { Colour = "#869886" } +StringPreProc = String + +LineComment = { Colour = "#738273", Italic = true } +BlockComment = LineComment + +Keywords = { + { Colour = "#ddf8dd" }, --> kwd 1 + { Colour = "#e7f98b" }, --> kwd 2 + { Colour = "#a9bca9" }, --> kwd 3 + { Colour = "#99a659" }, --> kwd 4 + { Colour = "#869886" }, --> kwd 5 + { Colour = "#747a52" }, --> kwd 6 +} +--[[---------------------------------------------------------------------------- +The MIT License + +Copyright (c) 2018 Tristano Ajmone +Copyright (c) 2015 simurai + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/themes/duotone-dark-sea.theme new/highlight-3.52/themes/duotone-dark-sea.theme --- old/highlight-3.51/themes/duotone-dark-sea.theme 1970-01-01 01:00:00.000000000 +0100 +++ new/highlight-3.52/themes/duotone-dark-sea.theme 2019-05-28 20:47:06.000000000 +0200 @@ -0,0 +1,66 @@ +--[[ 2019/05/26 | Highlight v3.51 | Lua 5.3 +================================================================================ +Scheme: "DuoTone Dark Sea" +Author: simurai +License: MIT License +Source: https://github.com/simurai/duotone-dark-sea-syntax +================================================================================ +Ported to Highlight by Tristano Ajmone <tajm...@gmail.com> + https://github.com/tajmone + https://gitlab.com/tajmone +-------------------------------------------------------------------------------- +Based on the DuoTone Themes project by simurai: + http://simurai.com/projects/2016/01/01/duotone-themes +------------------------------------------------------------------------------]] +Description = "DuoTone Dark Sea" +Categories = {"dark", "duotone"} +-------------------------------------------------------------------------------- +Canvas = { Colour = "#1d262f" } +Default = { Colour = "#88b4e7" } +LineNum = { Colour = "#444c55" } + +Number = { Colour = "#34febb" } +Operator = { Colour = "#d6e9ff" } + +String = { Colour = "#32ae85" } +Escape = { Colour = "#d6e9ff" } +Interpolation = { Colour = "#34febb" } + +PreProcessor = { Colour = "#5d8cc0" } +StringPreProc = String + +LineComment = { Colour = "#586f89", Italic = true } +BlockComment = LineComment + +Keywords = { + { Colour = "#d6e9ff" }, --> kwd 1 + { Colour = "#34febb" }, --> kwd 2 + { Colour = "#88b4e7" }, --> kwd 3 + { Colour = "#32ae85" }, --> kwd 4 + { Colour = "#5d8cc0" }, --> kwd 5 + { Colour = "#42675a" }, --> kwd 6 +} +--[[---------------------------------------------------------------------------- +The MIT License + +Copyright (c) 2018 Tristano Ajmone +Copyright (c) 2015 simurai + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/themes/duotone-dark-sky.theme new/highlight-3.52/themes/duotone-dark-sky.theme --- old/highlight-3.51/themes/duotone-dark-sky.theme 1970-01-01 01:00:00.000000000 +0100 +++ new/highlight-3.52/themes/duotone-dark-sky.theme 2019-05-28 20:47:06.000000000 +0200 @@ -0,0 +1,66 @@ +--[[ 2019/05/26 | Highlight v3.51 | Lua 5.3 +================================================================================ +Scheme: "DuoTone Dark Sky" +Author: simurai +License: MIT License +Source: https://github.com/simurai/duotone-dark-sky-syntax +================================================================================ +Ported to Highlight by Tristano Ajmone <tajm...@gmail.com> + https://github.com/tajmone + https://gitlab.com/tajmone +-------------------------------------------------------------------------------- +Based on the DuoTone Themes project by simurai: + http://simurai.com/projects/2016/01/01/duotone-themes +------------------------------------------------------------------------------]] +Description = "DuoTone Dark Sky" +Categories = {"dark", "duotone"} +-------------------------------------------------------------------------------- +Canvas = { Colour = "#2c2734" } +Default = { Colour = "#cab2fa" } +LineNum = { Colour = "#544d60" } + +Number = { Colour = "#fec38f" } +Operator = { Colour = "#f1ebff" } + +String = { Colour = "#b07745" } +Escape = { Colour = "#f1ebff" } +Interpolation = { Colour = "#fec38f" } + +PreProcessor = { Colour = "#ae91e8" } +StringPreProc = String + +LineComment = { Colour = "#715f95", Italic = true } +BlockComment = LineComment + +Keywords = { + { Colour = "#f1ebff" }, --> kwd 1 + { Colour = "#fec38f" }, --> kwd 2 + { Colour = "#cab2fa" }, --> kwd 3 + { Colour = "#b07745" }, --> kwd 4 + { Colour = "#ae91e8" }, --> kwd 5 + { Colour = "#765f4c" }, --> kwd 6 +} +--[[---------------------------------------------------------------------------- +The MIT License + +Copyright (c) 2018 Tristano Ajmone +Copyright (c) 2015 simurai + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.51/themes/duotone-dark-space.theme new/highlight-3.52/themes/duotone-dark-space.theme --- old/highlight-3.51/themes/duotone-dark-space.theme 1970-01-01 01:00:00.000000000 +0100 +++ new/highlight-3.52/themes/duotone-dark-space.theme 2019-05-28 20:47:06.000000000 +0200 @@ -0,0 +1,66 @@ +--[[ 2019/05/26 | Highlight v3.51 | Lua 5.3 +================================================================================ +Scheme: "DuoTone Dark Space" +Author: simurai +License: MIT License +Source: https://github.com/simurai/duotone-dark-space-syntax +================================================================================ +Ported to Highlight by Tristano Ajmone <tajm...@gmail.com> + https://github.com/tajmone + https://gitlab.com/tajmone +-------------------------------------------------------------------------------- +Based on the DuoTone Themes project by simurai: + http://simurai.com/projects/2016/01/01/duotone-themes +------------------------------------------------------------------------------]] +Description = "DuoTone Dark Space" +Categories = {"dark", "duotone"} +-------------------------------------------------------------------------------- +Canvas = { Colour = "#24242e" } +Default = { Colour = "#8686cb" } +LineNum = { Colour = "#49495a" } + +Number = { Colour = "#fe7734" } +Operator = { Colour = "#bebeef" } + +String = { Colour = "#b06845" } +Escape = { Colour = "#bebeef" } +Interpolation = { Colour = "#fe7734" } + +PreProcessor = { Colour = "#7272a1" } +StringPreProc = String + +LineComment = { Colour = "#5b5b7b", Italic = true } +BlockComment = LineComment + +Keywords = { + { Colour = "#bebeef" }, --> kwd 1 + { Colour = "#fe7734" }, --> kwd 2 + { Colour = "#8686cb" }, --> kwd 3 + { Colour = "#b06845" }, --> kwd 4 + { Colour = "#7272a1" }, --> kwd 5 + { Colour = "#644c40" }, --> kwd 6 +} +--[[---------------------------------------------------------------------------- +The MIT License + +Copyright (c) 2018 Tristano Ajmone +Copyright (c) 2015 simurai + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +------------------------------------------------------------------------------]]