Hello community, here is the log from the commit of package highlight for openSUSE:Factory checked in at 2018-12-27 00:24:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/highlight (Old) and /work/SRC/openSUSE:Factory/.highlight.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "highlight" Thu Dec 27 00:24:42 2018 rev:20 rq:658089 version:3.48 Changes: -------- --- /work/SRC/openSUSE:Factory/highlight/highlight.changes 2018-10-15 10:06:45.325838565 +0200 +++ /work/SRC/openSUSE:Factory/.highlight.new.28833/highlight.changes 2018-12-27 00:24:44.819890873 +0100 @@ -1,0 +2,12 @@ +Fri Dec 14 16:25:18 UTC 2018 - [email protected] + +- Update to version 3.48: + * Fixed --list-scripts abortion with Fedora default compilation + options (gl#saalen/highlight#84). + * Fixed a problem with syntax test indicators reporting wrong + states after comments. + * Improved Verilog syntax. + * Improved quoted string highlighting for Perl and Ruby. + * Detection of pkg-config's Lua version in src/makefile. + +------------------------------------------------------------------- Old: ---- highlight-3.47.tar.bz2 highlight-3.47.tar.bz2.asc New: ---- highlight-3.48.tar.bz2 highlight-3.48.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ highlight.spec ++++++ --- /var/tmp/diff_new_pack.Ea3Hno/_old 2018-12-27 00:24:45.263890510 +0100 +++ /var/tmp/diff_new_pack.Ea3Hno/_new 2018-12-27 00:24:45.263890510 +0100 @@ -18,7 +18,7 @@ %bcond_without gui Name: highlight -Version: 3.47 +Version: 3.48 Release: 0 Summary: Universal Source Code to Formatted Text Converter License: GPL-3.0-or-later ++++++ highlight-3.47.tar.bz2 -> highlight-3.48.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/.gitlab-ci.yml new/highlight-3.48/.gitlab-ci.yml --- old/highlight-3.47/.gitlab-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/highlight-3.48/.gitlab-ci.yml 2018-12-14 11:49:21.000000000 +0100 @@ -0,0 +1,20 @@ +# Specify the docker image to use (only used if using docker runners) +# See: http://doc.gitlab.com/ee/ci/docker/using_docker_images.html +image: debian:stable-slim + +# Define commands that run before each job's script +before_script: + - apt-get update + - apt-get install -y make gcc g++ libboost-dev liblua5.3-dev + +compile: + script: + - make + - make install + # Verify that our compiled app works properly with a custom "test" script + - bash ./src/ci_test.sh + + # Save the compiled output from the above for downloading via GitLab and in Gitlab 8.6 to use in future build steps + #artifacts: + # paths: + # - ansifilter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/ChangeLog.adoc new/highlight-3.48/ChangeLog.adoc --- old/highlight-3.47/ChangeLog.adoc 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/ChangeLog.adoc 2018-12-14 11:49:21.000000000 +0100 @@ -1,5 +1,15 @@ = Highlight CHANGELOG +=== highlight 3.48 + +14.12.2018 + + - fixed --list-scripts abortion with Fedora default compilation options + (https://gitlab.com/saalen/highlight/issues/84) + - fixed a problem with syntax test indicators reporting wrong states after comments + - improved Verilog syntax + - improved quoted string highlighting for Perl and Ruby + - detection of pkg-config's Lua version in src/makefile === highlight 3.47 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/README_TESTCASES.adoc new/highlight-3.48/README_TESTCASES.adoc --- old/highlight-3.47/README_TESTCASES.adoc 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/README_TESTCASES.adoc 2018-12-14 11:49:21.000000000 +0100 @@ -69,36 +69,36 @@ -------------------------------------------------------------------------------- #include <iostream> #include "myheader" -// ^ ppc ^^^^^^^^^^ pps <1> +// ^ ppc ^^^^^^^^^^ pps 1) int main() { -// ^^^^ kwd <2> +// ^^^^ kwd 2) /* comment comment comment - * < com ^ ws ^ com <3> + * < com ^ ws ^ com 3) */ int var = 0x1234; /* ^^^ std ^ ^ num */ -// ^ opt <4> +// ^ opt 4) std::cout << "whatever: " << var << "\n"; // ^^^^^^^^^^^^ str ^^opt ^^ esc return 0; - // < kwa <5> + // < kwa 5) } -------------------------------------------------------------------------------- -<1> This line contains a test for preprocessor and a preprocessor string. - The `^` indicators point at the tested string sections of the previous line. +1) This line contains a test for preprocessor and a preprocessor string. + The `^` indicators point at the tested string sections of the previous line. -<2> The keyword group `kwd` is checked (functions are highlighted as `kwd` in C syntax) +2) The keyword group `kwd` is checked (functions are highlighted as `kwd` in C syntax) -<3> The `<` points to column 0 as the comment starts there. - `ws` tests for whitespace. +3) The `<` points to column 0 as the comment starts there. + `ws` tests for whitespace. -<4> A source code line can be tested with various test comments. - Here the `opt` test looks for the operator two lines before. +4) A source code line can be tested with various test comments. + Here the `opt` test looks for the operator two lines before. -<5> `<` points at column 4, the beginning of the comment. +5) `<` points at column 4, the beginning of the comment. Running highlight with this file will not produce any additional output, as all diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/bat.lang new/highlight-3.48/langDefs/bat.lang --- old/highlight-3.47/langDefs/bat.lang 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/langDefs/bat.lang 2018-12-14 11:49:21.000000000 +0100 @@ -1,6 +1,5 @@ --- Language definition generated by lang2to3 -Description="DOS Batch" +Description="MS DOS Batch" Keywords={ { Id=1, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/diff.lang new/highlight-3.48/langDefs/diff.lang --- old/highlight-3.47/langDefs/diff.lang 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/langDefs/diff.lang 2018-12-14 11:49:21.000000000 +0100 @@ -1,15 +1,14 @@ - Description="Diff" Digits=[[ ^[\d,]*[ac]\d* ]] Keywords={ { Id=1, - Regex=[[^[+<].*]], + Regex=[[^[-<].*]], }, { Id=2, - Regex=[[^[->].*]], + Regex=[[^[+>].*]], }, { Id=3, Regex=[[^\.$]], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/lua.lang new/highlight-3.48/langDefs/lua.lang --- old/highlight-3.47/langDefs/lua.lang 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/langDefs/lua.lang 2018-12-14 11:49:21.000000000 +0100 @@ -58,4 +58,4 @@ end return newState -end \ No newline at end of file +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/perl.lang new/highlight-3.48/langDefs/perl.lang --- old/highlight-3.47/langDefs/perl.lang 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/langDefs/perl.lang 2018-12-14 11:49:21.000000000 +0100 @@ -53,7 +53,7 @@ "getprotobyname", "getprotobynumber", "getservbyname", "getservbyport", "getpwuid", "getpwnam", "getgrgid", "getgrnam", "getlogin", "getpwent", "getgrent", "gmtime", "localtime", "time", "warn", "formline", - "reset", "scalar", "prototype", "lock", "tied", "untie", "qq", "qx", "eval", "try", "constant" }, + "reset", "scalar", "prototype", "lock", "tied", "untie", "eval", "try", "constant" }, }, { Id=4, Regex=[[->([a-zA-Z0-9_]+)]], @@ -68,7 +68,7 @@ }, { Id=4, - Regex=[[q[qxwr]?\{|qw\(]] + Regex=[=[ q[qxwr]?[\[\{\(] ]=] }, } @@ -120,21 +120,26 @@ end -- fix issue in CGI.pm testcase (line 1060 ff) - if oldState~=HL_STRING then + if oldState~=HL_STRING and oldState~=HL_INTERPOLATION and oldState~=HL_ESC_SEQ then qString=0 end - if newState==HL_KEYWORD and token=="q{" then + if newState==HL_KEYWORD and (token=="q{" or token=="qq{" or token=="qw{" or token=="qx{") then qString=1 return HL_STRING end - - if newState==HL_KEYWORD and token=="qw(" then + + if newState==HL_KEYWORD and (token=="q(" or token=="qq(" or token=="qw(" or token=="qx(") then qString=2 return HL_STRING end - - if oldState==HL_STRING and qString==1 and token=="}" then + + if newState==HL_KEYWORD and (token=="q[" or token=="qq[" or token=="qw[" or token=="qx[") then + qString=3 + return HL_STRING + end + + if oldState==HL_STRING and qString==1 and token=="}" then qString=0 return HL_STRING_END end @@ -143,6 +148,11 @@ qString=0 return HL_STRING_END end + + if oldState==HL_STRING and qString==3 and token=="]" then + qString=0 + return HL_STRING_END + end return newState end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/ruby.lang new/highlight-3.48/langDefs/ruby.lang --- old/highlight-3.47/langDefs/ruby.lang 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/langDefs/ruby.lang 2018-12-14 11:49:21.000000000 +0100 @@ -50,6 +50,12 @@ DelimiterPairs= { { Open=[[%q\(]], Close=[[\)]] }, { Open=[[%Q\(]], Close=[[\)]] }, + + { Open=[[%Q\!]], Close=[[\!]] }, + { Open=[[%Q\+]], Close=[[\+]] }, + { Open=[[%Q\[]], Close=[=[ \] ]=] }, + + { Open=[[%\(]], Close=[[\)]] }, { Open=[[%x\(]], Close=[[\)]] }, { Open=[[%q\{]], Close=[[\}]] }, @@ -77,11 +83,7 @@ -- resolve issue with # which starts comments and extrapolation sequences in strings function OnStateChange(oldState, newState, token, groupID) - -- https://fossies.org/linux/misc/puppet-5.3.2.tar.gz/puppet-5.3.2/lib/puppet/indirector/hiera.rb?m=t - if token==")" or token=="}" or token=="{" and oldState~=HL_STRING then - return HL_OPERATOR - end if oldState~=HL_STRING and newState==HL_INTERPOLATION then return HL_REJECT @@ -114,9 +116,9 @@ end -- fix quoted string termination - if oldState~=HL_STRING then - qString=0 - end + --if oldState~=HL_STRING then + -- qString=0 + -- end if newState==HL_STRING and (token=="%q(" or token=="%Q(" or token=="%(" or token=="%x(" ) then qString=1 @@ -128,6 +130,20 @@ return HL_STRING end + if newState==HL_STRING and token=="%Q!" then + qString=3 + return HL_STRING + end + + if newState==HL_STRING and token=="%Q[" then + qString=4 + return HL_STRING + end + if newState==HL_STRING and token=="%Q+" then + qString=5 + return HL_STRING + end + if oldState==HL_STRING and qString==1 and token==")" then qString=0 return HL_STRING_END @@ -137,6 +153,27 @@ qString=0 return HL_STRING_END end - + + if oldState==HL_STRING and qString==3 and token=="!" then + qString=0 + return HL_STRING_END + end + + if oldState==HL_STRING and qString==4 and token=="]" then + qString=0 + return HL_STRING_END + end + + if oldState==HL_STRING and qString==5 and token=="+" then + qString=0 + return HL_STRING_END + end + + -- https://fossies.org/linux/misc/puppet-5.3.2.tar.gz/puppet-5.3.2/lib/puppet/indirector/hiera.rb?m=t + + if token==")" or token=="}" or token=="{" and oldState~=HL_STRING then + return HL_OPERATOR + end + return newState end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/sh.lang new/highlight-3.48/langDefs/sh.lang --- old/highlight-3.47/langDefs/sh.lang 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/langDefs/sh.lang 2018-12-14 11:49:21.000000000 +0100 @@ -49,7 +49,7 @@ -- hereDoc opening delimiter, see OnStateChange to handle end of string Strings={ - Delimiter=[["|'|`|<<[\-]?["']?\s*[-\w_]+["']?]], + Delimiter=[[<<[\-]?\s*["']?\s*[A-Za-z_]+["']?|"|`|']], } IgnoreCase=false @@ -78,8 +78,8 @@ end --recognize hereDoc multine strings - if oldState==HL_STANDARD and newState==HL_STRING and not string.find("\"'`", token) then - hereDoc = string.match(token, "<<%-?'?%s*([%-%a%d_]+)" ) + if oldState==HL_STANDARD and newState==HL_STRING then + hereDoc = string.match(token, "<<%-?%s*%'?([%-%a%d_]+)" ) end return newState diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/langDefs/verilog.lang new/highlight-3.48/langDefs/verilog.lang --- old/highlight-3.47/langDefs/verilog.lang 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/langDefs/verilog.lang 2018-12-14 11:49:21.000000000 +0100 @@ -2,7 +2,7 @@ Description="Verilog" -- recognize stuff like 5'b0 as number -Digits=[[ (?:0x|0X)[0-9a-fA-F]+|\d*[\.\_]?[\d+\'](?:[eE][\-\+]\d+)?[lLuUbfdm]* ]] +Digits=[[ (?:0x|0X)[0-9a-fA-F]+|\d*[\.\_]?[\d+\'](?:[eE][\-\+]\d+)?h?[0-9a-fA-F]* ]] Keywords={ { Id=1, @@ -33,9 +33,13 @@ } Strings={ - Delimiter=[["|']], + Delimiter=[["]], + Interpolation = [[ %\w ]], + } +Escape=[[ \\[ntvbrfa\\\?'"]|\\\d{3} ]] + IgnoreCase=false Comments={ @@ -53,12 +57,3 @@ } Operators=[[\(|\)|\[|\]|\{|\}|\,|\;|\:|\&|<|>|\!|\=|\/|\*|\%|\+|\-|\~|\@]] - --- resolve issue with ]] close delimiter which ends comments and strings -function OnStateChange(oldState, newState, token) - - if token=="'" and oldState==HL_NUMBER and newState==HL_STRING then - return HL_NUMBER - end - return newState -end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/ci_test.sh new/highlight-3.48/src/ci_test.sh --- old/highlight-3.47/src/ci_test.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/highlight-3.48/src/ci_test.sh 2018-12-14 11:49:21.000000000 +0100 @@ -0,0 +1,22 @@ +#!/bin/bash + +echo "Starting CI verification script" + +#OUTPUT=`./src/highlight --list-scripts=langs` +./src/highlight --list-scripts=langs + +RETVAL=$? + +if [ $RETVAL -eq 0 ]; then + echo "Retval is 0, OK" +else + echo "Retval is not 0, FAIL" + exit 1 +fi + +#if [ "$OUTPUT" == "BEGIN ... END" ]; then +# echo "Output is correct, OK" +#else +# echo "Output is not right, FAIL" +# exit 1 +#fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/core/codegenerator.cpp new/highlight-3.48/src/core/codegenerator.cpp --- old/highlight-3.47/src/core/codegenerator.cpp 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/src/core/codegenerator.cpp 2018-12-14 11:49:21.000000000 +0100 @@ -700,13 +700,15 @@ params.push_back(Diluculum::LuaValue(currentState)); params.push_back(Diluculum::LuaValue(currentKeywordClass)); string trace(";"); - string trace2(";"); if (stateTrace.size()>1){ for (size_t i=0; i<stateTrace.size()-1;i++){ trace += std::to_string (stateTrace[i]); trace += ";"; } } + + //std::cerr <<"TRC1: "<<trace<<"\n"; + params.push_back(Diluculum::LuaValue(trace)); return currentSyntax->getLuaState()->call ( *currentSyntax->getDecorateFct(), @@ -1844,7 +1846,7 @@ int commentCount=1; int openDelimID=currentSyntax->getOpenDelimiterID ( token, ML_COMMENT); State newState=STANDARD; - bool eof=false, exitState=false; + bool eof=false, exitState=false, containedTestCase=false; unsigned int startColumn=lineIndex - token.size() ; openTag ( ML_COMMENT ); do { @@ -1867,7 +1869,7 @@ case _TESTPOS: runSyntaxTestcases(token=="<" ? startColumn : lineIndex-1 ); printMaskedToken(); - + containedTestCase=true; break; case ML_COMMENT: @@ -1895,9 +1897,10 @@ } while ( !exitState && !eof ); closeTag ( ML_COMMENT ); - - stateTraceCurrent.clear(); - + + if (containedTestCase){ + stateTraceCurrent.clear(); + } return eof; } @@ -1909,7 +1912,7 @@ } State newState=STANDARD; - bool eof=false, exitState=false; + bool eof=false, exitState=false, containedTestCase=false; unsigned int startColumn = lineIndex - token.size() ; openTag ( SL_COMMENT ); @@ -1939,6 +1942,7 @@ case _TESTPOS: runSyntaxTestcases(token=="<" ? startColumn : lineIndex-1 ); printMaskedToken(); + containedTestCase=true; break; default: @@ -1948,7 +1952,9 @@ closeTag ( SL_COMMENT ); - stateTraceCurrent.clear(); + if (containedTestCase) { + stateTraceCurrent.clear(); + } return eof; } @@ -2288,12 +2294,17 @@ } } +void CodeGenerator::printTrace(const string &s){ + std::cout<<"\n"<<lineNumber<<" "<<s<<": "; + for (unsigned int i=0; i< stateTraceCurrent.size(); i++) { + std::cout<<" "<<stateTraceCurrent[i].state; + } + std::cout<<"\n"; +} + void CodeGenerator::runSyntaxTestcases(unsigned int column){ - - if (!stateTraceCurrent.size() /*|| lineIndex>stateTraceCurrent.size()*/) - return; - + unsigned int assertGroup=0; size_t typeDescPos=line.find_first_not_of("\t ^", lineIndex); State assertState=_UNKNOWN; @@ -2301,6 +2312,11 @@ if (!lineContainedTestCase){ stateTraceCurrent=stateTraceTest; } + + if (column>stateTraceCurrent.size()) + return; + + //printTrace("runSyntaxTestcases"); if (typeDescPos!=string::npos) { @@ -2333,11 +2349,12 @@ assertGroup=line[typeDescPos+2] - 'a' +1; } - if ( (assertState!=_WS && stateTraceCurrent[column].state != assertState ) + if ( (assertState!=_WS && stateTraceCurrent[column].state != assertState && !stateTraceCurrent[column].isWhiteSpace ) || (assertState==_WS && !stateTraceCurrent[column].isWhiteSpace) || assertGroup != stateTraceCurrent[column].kwClass) { ostringstream err; - err << inFile << " line " << lineNumber << ", column "<< column << ": got " << getTestcaseName(stateTraceCurrent[column].state, stateTraceCurrent[column].kwClass) + err << inFile << " line " << lineNumber << ", column "<< column + << ": got " << getTestcaseName(stateTraceCurrent[column].state, stateTraceCurrent[column].kwClass) << " instead of " << getTestcaseName(assertState, assertGroup) ; failedPosTests.push_back(err.str()); } @@ -2378,7 +2395,6 @@ wsBuffer += getNewLine(); } - if (currentSyntax->getDecorateLineBeginFct()) { Diluculum::LuaValueList res=callDecorateLineFct(true); if (res.size()==1) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/core/platform_fs.cpp new/highlight-3.48/src/core/platform_fs.cpp --- old/highlight-3.47/src/core/platform_fs.cpp 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/src/core/platform_fs.cpp 2018-12-14 11:49:21.000000000 +0100 @@ -222,7 +222,7 @@ if ( errno ) return; // save the first fileName entry for this recursion - const unsigned firstEntry = fileName.size(); + //const unsigned firstEntry = fileName.size(); // save files and sub directories while ( ( entry = readdir ( dp ) ) != NULL ) { @@ -256,8 +256,10 @@ if ( errno ) return; // sort the current entries for fileName - if ( firstEntry < fileName.size() ) - sort ( &fileName[firstEntry], &fileName[fileName.size() ] ); + // https://gitlab.com/saalen/highlight/issues/84 + // coredump with GLIBCXX_ASSERTIONS compiler option, use iterators if sort is needed + //if ( firstEntry < fileName.size() ) + // sort ( &fileName[firstEntry], &fileName[fileName.size() ] ); // recurse into sub directories // if not doing recursive, subDirectory is empty diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/include/codegenerator.h new/highlight-3.48/src/include/codegenerator.h --- old/highlight-3.47/src/include/codegenerator.h 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/src/include/codegenerator.h 2018-12-14 11:49:21.000000000 +0100 @@ -667,6 +667,8 @@ private: + void printTrace(const string &s); + CodeGenerator ( const CodeGenerator& ) {} CodeGenerator& operator= ( CodeGenerator& ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/include/version.h new/highlight-3.48/src/include/version.h --- old/highlight-3.47/src/include/version.h 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/src/include/version.h 2018-12-14 11:49:21.000000000 +0100 @@ -28,7 +28,7 @@ #ifndef VERSION_H #define VERSION_H -#define HIGHLIGHT_VERSION "3.47" +#define HIGHLIGHT_VERSION "3.48" #define HIGHLIGHT_URL "http://www.andre-simon.de/"; #define HIGHLIGHT_EMAIL "[email protected]" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/src/makefile new/highlight-3.48/src/makefile --- old/highlight-3.47/src/makefile 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/src/makefile 2018-12-14 11:49:21.000000000 +0100 @@ -24,8 +24,7 @@ CFLAGS_DILU=-fno-strict-aliasing -SO_VERSION=3.47 - +SO_VERSION=3.48 # Source paths CORE_DIR=./core/ @@ -35,14 +34,16 @@ # Include path INCLUDE_DIR=./include/ +# try to detect Lua versioning scheme +LUA_PKG_NAME=lua5.3 +LUA_TEST=$(shell pkg-config --exists ${LUA_PKG_NAME}; echo $$?) + +ifeq (${LUA_TEST},1) +LUA_PKG_NAME=lua +endif -# If Lua 5.2 is not default on your system yet you have to -# use lua5.1 in the pkg-config calls - -LUA_CFLAGS=$(shell pkg-config --cflags lua) - -# default lua lib -LUA_LIBS=$(shell pkg-config --libs lua) +LUA_CFLAGS=$(shell pkg-config --cflags ${LUA_PKG_NAME}) +LUA_LIBS=$(shell pkg-config --libs ${LUA_PKG_NAME}) # luajit lib # LUA_LIBS=$(shell pkg-config --libs luajit) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-3.47/themes/darkplus.theme new/highlight-3.48/themes/darkplus.theme --- old/highlight-3.47/themes/darkplus.theme 2018-10-13 21:26:45.000000000 +0200 +++ new/highlight-3.48/themes/darkplus.theme 2018-12-14 11:49:21.000000000 +0100 @@ -1,17 +1,17 @@ Description = "vscode darkplus" -Default = { Colour="#d4d4d4" } +Default = { Colour="#9cdcfe" } Canvas = { Colour="#1e1e1e" } Number = { Colour="#b5cea8" } Escape = { Colour="#fd7ba7" } -String = { Colour="#ce9718" } -BlockComment = { Colour="#608b4e" } +String = { Colour="#d7ba7d" } +BlockComment = { Colour="#6a9955" } StringPreProc = String LineComment = BlockComment -Operator = Default +Operator = { Colour="#d4d4d4" } LineNum = { Colour="#808080" } -PreProcessor = { Colour="#c586c0" } -Interpolation = String +PreProcessor = { Colour="#007acc" } +Interpolation = { Colour="#569cd6" } Keywords = { { Colour="#c58ec0"},
