git.iko.soy/typeable/pandoc
on master help sign in
[ODT Parser] Include list's starting value

Previously the starting value of the lists' items has been hardcoded to 1. In reality ODT's list style definition can provide a new starting value in one of its attributes. Writers already handle the modified start value so no need to change anything in that area.

commitedc951ee7d43f9ef548686ef9ba82380f7235d2b authorHubert Plociniczak <hubert.plociniczak@gmail.com> dateWed 5 Oct 2016, 13:14 (10 years ago) parentcbeb72d
2 files changed+20−13
compare with master
unifiedsplit
src/Text/Pandoc/Readers/Odt/ContentReader.hs+1−1 src/Text/Pandoc/Readers/Odt/StyleReader.hs+19−12
src/Text/Pandoc/Readers/Odt/ContentReader.hs+1−1
@@ -386,7 +386,7 @@ getListConstructor ListLevelStyle{..} =
386386 LltNumbered -> let listNumberStyle = toListNumberStyle listItemFormat
387387 listNumberDelim = toListNumberDelim listItemPrefix
388388 listItemSuffix
389− in orderedListWith (1, listNumberStyle, listNumberDelim)
389+ in orderedListWith (listItemStart, listNumberStyle, listNumberDelim)
390390 where
391391 toListNumberStyle LinfNone = DefaultStyle
392392 toListNumberStyle LinfNumber = Decimal
src/Text/Pandoc/Readers/Odt/StyleReader.hs+19−12
@@ -76,8 +76,9 @@ import Control.Applicative hiding ( liftA, liftA2, liftA3 )
7676import qualified Data.Foldable as F
7777import qualified Data.Map as M
7878import qualified Data.Set as S
79−import Data.List ( unfoldr )
79+import Data.Char ( isDigit )
8080import Data.Default
81+import Data.List ( unfoldr )
8182import Data.Maybe
8283
8384import qualified Text.XML.Light as XML
@@ -390,6 +391,7 @@ data ListLevelStyle = ListLevelStyle { listLevelType :: ListLevelType
390391 , listItemPrefix :: Maybe String
391392 , listItemSuffix :: Maybe String
392393 , listItemFormat :: ListItemNumberFormat
394+ , listItemStart :: Int
393395 }
394396 deriving ( Eq, Ord )
395397
@@ -578,25 +580,30 @@ readListLevelStyles namespace elementName levelType =
578580readListLevelStyle :: ListLevelType -> StyleReader _x (Int, ListLevelStyle)
579581readListLevelStyle levelType = readAttr NsText "level"
580582 >>?! keepingTheValue
581− ( liftA4 toListLevelStyle
582− ( returnV levelType )
583− ( findAttr' NsStyle "num-prefix" )
584− ( findAttr' NsStyle "num-suffix" )
585− ( getAttr NsStyle "num-format" )
583+ ( liftA5 toListLevelStyle
584+ ( returnV levelType )
585+ ( findAttr' NsStyle "num-prefix" )
586+ ( findAttr' NsStyle "num-suffix" )
587+ ( getAttr NsStyle "num-format" )
588+ ( findAttr' NsText "start-value" )
586589 )
587590 where
588− toListLevelStyle _ p s LinfNone = ListLevelStyle LltBullet p s LinfNone
589− toListLevelStyle _ p s f@(LinfString _) = ListLevelStyle LltBullet p s f
590− toListLevelStyle t p s f = ListLevelStyle t p s f
591+ toListLevelStyle _ p s LinfNone b = ListLevelStyle LltBullet p s LinfNone (startValue b)
592+ toListLevelStyle _ p s f@(LinfString _) b = ListLevelStyle LltBullet p s f (startValue b)
593+ toListLevelStyle t p s f b = ListLevelStyle t p s f (startValue b)
594+ startValue (Just v) = if all isDigit v
595+ then read v
596+ else 1
597+ startValue Nothing = 1
591598
592599--
593600chooseMostSpecificListLevelStyle :: S.Set ListLevelStyle -> Maybe ListLevelStyle
594601chooseMostSpecificListLevelStyle ls | ls == mempty = Nothing
595602 | otherwise = Just ( F.foldr1 select ls )
596603 where
597− select ( ListLevelStyle t1 p1 s1 f1 )
598− ( ListLevelStyle t2 p2 s2 f2 )
599− = ListLevelStyle (select' t1 t2) (p1 <|> p2) (s1 <|> s2) (selectLinf f1 f2)
604+ select ( ListLevelStyle t1 p1 s1 f1 b1 )
605+ ( ListLevelStyle t2 p2 s2 f2 _ )
606+ = ListLevelStyle (select' t1 t2) (p1 <|> p2) (s1 <|> s2) (selectLinf f1 f2) b1
600607 select' LltNumbered _ = LltNumbered
601608 select' _ LltNumbered = LltNumbered
602609 select' _ _ = LltBullet