Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package highlight for openSUSE:Factory checked in at 2023-10-23 23:40:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/highlight (Old) and /work/SRC/openSUSE:Factory/.highlight.new.1945 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "highlight" Mon Oct 23 23:40:12 2023 rev:45 rq:1119368 version:4.10 Changes: -------- --- /work/SRC/openSUSE:Factory/highlight/highlight.changes 2023-10-20 23:17:10.743421816 +0200 +++ /work/SRC/openSUSE:Factory/.highlight.new.1945/highlight.changes 2023-10-23 23:40:17.706070140 +0200 @@ -1,0 +2,5 @@ +Sat Oct 21 19:05:20 UTC 2023 - [email protected] + +- Update to version 4.10: Update astyle lib to version 3.4.10. + +------------------------------------------------------------------- Old: ---- highlight-v4.9.tar.bz2 New: ---- highlight-v4.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ highlight.spec ++++++ --- /var/tmp/diff_new_pack.DgmJ62/_old 2023-10-23 23:40:18.294091486 +0200 +++ /var/tmp/diff_new_pack.DgmJ62/_new 2023-10-23 23:40:18.294091486 +0200 @@ -18,7 +18,7 @@ %bcond_without gui Name: highlight -Version: 4.9 +Version: 4.10 Release: 0 Summary: Universal Source Code to Formatted Text Converter License: GPL-3.0-or-later ++++++ highlight-v4.9.tar.bz2 -> highlight-v4.10.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-v4.9/ChangeLog.adoc new/highlight-v4.10/ChangeLog.adoc --- old/highlight-v4.9/ChangeLog.adoc 2023-10-18 14:46:12.000000000 +0200 +++ new/highlight-v4.10/ChangeLog.adoc 2023-10-20 17:46:36.000000000 +0200 @@ -6,6 +6,13 @@ :toc: left :toclevels: 1 +== highlight 4.10 + +20.10.2023 + + - updated astyle lib to version 3.4.10 + + == highlight 4.9 16.10.2023 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-v4.9/README_PLUGINS.adoc new/highlight-v4.10/README_PLUGINS.adoc --- old/highlight-v4.9/README_PLUGINS.adoc 2023-10-18 14:46:12.000000000 +0200 +++ new/highlight-v4.10/README_PLUGINS.adoc 2023-10-20 17:46:36.000000000 +0200 @@ -180,7 +180,9 @@ [horizontal] `AddKeyword` :: function `RemoveKeyword` :: function +`AddPersistentState` :: function `OnStateChange` :: function +`OverrideParam` :: function `Decorate` :: function `DecorateLineBegin` :: function `DecorateLineEnd` :: function @@ -483,7 +485,6 @@ === FUNCTION STOREVALUE -[[StoreValue]] ................................................................................ Like above. ................................................................................ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-v4.9/src/core/astyle/ASBeautifier.cpp new/highlight-v4.10/src/core/astyle/ASBeautifier.cpp --- old/highlight-v4.9/src/core/astyle/ASBeautifier.cpp 2023-10-18 14:46:12.000000000 +0200 +++ new/highlight-v4.10/src/core/astyle/ASBeautifier.cpp 2023-10-20 17:46:36.000000000 +0200 @@ -72,6 +72,7 @@ setPreprocDefineIndent(false); setPreprocConditionalIndent(false); setAlignMethodColon(false); + isInAssignment = false; // initialize ASBeautifier member vectors beautifierFileType = INVALID_TYPE; // reset to an invalid type @@ -209,6 +210,7 @@ caseIndent = other.caseIndent; squeezeWhitespace = other.squeezeWhitespace; attemptLambdaIndentation = other.attemptLambdaIndentation; + isInAssignment = other.isInAssignment; namespaceIndent = other.namespaceIndent; braceIndent = other.braceIndent; braceIndentVtk = other.braceIndentVtk; @@ -1387,9 +1389,10 @@ continuationIndentCount = minIndent + spaceIndentCount_; // this is not done for an in-statement array + int multiplier = isInAssignment ? 1 : 2; // GH16 - no multiply in assignments if (continuationIndentCount > maxContinuationIndent && !(prevNonLegalCh == '=' && currentNonLegalCh == '{')) - continuationIndentCount = indentLength /* * 2*/ + spaceIndentCount_; // GH16 + continuationIndentCount = indentLength * multiplier + spaceIndentCount_; if (!continuationIndentStack->empty() && continuationIndentCount < continuationIndentStack->back()) @@ -3501,6 +3504,8 @@ // handle ends of statements if ((ch == ';' && parenDepth == 0) || ch == '}') { + isInAssignment = false; + if (ch == '}') { @@ -3866,6 +3871,8 @@ else if (foundAssignmentOp != nullptr) { + + isInAssignment = true; foundPreCommandHeader = false; // clears this for array assignments foundPreCommandMacro = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-v4.9/src/include/astyle/astyle.h new/highlight-v4.10/src/include/astyle/astyle.h --- old/highlight-v4.9/src/include/astyle/astyle.h 2023-10-18 14:46:12.000000000 +0200 +++ new/highlight-v4.10/src/include/astyle/astyle.h 2023-10-20 17:46:36.000000000 +0200 @@ -52,7 +52,7 @@ #pragma clang diagnostic ignored "-Wshorten-64-to-32" #endif -#define ASTYLE_VERSION "3.4.9" +#define ASTYLE_VERSION "3.4.10" //----------------------------------------------------------------------------- // astyle namespace @@ -561,6 +561,9 @@ bool shouldIndentPreprocConditional; bool squeezeWhitespace; bool attemptLambdaIndentation; + + bool isInAssignment; + int indentCount; int spaceIndentCount; int spaceIndentObjCMethodAlignment; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/highlight-v4.9/src/include/version.h new/highlight-v4.10/src/include/version.h --- old/highlight-v4.9/src/include/version.h 2023-10-18 14:46:12.000000000 +0200 +++ new/highlight-v4.10/src/include/version.h 2023-10-20 17:46:36.000000000 +0200 @@ -31,7 +31,7 @@ #include <string> #define HIGHLIGHT_MAJOR "4" -#define HIGHLIGHT_MINOR "9" +#define HIGHLIGHT_MINOR "10" #define HIGHLIGHT_VERSION HIGHLIGHT_MAJOR "." HIGHLIGHT_MINOR
