Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ghc-gridtables for openSUSE:Factory checked in at 2025-09-30 17:42:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-gridtables (Old) and /work/SRC/openSUSE:Factory/.ghc-gridtables.new.11973 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-gridtables" Tue Sep 30 17:42:19 2025 rev:4 rq:1308075 version:0.1.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-gridtables/ghc-gridtables.changes 2024-01-03 12:29:49.198066329 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-gridtables.new.11973/ghc-gridtables.changes 2025-09-30 17:44:00.757369696 +0200 @@ -1,0 +2,9 @@ +Mon Sep 22 10:12:29 UTC 2025 - Peter Simons <[email protected]> + +- Update gridtables to version 0.1.1.0. + Upstream has edited the change log file since the last release in + a non-trivial way, i.e. they did more than just add a new entry + at the top. You can review the file at: + http://hackage.haskell.org/package/gridtables-0.1.1.0/src/CHANGELOG.md + +------------------------------------------------------------------- Old: ---- gridtables-0.1.0.0.tar.gz gridtables.cabal New: ---- gridtables-0.1.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-gridtables.spec ++++++ --- /var/tmp/diff_new_pack.qaZdwP/_old 2025-09-30 17:44:01.713409946 +0200 +++ /var/tmp/diff_new_pack.qaZdwP/_new 2025-09-30 17:44:01.713409946 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-gridtables # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2025 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +20,12 @@ %global pkgver %{pkg_name}-%{version} %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.1.0.0 +Version: 0.1.1.0 Release: 0 Summary: Parser for reStructuredText-style grid tables License: MIT URL: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkg_name}-%{version}/revision/1.cabal#/%{pkg_name}.cabal BuildRequires: ghc-Cabal-devel BuildRequires: ghc-array-devel BuildRequires: ghc-array-prof @@ -82,7 +81,6 @@ %prep %autosetup -n %{pkg_name}-%{version} -cp -p %{SOURCE1} %{pkg_name}.cabal %build %ghc_lib_build ++++++ gridtables-0.1.0.0.tar.gz -> gridtables-0.1.1.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gridtables-0.1.0.0/CHANGELOG.md new/gridtables-0.1.1.0/CHANGELOG.md --- old/gridtables-0.1.0.0/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 +++ new/gridtables-0.1.1.0/CHANGELOG.md 2001-09-09 03:46:40.000000000 +0200 @@ -2,9 +2,22 @@ `gridtables` uses [PVP Versioning][]. +## gridtables-0.1.1.0 + +Released 2025-09-22. + +- Fixed length calculation for combined characters (Tuong Nguyen + Manh). + +- Updated upper bound on text. + +- Minor code and docs improvements. + +- Added version bounds to all build dependencies. + ## gridtables-0.1.0.0 -Release pending. +Released 2022-09-30. - Added support for table foots. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gridtables-0.1.0.0/LICENSE new/gridtables-0.1.1.0/LICENSE --- old/gridtables-0.1.0.0/LICENSE 2001-09-09 03:46:40.000000000 +0200 +++ new/gridtables-0.1.1.0/LICENSE 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ MIT License -Copyright © 2022 RStudio, PBC +Copyright © 2022-2023 Posit Software, PBC Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gridtables-0.1.0.0/gridtables.cabal new/gridtables-0.1.1.0/gridtables.cabal --- old/gridtables-0.1.0.0/gridtables.cabal 2001-09-09 03:46:40.000000000 +0200 +++ new/gridtables-0.1.1.0/gridtables.cabal 2001-09-09 03:46:40.000000000 +0200 @@ -1,6 +1,6 @@ cabal-version: 2.4 name: gridtables -version: 0.1.0.0 +version: 0.1.1.0 synopsis: Parser for reStructuredText-style grid tables. description: Provides a parser for plain-text representations of tables. This package supports table headers, cells @@ -12,7 +12,7 @@ license-file: LICENSE author: Albert Krewinkel maintainer: Albert Krewinkel <[email protected]> -copyright: © 2022 RStudio, PBC +copyright: © 2022-2023 Posit Software, PBC category: Text extra-doc-files: README.md , CHANGELOG.md @@ -28,9 +28,9 @@ common common-options build-depends: base >= 4.12 && < 5 - , array + , array >= 0.5 && < 0.6 , parsec >= 3.1 && < 3.2 - , text >= 1.1.1.0 && < 1.3 || >= 2.0 && < 2.1 + , text >= 1.1.1.0 && < 1.3 || >= 2.0 && < 2.2 default-language: Haskell2010 default-extensions: OverloadedStrings other-extensions: FlexibleContexts @@ -56,8 +56,8 @@ library import: common-options hs-source-dirs: src - build-depends: containers - , doclayout + build-depends: containers >= 0.6 && < 0.8 + , doclayout >= 0.4 && < 0.6 exposed-modules: Text.GridTable , Text.GridTable.ArrayTable , Text.GridTable.Parse diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gridtables-0.1.0.0/src/Text/GridTable/ArrayTable.hs new/gridtables-0.1.1.0/src/Text/GridTable/ArrayTable.hs --- old/gridtables-0.1.0.0/src/Text/GridTable/ArrayTable.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/gridtables-0.1.1.0/src/Text/GridTable/ArrayTable.hs 2001-09-09 03:46:40.000000000 +0200 @@ -3,7 +3,7 @@ {-# LANGUAGE LambdaCase #-} {- | Module : Text.GridTable.ArrayTable -Copyright : © 2022 RStudio, PBC +Copyright : © 2022-2023 Posit Software, PBC License : MIT Maintainer : Albert Krewinkel <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gridtables-0.1.0.0/src/Text/GridTable/Parse.hs new/gridtables-0.1.1.0/src/Text/GridTable/Parse.hs --- old/gridtables-0.1.0.0/src/Text/GridTable/Parse.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/gridtables-0.1.1.0/src/Text/GridTable/Parse.hs 2001-09-09 03:46:40.000000000 +0200 @@ -2,7 +2,7 @@ {-# LANGUAGE FlexibleContexts #-} {- | Module : Text.GridTable -Copyright : © 2022 Albert Krewinkel +Copyright : © 2022-2023 Posit Software, PBC License : MIT Maintainer : Albert Krewinkel <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gridtables-0.1.0.0/src/Text/GridTable/Trace.hs new/gridtables-0.1.1.0/src/Text/GridTable/Trace.hs --- old/gridtables-0.1.0.0/src/Text/GridTable/Trace.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/gridtables-0.1.1.0/src/Text/GridTable/Trace.hs 2001-09-09 03:46:40.000000000 +0200 @@ -4,7 +4,7 @@ {-# LANGUAGE RankNTypes #-} {- | Module : Text.GridTable.Trace -Copyright : © 2022 Albert Krewinkel +Copyright : © 2022-2023 Posit Software, PBC License : MIT Maintainer : Albert Krewinkel <[email protected]> @@ -30,7 +30,7 @@ import Data.Maybe (fromMaybe) import Data.Set (Set) import Data.Text (Text) -import Text.DocLayout (charWidth) +import Text.DocLayout (charWidth, realLength) import Text.GridTable.ArrayTable import qualified Data.Map.Strict as Map import qualified Data.Set as Set @@ -99,7 +99,7 @@ -- | Converts a list of lines into a char array. toCharGrid :: [Text] -> CharGrid toCharGrid lines = - let chars = foldr (\t m -> max m (T.length t)) 0 lines -- potential overcount + let chars = foldr (\t m -> max m (realLength t)) 0 lines -- potential overcount gbounds = ( (CharRow 1, CharCol 1) , (CharRow (length lines), CharCol chars) ) @@ -344,6 +344,7 @@ lastRow :: CharGrid -> CharRow lastRow = fst . snd . bounds +-- | Forgiving version of scanRight, allowing misaligned line ends scanRightRestOfLine :: CharGrid -> CharIndex -> CharRow -> Maybe ColSeps scanRightRestOfLine charGrid (_top, left) bottom = let go :: CharCol -> Maybe ColSeps -> Maybe ColSeps diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gridtables-0.1.0.0/src/Text/GridTable.hs new/gridtables-0.1.1.0/src/Text/GridTable.hs --- old/gridtables-0.1.0.0/src/Text/GridTable.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/gridtables-0.1.1.0/src/Text/GridTable.hs 2001-09-09 03:46:40.000000000 +0200 @@ -4,7 +4,7 @@ {-# LANGUAGE RankNTypes #-} {- | Module : Text.GridTable -Copyright : © 2022 Albert Krewinkel +Copyright : © 2022-2023 Posit Software, PBC License : MIT Maintainer : Albert Krewinkel <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gridtables-0.1.0.0/test/test-gridtables.hs new/gridtables-0.1.1.0/test/test-gridtables.hs --- old/gridtables-0.1.0.0/test/test-gridtables.hs 2001-09-09 03:46:40.000000000 +0200 +++ new/gridtables-0.1.1.0/test/test-gridtables.hs 2001-09-09 03:46:40.000000000 +0200 @@ -1,7 +1,8 @@ {-# LANGUAGE FlexibleContexts #-} +{-# LANGUAGE TupleSections #-} {-| Module : Main -Copyright : © 2022 Albert Krewinkel +Copyright : © 2022-2023 Posit Software, PBC License : MIT Maintainer : Albert Krewinkel <[email protected]> @@ -27,17 +28,17 @@ ] parse' :: ParsecT Text () Identity a -> Text -> Either ParseError a -parse' p t = runParser p () "<test input>" t +parse' p = runParser p () "<test input>" -- | Test parsing into lines linesTests :: TestTree linesTests = testGroup "lines" [ testCase "get lines" $ parse' (many1 tableLine) "| one | two |\n| three |\n| four |\n" - @?= Right ([ "| one | two |" - , "| three |" - , "| four |" - ]) + @?= Right [ "| one | two |" + , "| three |" + , "| four |" + ] , testCase "fail if not a table" $ parse' (many tableLine) "nope\nnada\n" @?= Right [] @@ -372,6 +373,23 @@ , arrayTableColSpecs = defaultAlign [10, 1] }) + , testCase "combined characters" $ + let gt = T.unlines + [ "+---+------+" + , "| a | back |" + , "+===+======+" + , "| ø̞ | o̞ |" + , "+---+------+" + ] + in parse' gridTable gt @?= + Right (ArrayTable + { arrayTableCells = listArray ((1,1),(2,2)) + [ ContentCell 1 1 [" a "], ContentCell 1 1 [" back "], ContentCell 1 1 [" ø̞ "], ContentCell 1 1 [" o̞ "]] + , arrayTableHead = Just 1 + , arrayTableFoot = Nothing + , arrayTableColSpecs = defaultAlign [3, 6] + }) + ] , testCase "unterminated row" $ @@ -514,4 +532,4 @@ defaultAlign :: [Int] -> Array ColIndex (Alignment, Int) defaultAlign widths = listArray (1, ColIndex (length widths)) - $ map (\w -> (AlignDefault, w)) widths + $ map (AlignDefault,) widths
