diff --git a/AUTHORS.md b/AUTHORS.md --- a/AUTHORS.md +++ b/AUTHORS.md @@ -99,6 +99,7 @@ - Dmitry Pogodin - Dmitry Volodin - Douglas Calvert +- Edwin Török - Eigil Rischel - Elliot Bobrow - Emanuel Evans diff --git a/MANUAL.txt b/MANUAL.txt --- a/MANUAL.txt +++ b/MANUAL.txt @@ -1,7 +1,7 @@ --- title: Pandoc User's Guide author: John MacFarlane -date: December 15, 2023 +date: January 5, 2024 --- # Synopsis diff --git a/changelog.md b/changelog.md --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,75 @@ # Revision history for pandoc +## pandoc 3.1.11.1 (2023-01-05) + + * Docx reader: + + + Fix HYPERLINK with only switch and no argument (#9246). + + * Org reader: + + + Parse caption and label for grid tables (#9279). + + * MediaWiki reader: + + + Handle multiline math in list items (#9293). + + * OPML writer: + + + Respect `--wrap` options & `--columns` in contents of notes (#9297). + + * ODT/OpenDocument writers: + + + Properly handle highlighting styles (#9287). These styles were + going into an `office:styles` element in `content.xml`, but this + is invalid. Instead they must go in `styles.xml`. The variable + `highlighting-styles` no longer has any effect on the default + opendocument template, and highlighting styles are not included + in `opendocument` output. + + * Markdown writer: + + + Add table identifier at end of caption if present (#9279). + + * Text.Pandoc.PDF: + + + Expand list of environment variables to display in verbose output + (#9303). + + Ensure that we find all the LaTeX warnings requiring a rerun (#9284). + This should fix a regression from 3.1.9 that led to incorrect + alignments in tables (and possibly other issues). + + * Docx writer: + + + Ensure that pandoc's output validates (Edwin Török, #9273, #9269, + John MacFarlane, #9265, #9266, #9264). + + Don't emit empty table rows, which seem to cause problems for + Word (#9224). + + * LaTeX writer: + + + Omit superfluous page locator label when used with `--natbib` or + `--biblatex` (#9275). These will treat a bare number as a + page locator, and they will be able to localize it. Note that the + recognition of the locator label is locale-sensitive; if `lang` is + `de`, then `S. 33` is a page reference, and `p. 33` is not! + + * Text.Pandoc.Chunks: Fine tune `makeChunks` (#9281). + + + Ensure that chunks not based on sections (those with the + "preamble" class) get unique identifiers, by appending chunk number. + + This will also ensure that they get unique path names when + the path is generated from the identifier. + + * Default HTML5 template: remove html5shiv (and support for IE < 9). + + * Makefile: + + + Fix `make quick-stack`: `j` was expecting a number (Edwin Török). + + Run built pandoc (instead of pandoc in path). + + Add `validate-epub` target, using `epubcheck` to test the golden files. + + Add `validate-docx-golden-tests` target. + ## pandoc 3.1.11 (2023-12-15) * Typst writer: diff --git a/data/docx/word/document.xml b/data/docx/word/document.xml --- a/data/docx/word/document.xml +++ b/data/docx/word/document.xml @@ -52,7 +52,6 @@ - @@ -266,14 +265,13 @@ - - + diff --git a/data/docx/word/settings.xml b/data/docx/word/settings.xml --- a/data/docx/word/settings.xml +++ b/data/docx/word/settings.xml @@ -4,10 +4,6 @@ - - - - @@ -16,6 +12,10 @@ + + + + diff --git a/data/docx/word/styles.xml b/data/docx/word/styles.xml --- a/data/docx/word/styles.xml +++ b/data/docx/word/styles.xml @@ -24,10 +24,10 @@ + - @@ -107,14 +107,14 @@ - + + + - - > @@ -220,8 +220,8 @@ - + @@ -389,10 +389,10 @@ - + diff --git a/data/templates/default.html5 b/data/templates/default.html5 --- a/data/templates/default.html5 +++ b/data/templates/default.html5 @@ -32,9 +32,6 @@ $endif$ $math$ $endif$ - $for(include-before)$ diff --git a/data/templates/default.opendocument b/data/templates/default.opendocument --- a/data/templates/default.opendocument +++ b/data/templates/default.opendocument @@ -3,9 +3,6 @@ - - $highlighting-styles$ - $automatic-styles$ diff --git a/pandoc.cabal b/pandoc.cabal --- a/pandoc.cabal +++ b/pandoc.cabal @@ -1,6 +1,6 @@ cabal-version: 2.4 name: pandoc -version: 3.1.11 +version: 3.1.11.1 build-type: Simple license: GPL-2.0-or-later license-file: COPYING.md diff --git a/src/Text/Pandoc/Chunks.hs b/src/Text/Pandoc/Chunks.hs --- a/src/Text/Pandoc/Chunks.hs +++ b/src/Text/Pandoc/Chunks.hs @@ -28,7 +28,8 @@ ) where import Text.Pandoc.Definition -import Text.Pandoc.Shared (makeSections, stringify, inlineListToIdentifier) +import Text.Pandoc.Shared (makeSections, stringify, inlineListToIdentifier, + tshow) import Text.Pandoc.Walk (Walkable(..)) import Data.Aeson (FromJSON, ToJSON) import Data.Text (Text) @@ -204,22 +205,26 @@ divid (fromMaybe "" secnum) toChunk chunknum (Div ("",["preamble"],[]) bs) = - Chunk + Chunk { chunkHeading = docTitle meta - , chunkId = inlineListToIdentifier mempty $ docTitle meta + , chunkId = chunkid , chunkLevel = 0 , chunkNumber = chunknum , chunkSectionNumber = Nothing - , chunkPath = resolvePathTemplate pathTemplate chunknum - (stringify (docTitle meta)) - (inlineListToIdentifier mempty (docTitle meta)) - "0" + , chunkPath = chunkpath , chunkUp = Nothing , chunkPrev = Nothing , chunkNext = Nothing , chunkUnlisted = False , chunkContents = bs } + where + chunkpath = resolvePathTemplate pathTemplate chunknum + (stringify (docTitle meta)) + chunkid + "0" + chunkid = inlineListToIdentifier mempty (docTitle meta) <> + "-" <> tshow chunknum toChunk _ b = error $ "toChunk called on inappropriate block " <> show b -- should not happen diff --git a/src/Text/Pandoc/PDF.hs b/src/Text/Pandoc/PDF.hs --- a/src/Text/Pandoc/PDF.hs +++ b/src/Text/Pandoc/PDF.hs @@ -425,18 +425,23 @@ logContents <- if logExists then readFileLazy logFile else return mempty - needsRerun <- checkForRerun logContents - if needsRerun && runNumber < 3 - then go file env'' programArgs (runNumber + 1) + let rerunWarnings = checkForRerun logContents + if not (null rerunWarnings) && runNumber < 3 + then do + report $ MakePDFInfo "Rerun needed" + (T.intercalate "\n" + (map (UTF8.toText . BC.toStrict) rerunWarnings)) + go file env'' programArgs (runNumber + 1) else do let pdfFile = replaceExtension file ".pdf" (log', pdf) <- getResultingPDF (Just logFile) pdfFile return (exit, fromMaybe out log', pdf) - checkForRerun log' = pure $ any isRerunWarning $ BC.lines log' + checkForRerun log' = filter isRerunWarning $ BC.lines log' - isRerunWarning ln = BC.isPrefixOf "LaTeX Warning:" ln && - BS.isInfixOf "Rerun to" (BL.toStrict ln) + isRerunWarning ln = + let ln' = BL.toStrict ln + in BS.isInfixOf "Warning:" ln' && BS.isInfixOf "Rerun" ln' generic2pdf :: (PandocMonad m, MonadIO m) => String @@ -542,19 +547,95 @@ report $ MakePDFInfo "Command line:" (T.pack program <> " " <> T.pack (unwords (map show programArgs))) -- we filter out irrelevant stuff to avoid leaking passwords and keys! - let isRelevant ("PATH",_) = True - isRelevant ("TMPDIR",_) = True - isRelevant ("PWD",_) = True - isRelevant ("LANG",_) = True - isRelevant ("HOME",_) = True - isRelevant ("LUA_PATH",_) = True - isRelevant ("LUA_CPATH",_) = True - isRelevant ("SHELL",_) = True - isRelevant ("TEXINPUTS",_) = True - isRelevant ("TEXMFOUTPUT",_) = True - isRelevant _ = False + let isRelevant e = (e `elem` [ "PKFONTS" + , "AFMFONTS" + , "BIBINPUTS" + , "BLTXMLINPUTS" + , "BSTINPUTS" + , "CLUAINPUTS" + , "CMAPFONTS" + , "CWEBINPUTS" + , "DVIPSHEADERS" + , "ENCFONTS" + , "FONTCIDMAPS" + , "FONTFEATURES" + , "GFFONTS" + , "GLYPHFONTS" + , "HOME" + , "INDEXSTYLE" + , "KPATHSEA_DEBUG" + , "KPATHSEA_WARNING" + , "LANG" + , "LIGFONTS" + , "LUAINPUTS" + , "LUA_CPATH" + , "LUA_PATH" + , "MFBASES" + , "MFINPUTS" + , "MFPOOL" + , "MFTINPUTS" + , "MISCFONTS" + , "MISSFONT_LOG" + , "MLBIBINPUTS" + , "MLBSTINPUTS" + , "MPINPUTS" + , "MPMEMS" + , "MPPOOL" + , "MPSUPPORT" + , "OCPINPUTS" + , "OFMFONTS" + , "OPENTYPEFONTS" + , "OPLFONTS" + , "OTPINPUTS" + , "OVFFONTS" + , "OVPFONTS" + , "PATH" + , "PDFTEXCONFIG" + , "PROGRAMFONTS" + , "PSHEADERS" + , "PWD" + , "RISINPUTS" + , "SELFAUTODIR" + , "SELFAUTOLOC" + , "SELFAUTOPARENT" + , "SFDFONTS" + , "SHELL" + , "T1FONTS" + , "T1INPUTS" + , "T42FONTS" + , "TEXBIB" + , "TEXCONFIG" + , "TEXDOCS" + , "TEXFONTMAPS" + , "TEXFONTS" + , "TEXFORMATS" + , "TEXINDEXSTYLE" + , "TEXINPUTS" + , "TEXMFCNF" + , "TEXMFDBS" + , "TEXMFINI" + , "TEXMFSCRIPTS" + , "TEXMFVAR" + , "TEXPICTS" + , "TEXPKS" + , "TEXPOOL" + , "TEXPSHEADERS" + , "TEXSOURCES" + , "TEX_HUSH" + , "TFMFONTS" + , "TMPDIR" + , "TRFONTS" + , "TTFONTS" + , "USERPROFILE" + , "USE_TEXMFVAR" + , "USE_VARTEXFONTS" + , "VARTEXFONTS" + , "VFFONTS" + , "WEB2C" + , "WEBINPUTS" + ]) || "TEXMF" `isPrefixOf` e report $ MakePDFInfo "Relevant environment variables:" - (T.intercalate "\n" $ map tshow $ filter isRelevant env) + (T.intercalate "\n" $ map tshow $ filter (isRelevant . fst) env) report $ MakePDFInfo "Source:" source handlePDFProgramNotFound :: String -> IE.IOError -> IO a diff --git a/src/Text/Pandoc/Readers/Docx/Fields.hs b/src/Text/Pandoc/Readers/Docx/Fields.hs --- a/src/Text/Pandoc/Readers/Docx/Fields.hs +++ b/src/Text/Pandoc/Readers/Docx/Fields.hs @@ -110,7 +110,7 @@ many space string "HYPERLINK" spaces - farg <- fieldArgument + farg <- option "" $ notFollowedBy (char '\\') *> fieldArgument switches <- spaces *> many hyperlinkSwitch let url = case switches of ("\\l", s) : _ -> farg <> "#" <> s diff --git a/src/Text/Pandoc/Readers/Docx/Parse.hs b/src/Text/Pandoc/Readers/Docx/Parse.hs --- a/src/Text/Pandoc/Readers/Docx/Parse.hs +++ b/src/Text/Pandoc/Readers/Docx/Parse.hs @@ -56,6 +56,7 @@ , constructBogusParStyleData , leftBiasedMergeRunStyle , rowsToRowspans + , extractTarget ) where import Text.Pandoc.Readers.Docx.Parse.Styles import Codec.Archive.Zip @@ -537,6 +538,10 @@ T.stripPrefix frontOfFp $ T.dropWhile (== '/') target return $ Relationship relType relId target' relElemToRelationship _ _ _ = Nothing + +extractTarget :: Element -> Maybe Target +extractTarget element = do (Relationship _ _ target) <- relElemToRelationship "word/" InDocument element + return target filePathToRelationships :: Archive -> FilePath -> FilePath -> [Relationship] filePathToRelationships ar docXmlPath fp diff --git a/src/Text/Pandoc/Readers/MediaWiki.hs b/src/Text/Pandoc/Readers/MediaWiki.hs --- a/src/Text/Pandoc/Readers/MediaWiki.hs +++ b/src/Text/Pandoc/Readers/MediaWiki.hs @@ -502,8 +502,9 @@ -- }} -- * next list item -- which seems to be valid mediawiki. +-- Also multiline math: see #9293. listChunk :: PandocMonad m => MWParser m Text -listChunk = template <|> countChar 1 anyChar +listChunk = template <|> (snd <$> withRaw math) <|> countChar 1 anyChar listItem' :: PandocMonad m => Char -> MWParser m Blocks listItem' c = try $ do diff --git a/src/Text/Pandoc/Readers/Org/Blocks.hs b/src/Text/Pandoc/Readers/Org/Blocks.hs --- a/src/Text/Pandoc/Readers/Org/Blocks.hs +++ b/src/Text/Pandoc/Readers/Org/Blocks.hs @@ -26,7 +26,7 @@ import Text.Pandoc.Readers.Org.Shared (cleanLinkText, isImageFilename, originalLang, translateLang, exportsCode) -import Text.Pandoc.Builder (Blocks, Inlines) +import Text.Pandoc.Builder (Blocks, Inlines, Many(..)) import Text.Pandoc.Class.PandocMonad (PandocMonad) import Text.Pandoc.Definition import Text.Pandoc.Options @@ -41,6 +41,7 @@ import Data.Text (Text) import Data.List.NonEmpty (nonEmpty) import System.FilePath +import qualified Data.Foldable as F import qualified Data.Text as T import qualified Text.Pandoc.Builder as B import qualified Text.Pandoc.Walk as Walk @@ -631,38 +632,46 @@ } table :: PandocMonad m => OrgParser m (F Blocks) -table = do - withTables <- getExportSetting exportWithTables - tbl <- gridTableWith blocks <|> orgTable - return $ if withTables then tbl else mempty - --- | A normal org table -orgTable :: PandocMonad m => OrgParser m (F Blocks) -orgTable = try $ do +table = try $ do -- don't allow a table on the first line of a list item; org requires that -- tables start at first non-space character on the line let isFirstInListItem st = orgStateParserContext st == ListItemState && isNothing (orgStateLastPreCharPos st) guard . not . isFirstInListItem =<< getState blockAttrs <- blockAttributes + let identMb = blockAttrName blockAttrs + tbl <- gridTableWith blocks <|> orgTable + withTables <- getExportSetting exportWithTables + return $ if withTables + then do + xs <- unMany <$> tbl + case F.toList xs of + [Table _ _ cs th tb tf] -> do + capt <- case blockAttrCaption blockAttrs of + Nothing -> pure $ Caption Nothing [] + Just ils -> do + ils' <- ils + pure $ B.simpleCaption . B.plain $ ils' + let attr = (fromMaybe mempty identMb, [], + blockAttrKeyValues blockAttrs) + pure $ B.tableWith attr capt cs th tb tf + _ -> tbl -- should not happen + else mempty + +-- | A normal org table +orgTable :: PandocMonad m => OrgParser m (F Blocks) +orgTable = do lookAhead tableStart rows <- tableRows - - let caption = fromMaybe mempty (blockAttrCaption blockAttrs) let orgTbl = normalizeTable <$> rowsToTable rows - let identMb = blockAttrName blockAttrs - let attr = (fromMaybe mempty identMb, [], blockAttrKeyValues blockAttrs) - return $ orgToPandocTable attr <$> orgTbl <*> caption + return $ orgToPandocTable <$> orgTbl -orgToPandocTable :: Attr - -> OrgTable - -> Inlines - -> Blocks -orgToPandocTable attr (OrgTable colProps heads lns) caption = +orgToPandocTable :: OrgTable -> Blocks +orgToPandocTable (OrgTable colProps heads lns) = let totalWidth = if any (isJust . columnRelWidth) colProps then Just . sum $ map (fromMaybe 1 . columnRelWidth) colProps else Nothing - in B.tableWith attr (B.simpleCaption $ B.plain caption) + in B.tableWith nullAttr (Caption Nothing mempty) (map (convertColProp totalWidth) colProps) (TableHead nullAttr $ toHeaderRow heads) [TableBody nullAttr 0 [] $ map toRow lns] diff --git a/src/Text/Pandoc/Writers/Docx.hs b/src/Text/Pandoc/Writers/Docx.hs --- a/src/Text/Pandoc/Writers/Docx.hs +++ b/src/Text/Pandoc/Writers/Docx.hs @@ -28,7 +28,7 @@ toEntry, Entry(eRelativePath) ) import Control.Applicative ((<|>)) -import Control.Monad (MonadPlus(mplus), unless, when) +import Control.Monad (MonadPlus(mplus), unless, when, foldM) import Control.Monad.Except (catchError, throwError) import Control.Monad.Reader ( asks, MonadReader(local), MonadTrans(lift), ReaderT(runReaderT) ) @@ -36,7 +36,8 @@ import qualified Data.ByteString.Lazy as BL import Data.Containers.ListUtils (nubOrd) import Data.Char (isSpace, isLetter) -import Data.List (intercalate, isPrefixOf, isSuffixOf) +import Data.List (intercalate, isPrefixOf, isSuffixOf, sortBy) +import Data.Ord (comparing) import Data.String (fromString) import qualified Data.Map as M import Data.Maybe (fromMaybe, isNothing, mapMaybe, maybeToList, isJust) @@ -63,6 +64,7 @@ import Text.Pandoc.Logging import Text.Pandoc.MIME (extensionFromMimeType, getMimeType, getMimeTypeDef) import Text.Pandoc.Options +import Text.Pandoc.Readers.Docx.Parse (extractTarget) import Text.Pandoc.Writers.Docx.StyleMap import Text.Pandoc.Writers.Docx.Table as Table import Text.Pandoc.Writers.Docx.Types @@ -77,9 +79,63 @@ import Data.Generics (mkT, everywhere) import Text.Collate.Lang (renderLang, Lang(..)) +-- from wml.xsd EG_RPrBase +rPrTagOrder :: M.Map Text Int +rPrTagOrder = + M.fromList + (zip [ "rStyle" + , "rFonts" + , "b" + , "bCs" + , "i" + , "iCs" + , "caps" + , "smallCaps" + , "strike" + , "dstrike" + , "outline" + , "shadow" + , "emboss" + , "imprint" + , "noProof" + , "snapToGrid" + , "vanish" + , "webHidden" + , "color" + , "spacing" + , "w" + , "kern" + , "position" + , "sz" + , "szCs" + , "highlight" + , "u" + , "effect" + , "bdr" + , "shd" + , "fitText" + , "vertAlign" + , "rtl" + , "cs" + , "em" + , "lang" + , "eastAsianLayout" + , "specVanish" + , "oMath" + ] [0..]) + +sortSquashed :: [Element] -> [Element] +sortSquashed l = + sortBy (comparing tagIndex) l + where + tagIndex :: Element -> Int + tagIndex el = + fromMaybe 0 (M.lookup tag rPrTagOrder) + where tag = (qName . elName) el + squashProps :: EnvProps -> [Element] -squashProps (EnvProps Nothing es) = es -squashProps (EnvProps (Just e) es) = e : es +squashProps (EnvProps Nothing es) = sortSquashed es +squashProps (EnvProps (Just e) es) = sortSquashed (e : es) renumIdMap :: Int -> [Element] -> M.Map Text Text renumIdMap _ [] = M.empty @@ -255,8 +311,6 @@ let headers = filterElements isHeaderNode parsedRels let footers = filterElements isFooterNode parsedRels - let extractTarget = findAttr (QName "Target" Nothing Nothing) - -- we create [Content_Types].xml and word/_rels/document.xml.rels -- from scratch rather than reading from reference.docx, -- because Word sometimes changes these files when a reference.docx is modified, @@ -508,30 +562,104 @@ -- adds references to footnotes or endnotes we don't have... -- we do, however, copy some settings over from reference let settingsPath = "word/settings.xml" - settingsList = [ "zoom" - , "mirrorMargins" + + settingsEntry <- copyChildren refArchive distArchive settingsPath epochtime + -- note: these must go in the following order: + [ "writeProtection" + , "view" + , "zoom" + , "removePersonalInformation" + , "removeDateAndTime" + , "doNotDisplayPageBoundaries" + , "displayBackgroundShape" + , "printPostScriptOverText" + , "printFractionalCharacterWidth" + , "printFormsData" + , "embedTrueTypeFonts" , "embedSystemFonts" + , "saveSubsetFonts" + , "saveFormsData" + , "mirrorMargins" + , "alignBordersAndEdges" + , "bordersDoNotSurroundHeader" + , "bordersDoNotSurroundFooter" + , "gutterAtTop" + , "hideSpellingErrors" + , "hideGrammaticalErrors" + , "activeWritingStyle" + , "proofState" + , "formsDesign" + , "attachedTemplate" + , "linkStyles" + , "stylePaneFormatFilter" + , "stylePaneSortMethod" + , "documentType" + , "mailMerge" + , "revisionView" + , "trackRevisions" , "doNotTrackMoves" + , "doNotTrackFormatting" + , "documentProtection" + , "autoFormatOverride" + , "styleLockTheme" + , "styleLockQFSet" , "defaultTabStop" + , "autoHyphenation" + , "consecutiveHyphenLimit" + , "hyphenationZone" + , "doNotHyphenateCaps" + , "showEnvelope" + , "summaryLength" + , "clickAndTypeStyle" + , "defaultTableStyle" + , "evenAndOddHeaders" + , "bookFoldRevPrinting" + , "bookFoldPrinting" + , "bookFoldPrintingSheets" , "drawingGridHorizontalSpacing" , "drawingGridVerticalSpacing" , "displayHorizontalDrawingGridEvery" , "displayVerticalDrawingGridEvery" + , "doNotUseMarginsForDrawingGridOrigin" + , "drawingGridHorizontalOrigin" + , "drawingGridVerticalOrigin" + , "doNotShadeFormData" + , "noPunctuationKerning" , "characterSpacingControl" + , "printTwoOnOne" + , "strictFirstAndLastChars" + , "noLineBreaksAfter" + , "noLineBreaksBefore" , "savePreviewPicture" - , "mathPr" + , "doNotValidateAgainstSchema" + , "saveInvalidXml" + , "ignoreMixedContent" + , "alwaysShowPlaceholderText" + , "doNotDemarcateInvalidXml" + , "saveXmlDataOnly" + , "useXSLTWhenSaving" + , "saveThroughXslt" + , "showXMLTags" + , "alwaysMergeEmptyNamespace" + , "updateFields" + , "hdrShapeDefaults" + , "footnotePr" + , "compat" + , "docVars" + , "rsids" + , "attachedSchema" , "themeFontLang" + , "clrSchemeMapping" + , "doNotIncludeSubdocsInStats" + , "doNotAutoCompressPictures" + , "forceUpgrade" + , "captions" + , "readModeInkLockDown" + , "smartTagType" + , "shapeDefaults" + , "doNotEmbedSmartTags" , "decimalSymbol" - , "listSeparator" - , "autoHyphenation" - , "consecutiveHyphenLimit" - , "hyphenationZone" - , "doNotHyphenateCap" - , "evenAndOddHeaders" - , "proofState" - , "compat" - ] - settingsEntry <- copyChildren refArchive distArchive settingsPath epochtime settingsList + , "listSeparator" ] let entryFromArchive arch path = maybe (throwError $ PandocSomeError @@ -604,14 +732,14 @@ [ mknode "w:name" [("w:val", tshow toktype)] () , mknode "w:basedOn" [("w:val","VerbatimChar")] () , mknode "w:rPr" [] $ + [ mknode "w:b" [] () | tokFeature tokenBold toktype ] ++ + [ mknode "w:i" [] () | tokFeature tokenItalic toktype ] ++ [ mknode "w:color" [("w:val", tokCol toktype)] () | tokCol toktype /= "auto" ] ++ + [ mknode "w:u" [] () | tokFeature tokenUnderline toktype ] ++ [ mknode "w:shd" [("w:val","clear") ,("w:fill",tokBg toktype)] () - | tokBg toktype /= "auto" ] ++ - [ mknode "w:b" [] () | tokFeature tokenBold toktype ] ++ - [ mknode "w:i" [] () | tokFeature tokenItalic toktype ] ++ - [ mknode "w:u" [] () | tokFeature tokenUnderline toktype ] + | tokBg toktype /= "auto" ] ] tokStyles = tokenStyles style tokFeature f toktype = maybe False f $ M.lookup toktype tokStyles @@ -639,17 +767,17 @@ copyChildren refArchive distArchive path timestamp elNames = do ref <- parseXml refArchive distArchive path dist <- parseXml distArchive distArchive path - let elsToCopy = - map cleanElem $ filterChildrenName (\e -> qName e `elem` elNames) ref - let elsToKeep = - [e | Elem e <- elContent dist, not (any (hasSameNameAs e) elsToCopy)] - return $ toEntry path timestamp $ renderXml dist{ - elContent = map Elem elsToKeep ++ map Elem elsToCopy - } + els <- foldM (addEl ref dist) [] (reverse elNames) + return $ toEntry path timestamp + $ renderXml dist{ elContent = map cleanElem els } where - hasSameNameAs (Element {elName = n1}) (Element {elName = n2}) = - qName n1 == qName n2 - cleanElem el@Element{elName=name} = el{elName=name{qURI=Nothing}} + addEl ref dist els name = + case filterChildName (hasName name) ref `mplus` + filterChildName (hasName name) dist of + Just el -> pure (el : els) + Nothing -> pure els + hasName name = (== name) . qName + cleanElem el@Element{elName=name} = Elem el{elName=name{qURI=Nothing}} -- this is the lowest number used for a list numId baseListId :: Int @@ -678,7 +806,7 @@ mkAbstractNum :: ListMarker -> Element mkAbstractNum marker = mknode "w:abstractNum" [("w:abstractNumId",listMarkerToId marker)] - $ mknode "w:nsid" [("w:val", "A" <> listMarkerToId marker)] () + $ mknode "w:nsid" [("w:val", T.justifyRight 8 '0' ("A" <> listMarkerToId marker))] () : mknode "w:multiLevelType" [("w:val","multilevel")] () : map (mkLvl marker) [0..maxListLevel] @@ -810,8 +938,8 @@ , mknode "w:r" [] [ mknode "w:rPr" [] [ mknode "w:rStyle" [("w:val", "CommentReference")] () - , mknode "w:annotationRef" [] () ] + , mknode "w:annotationRef" [] () ] ] ++ annotation ] @@ -1063,18 +1191,17 @@ map blockToCell blks let tbl = mknode "w:tbl" [] ( mknode "w:tblPr" [] - ( mknode "w:tblStyle" [("w:val","FigureTable")] () : - mknode "w:tblW" [ ("w:type", "auto"), ("w:w", "0") ] () : + [ mknode "w:tblStyle" [("w:val","FigureTable")] (), + mknode "w:tblW" [ ("w:type", "auto"), ("w:w", "0") ] (), + mknode "w:jc" [("w:val","center")] (), mknode "w:tblLook" [ ("w:firstRow", "0") , ("w:lastRow", "0") , ("w:firstColumn", "0") , ("w:lastColumn", "0") - ] () : - mknode "w:jc" [("w:val","center")] () : - [] - ) + ] () + ] : mknode "w:tblGrid" [] gridCols - : [tblBody] + : maybeToList tblBody ) modify $ \s -> s { stInTable = False } return $ Elem tbl @@ -1171,7 +1298,7 @@ let listPr = [mknode "w:numPr" [] [ mknode "w:ilvl" [("w:val",tshow listLevel)] () , mknode "w:numId" [("w:val",tshow numid')] () ] | listLevel >= 0 && not displayMathPara] - return $ case listPr ++ squashProps props of + return $ case squashProps (EnvProps Nothing listPr <> props) of [] -> [] ps -> [mknode "w:pPr" [] ps] @@ -1290,12 +1417,12 @@ langmod $ inlinesToOpenXML opts ils wrapBookmark ident contents inlineToOpenXML' opts (Strong lst) = - withTextProp (mknode "w:b" [] ()) $ withTextProp (mknode "w:bCs" [] ()) $ -- needed for LTR, #6911 + withTextProp (mknode "w:b" [] ()) $ inlinesToOpenXML opts lst inlineToOpenXML' opts (Emph lst) = - withTextProp (mknode "w:i" [] ()) $ withTextProp (mknode "w:iCs" [] ()) $ -- needed for LTR, #6911 + withTextProp (mknode "w:i" [] ()) $ inlinesToOpenXML opts lst inlineToOpenXML' opts (Underline lst) = withTextProp (mknode "w:u" [("w:val","single")] ()) $ diff --git a/src/Text/Pandoc/Writers/Docx/Table.hs b/src/Text/Pandoc/Writers/Docx/Table.hs --- a/src/Text/Pandoc/Writers/Docx/Table.hs +++ b/src/Text/Pandoc/Writers/Docx/Table.hs @@ -22,6 +22,7 @@ import Control.Monad.Except ( throwError ) import Data.Array ( elems, (!), assocs, indices ) import Data.Text (Text) +import Data.Maybe (catMaybes) import Text.Pandoc.Definition ( ColSpec, Caption(Caption), @@ -112,20 +113,20 @@ let hasWidths = not $ all ((== ColWidthDefault) . snd) colspecs let tbl = mknode "w:tbl" [] ( mknode "w:tblPr" [] - ( mknode "w:tblStyle" [("w:val","Table")] () : - mknode "w:tblW" tblWattr () : - mknode "w:tblLook" [("w:firstRow",if hasHeader then "1" else "0") - ,("w:lastRow",if hasFooter then "1" else "0") - ,("w:firstColumn","0") - ,("w:lastColumn","0") - ,("w:noHBand","0") - ,("w:noVBand","0") - ,("w:val", T.pack $ printf "%04x" tblLookVal) - ] () : - mknode "w:jc" [("w:val","start")] () - : [ mknode "w:tblInd" [("w:w", tshow indent),("w:type","dxa")] () + ( [ mknode "w:tblStyle" [("w:val","Table")] (), + mknode "w:tblW" tblWattr (), + mknode "w:jc" [("w:val","left")] () ] ++ + [ mknode "w:tblInd" [("w:w", tshow indent),("w:type","dxa")] () | indent > 0 ] ++ [ mknode "w:tblLayout" [("w:type", "fixed")] () | hasWidths ] ++ + [ mknode "w:tblLook" [("w:firstRow",if hasHeader then "1" else "0") + ,("w:lastRow",if hasFooter then "1" else "0") + ,("w:firstColumn","0") + ,("w:lastColumn","0") + ,("w:noHBand","0") + ,("w:noVBand","0") + ,("w:val", T.pack $ printf "%04x" tblLookVal) + ] () ] ++ [ mknode "w:tblCaption" [("w:val", captionStr)] () | not (T.null captionStr) ] ) @@ -189,7 +190,7 @@ if null (elems cellArray) then return mempty else partToRows rowType aligns part >>= - mapM (rowToOpenXML blocksToOpenXML) + fmap catMaybes . mapM (rowToOpenXML blocksToOpenXML) data OOXMLCell = OOXMLCell Attr Alignment RowSpan ColSpan [Block] @@ -228,15 +229,17 @@ rowToOpenXML :: PandocMonad m => ([Block] -> WS m [Content]) -> OOXMLRow - -> WS m Element -rowToOpenXML blocksToOpenXML (OOXMLRow rowType _attr cells) = do - xmlcells <- mapM (ooxmlCellToOpenXML blocksToOpenXML) cells - let addTrPr = case rowType of - HeadRow -> (mknode "w:trPr" [] - [mknode "w:tblHeader" [("w:val", "true")] ()] :) - BodyRow -> id - FootRow -> id - return $ mknode "w:tr" [] (addTrPr xmlcells) + -> WS m (Maybe Element) +rowToOpenXML blocksToOpenXML (OOXMLRow rowType _attr cells) + | null cells = return Nothing + | otherwise = do + xmlcells <- mapM (ooxmlCellToOpenXML blocksToOpenXML) cells + let addTrPr = case rowType of + HeadRow -> (mknode "w:trPr" [] + [mknode "w:tblHeader" [("w:val", "on")] ()] :) + BodyRow -> id + FootRow -> id + return $ Just $ mknode "w:tr" [] (addTrPr xmlcells) ooxmlCellToOpenXML :: PandocMonad m => ([Block] -> WS m [Content]) diff --git a/src/Text/Pandoc/Writers/LaTeX.hs b/src/Text/Pandoc/Writers/LaTeX.hs --- a/src/Text/Pandoc/Writers/LaTeX.hs +++ b/src/Text/Pandoc/Writers/LaTeX.hs @@ -127,6 +127,13 @@ let colwidth = if writerWrapText options == WrapAuto then Just $ writerColumns options else Nothing + docLangs <- catMaybes <$> + mapM (toLang . Just) (nubOrd (query (extract "lang") blocks)) + mblang <- toLang $ case getLang options meta of + Just l -> Just l + Nothing | null docLangs -> Nothing + | otherwise -> Just "en" + modify $ \s -> s{ stLang = mblang } metadata <- metaToContext options blockListToLaTeX (fmap chomp . inlineListToLaTeX) @@ -167,8 +174,8 @@ st <- get titleMeta <- stringToLaTeX TextString $ stringify $ docTitle meta authorsMeta <- mapM (stringToLaTeX TextString . stringify) $ docAuthors meta - docLangs <- catMaybes <$> - mapM (toLang . Just) (nubOrd (query (extract "lang") blocks)) + -- we need a default here since lang is used in template conditionals + let otherLangs = [l | l <- docLangs, mblang /= Just l] let hasStringValue x = isJust (getField x metadata :: Maybe (Doc Text)) let geometryFromMargins = mconcat $ intersperse ("," :: Doc Text) $ mapMaybe (\(x,y) -> @@ -178,12 +185,6 @@ ,("tmargin","margin-top") ,("bmargin","margin-bottom") ] - mblang <- toLang $ case getLang options meta of - Just l -> Just l - Nothing | null docLangs -> Nothing - | otherwise -> Just "en" - -- we need a default here since lang is used in template conditionals - let otherLangs = [l | l <- docLangs, mblang /= Just l] let dirs = query (extract "dir") blocks diff --git a/src/Text/Pandoc/Writers/LaTeX/Citation.hs b/src/Text/Pandoc/Writers/LaTeX/Citation.hs --- a/src/Text/Pandoc/Writers/LaTeX/Citation.hs +++ b/src/Text/Pandoc/Writers/LaTeX/Citation.hs @@ -15,6 +15,8 @@ import Data.Text (Text) import Data.Char (isPunctuation) +import Control.Monad.State (gets) +import Data.Maybe (fromMaybe) import qualified Data.Text as T import Text.Pandoc.Class.PandocMonad (PandocMonad) import Text.Pandoc.Definition @@ -22,7 +24,11 @@ import Text.DocLayout (Doc, brackets, empty, (<+>), text, isEmpty, literal, braces) import Text.Pandoc.Walk -import Text.Pandoc.Writers.LaTeX.Types ( LW ) +import Text.Pandoc.Writers.LaTeX.Types ( LW, WriterState(stLang) ) +import Text.Pandoc.Citeproc.Locator (parseLocator, LocatorInfo(..), + toLocatorMap) +import Citeproc.Types (Lang(..)) +import Citeproc.Locale (getLocale) citationsToNatbib :: PandocMonad m => ([Inline] -> LW m (Doc Text)) @@ -101,11 +107,9 @@ -> LW m (Doc Text) citeArgumentsList _inlineListToLaTeX (CiteGroup _ _ []) = return empty citeArgumentsList inlineListToLaTeX (CiteGroup pfxs sfxs ids) = do - pdoc <- inlineListToLaTeX pfxs - sdoc <- inlineListToLaTeX sfxs' - return $ optargs pdoc sdoc <> - braces (literal (T.intercalate "," (reverse ids))) - where sfxs' = stripLocatorBraces $ case sfxs of + mblang <- gets stLang + let sfxs' = removePageLabel mblang $ + stripLocatorBraces $ case sfxs of (Str t : r) -> case T.uncons t of Just (x, xs) | T.null xs @@ -113,10 +117,14 @@ | isPunctuation x -> Str xs : r _ -> sfxs _ -> sfxs - optargs pdoc sdoc = case (isEmpty pdoc, isEmpty sdoc) of + optargs pdoc sdoc = case (isEmpty pdoc, isEmpty sdoc) of (True, True ) -> empty (True, False) -> brackets sdoc (_ , _ ) -> brackets pdoc <> brackets sdoc + pdoc <- inlineListToLaTeX pfxs + sdoc <- inlineListToLaTeX sfxs' + return $ optargs pdoc sdoc <> + braces (literal (T.intercalate "," (reverse ids))) citeArguments :: PandocMonad m => ([Inline] -> LW m (Doc Text)) @@ -180,3 +188,17 @@ cid = citationId cit citationsToBiblatex _ _ = return empty + +-- | In natbib and biblatex, the label p. or pp. can be +-- omitted; ranges will be treated as page ranges by default. +-- See #9275. +removePageLabel :: Maybe Lang -> [Inline] -> [Inline] +removePageLabel mblang ils = + case mbLocinfo of + Just locinfo | locatorLabel locinfo == "page" + -> Str (locatorLoc locinfo) : ils' + _ -> ils + where + (mbLocinfo, ils') = parseLocator (toLocatorMap locale) ils + lang = fromMaybe (Lang "en" Nothing (Just "US") [] [] []) mblang + locale = either mempty id $ getLocale lang diff --git a/src/Text/Pandoc/Writers/LaTeX/Types.hs b/src/Text/Pandoc/Writers/LaTeX/Types.hs --- a/src/Text/Pandoc/Writers/LaTeX/Types.hs +++ b/src/Text/Pandoc/Writers/LaTeX/Types.hs @@ -11,6 +11,7 @@ ( WriterOptions (writerIncremental, writerTopLevelDivision) , TopLevelDivision (..) ) +import Citeproc.Types (Lang) -- | LaTeX writer type. The type constructor @m@ will typically be an -- instance of PandocMonad. @@ -50,6 +51,7 @@ , stEmptyLine :: Bool -- ^ true if no content on line , stHasCslRefs :: Bool -- ^ has a Div with class refs , stIsFirstInDefinition :: Bool -- ^ first block in a defn list + , stLang :: Maybe Lang -- ^ lang specified in metadata } startingState :: WriterOptions -> WriterState @@ -88,4 +90,5 @@ , stEmptyLine = True , stHasCslRefs = False , stIsFirstInDefinition = False + , stLang = Nothing } diff --git a/src/Text/Pandoc/Writers/Markdown.hs b/src/Text/Pandoc/Writers/Markdown.hs --- a/src/Text/Pandoc/Writers/Markdown.hs +++ b/src/Text/Pandoc/Writers/Markdown.hs @@ -590,16 +590,19 @@ | otherwise = "> " contents <- blockListToMarkdown opts blocks return $ prefixed leader contents <> blankline -blockToMarkdown' opts t@(Table _ blkCapt specs thead tbody tfoot) = do +blockToMarkdown' opts t@(Table (ident,_,_) blkCapt specs thead tbody tfoot) = do let (caption, aligns, widths, headers, rows) = toLegacyTable blkCapt specs thead tbody tfoot let numcols = maximum (length aligns :| length widths : map length (headers:rows)) caption' <- inlineListToMarkdown opts caption - let caption'' + let caption'' = if T.null ident + then caption' + else caption' <+> attrsToMarkdown opts (ident,[],[]) + let caption''' | null caption = blankline | isEnabled Ext_table_captions opts - = blankline $$ (": " <> caption') $$ blankline - | otherwise = blankline $$ caption' $$ blankline + = blankline $$ (": " <> caption'') $$ blankline + | otherwise = blankline $$ caption'' $$ blankline let hasSimpleCells = onlySimpleTableCells $ headers : rows let isSimple = hasSimpleCells && all (==0) widths let isPlainBlock (Plain _) = True @@ -652,7 +655,7 @@ literal . removeBlankLinesInHTML <$> writeHtml5String opts{ writerTemplate = Nothing } (Pandoc nullMeta [t]) | otherwise -> return (id, literal "[TABLE]") - return $ nst (tbl $$ caption'') $$ blankline + return $ nst (tbl $$ caption''') $$ blankline blockToMarkdown' opts (BulletList items) = do contents <- inList $ mapM (bulletListItemToMarkdown opts) items return $ (if isTightList items then vcat else vsep) diff --git a/src/Text/Pandoc/Writers/ODT.hs b/src/Text/Pandoc/Writers/ODT.hs --- a/src/Text/Pandoc/Writers/ODT.hs +++ b/src/Text/Pandoc/Writers/ODT.hs @@ -14,7 +14,8 @@ module Text.Pandoc.Writers.ODT ( writeODT ) where import Codec.Archive.Zip import Control.Monad.Except (catchError, throwError) -import Control.Monad.State.Strict +import Control.Monad.State.Strict (StateT, evalStateT, gets, modify, lift) +import Control.Monad (MonadPlus(mplus)) import qualified Data.ByteString.Lazy as B import Data.Maybe (fromMaybe) import Data.Generics (everywhere', mkT) @@ -48,6 +49,7 @@ import Text.TeXMath import qualified Text.XML.Light as XL import Network.URI (parseRelativeReference, URI(uriPath)) +import Skylighting newtype ODTState = ODTState { stEntries :: [Entry] } @@ -187,29 +189,56 @@ -- make sure mimetype is first let mimetypeEntry = toEntry "mimetype" epochtime $ fromStringLazy "application/vnd.oasis.opendocument.text" - archive'' <- updateStyleWithLang lang + archive'' <- updateStyle opts lang $ addEntryToArchive mimetypeEntry $ addEntryToArchive metaEntry archive' return $ fromArchive archive'' -updateStyleWithLang :: PandocMonad m => Maybe Lang -> Archive -> O m Archive -updateStyleWithLang Nothing arch = return arch -updateStyleWithLang (Just lang) arch = do +updateStyle :: forall m . PandocMonad m + => WriterOptions -> Maybe Lang -> Archive -> O m Archive +updateStyle opts mbLang arch = do epochtime <- floor `fmap` lift P.getPOSIXTime - entries <- mapM (\e -> if eRelativePath e == "styles.xml" - then case parseXMLElement - (toTextLazy (fromEntry e)) of - Left msg -> throwError $ - PandocXMLError "styles.xml" msg - Right d -> return $ - toEntry "styles.xml" epochtime - ( fromTextLazy - . TL.fromStrict - . ppTopElement - . addLang lang $ d ) - else return e) (zEntries arch) + let goEntry :: Entry -> O m Entry + goEntry e + | eRelativePath e == "styles.xml" + = case parseXMLElement (toTextLazy (fromEntry e)) of + Left msg -> throwError $ PandocXMLError "styles.xml" msg + Right d -> return $ + toEntry "styles.xml" epochtime + ( fromTextLazy + . TL.fromStrict + . showTopElement + . maybe id addLang mbLang + . transformElement (\qn -> qName qn == "styles" && + qPrefix qn == Just "office" ) + (maybe id addHlStyles (writerHighlightStyle opts)) + $ d ) + | otherwise = pure e + entries <- mapM goEntry (zEntries arch) return arch{ zEntries = entries } +addHlStyles :: Style -> Element -> Element +addHlStyles sty el = + el{ elContent = filter (not . isHlStyle) (elContent el) ++ + styleToOpenDocument sty } + where + isHlStyle (Elem e) = "Tok" `T.isSuffixOf` (qName (elName e)) + isHlStyle _ = False + +-- top-down search +transformElement :: (QName -> Bool) + -> (Element -> Element) + -> Element + -> Element +transformElement g f el + | g (elName el) + = f el + | otherwise + = el{ elContent = map go (elContent el) } + where + go (Elem e) = Elem (transformElement g f e) + go x = x + -- TODO FIXME avoid this generic traversal! addLang :: Lang -> Element -> Element addLang lang = everywhere' (mkT updateLangAttr) @@ -304,3 +333,36 @@ inTags False "config:config-item" [("config:name", "IsTextMode") ,("config:type", "boolean")] $ text $ if isTextMode then "true" else "false") + +styleToOpenDocument :: Style -> [Content] +styleToOpenDocument style = map (Elem . toStyle) alltoktypes + where alltoktypes = enumFromTo KeywordTok NormalTok + styleName x = + case T.break (== ':') x of + (b, a) | T.null a -> QName x Nothing (Just "style") + | otherwise -> QName (T.drop 1 a) Nothing (Just b) + styleAttr (x, y) = Attr (styleName x) y + styleAttrs = map styleAttr + styleElement x attrs cs = + Element (styleName x) (styleAttrs attrs) cs Nothing + toStyle toktype = + styleElement "style" + [("name", tshow toktype), ("family", "text")] + [Elem (styleElement "text-properties" + (tokColor toktype ++ tokBgColor toktype ++ + [("fo:font-style", "italic") | + tokFeature tokenItalic toktype ] ++ + [("fo:font-weight", "bold") | + tokFeature tokenBold toktype ] ++ + [("style:text-underline-style", "solid") | + tokFeature tokenUnderline toktype ]) + [])] + tokStyles = tokenStyles style + tokFeature f toktype = maybe False f $ Map.lookup toktype tokStyles + tokColor toktype = + maybe [] (\c -> [("fo:color", T.pack (fromColor c))]) + ((tokenColor =<< Map.lookup toktype tokStyles) + `mplus` defaultColor style) + tokBgColor toktype = + maybe [] (\c -> [("fo:background-color", T.pack (fromColor c))]) + (tokenBackground =<< Map.lookup toktype tokStyles) diff --git a/src/Text/Pandoc/Writers/OPML.hs b/src/Text/Pandoc/Writers/OPML.hs --- a/src/Text/Pandoc/Writers/OPML.hs +++ b/src/Text/Pandoc/Writers/OPML.hs @@ -35,9 +35,9 @@ else Nothing meta' = B.setMeta "date" (B.str $ convertDate $ docDate meta) meta metadata <- metaToContext opts - (fmap literal . writeMarkdown def . Pandoc nullMeta) + (fmap literal . writeMarkdown' opts . Pandoc nullMeta) (\ils -> literal . T.stripEnd <$> - writeMarkdown def (Pandoc nullMeta [Plain ils])) + writeMarkdown' opts (Pandoc nullMeta [Plain ils])) meta' let blocks' = makeSections False (Just 1) blocks main <- render colwidth . vcat <$> @@ -49,6 +49,11 @@ Nothing -> main Just tpl -> render colwidth $ renderTemplate tpl context +writeMarkdown' :: PandocMonad m => WriterOptions -> Pandoc -> m Text +writeMarkdown' opts = writeMarkdown def{ writerWrapText = writerWrapText opts + , writerColumns = writerColumns opts + , writerExtensions = pandocExtensions + } writeHtmlInlines :: PandocMonad m => [Inline] -> m Text writeHtmlInlines ils = @@ -71,7 +76,7 @@ htmlIls <- writeHtmlInlines title md <- if null blocks then return mempty - else writeMarkdown def $ Pandoc nullMeta blocks + else writeMarkdown' opts $ Pandoc nullMeta blocks let attrs = ("text", htmlIls) : [("_note", T.stripEnd md) | not (null blocks)] rest' <- vcat <$> mapM (blockToOPML opts) rest diff --git a/src/Text/Pandoc/Writers/OpenDocument.hs b/src/Text/Pandoc/Writers/OpenDocument.hs --- a/src/Text/Pandoc/Writers/OpenDocument.hs +++ b/src/Text/Pandoc/Writers/OpenDocument.hs @@ -15,7 +15,7 @@ -} module Text.Pandoc.Writers.OpenDocument ( writeOpenDocument ) where import Control.Arrow ((***), (>>>)) -import Control.Monad (unless, liftM, MonadPlus(mplus)) +import Control.Monad (unless, liftM) import Control.Monad.State.Strict ( StateT(..), modify, gets, lift ) import Data.Char (chr) import Data.Foldable (find) @@ -44,8 +44,7 @@ import Text.Pandoc.XML import Text.Printf (printf) import Text.Pandoc.Highlighting (highlight) -import Skylighting -import qualified Data.Map as M +import Skylighting (FormatOptions(..), SourceLine, Token) -- | Auxiliary function to convert Plain block to Para. plainToPara :: Block -> Block @@ -268,11 +267,9 @@ [("style:name", "L" <> tshow n)] (vcat l) let listStyles = map listStyle (stListStyles s) let automaticStyles = vcat $ reverse $ styles ++ listStyles - let highlightingStyles = maybe mempty styleToOpenDocument (writerHighlightStyle opts) let context = defField "body" body . defField "toc" (writerTableOfContents opts) . defField "toc-depth" (tshow $ writerTOCDepth opts) - . defField "highlighting-styles" highlightingStyles . defField "automatic-styles" automaticStyles $ metadata return $ render colwidth $ @@ -922,24 +919,3 @@ Left _ -> do report $ InvalidLang l action - -styleToOpenDocument :: Style -> Doc Text -styleToOpenDocument style = vcat (map toStyle alltoktypes) - where alltoktypes = enumFromTo KeywordTok NormalTok - toStyle toktype = inTags True "style:style" [("style:name", tshow toktype), - ("style:family", "text")] $ - selfClosingTag "style:text-properties" - (tokColor toktype ++ tokBgColor toktype ++ - [("fo:font-style", "italic") | - tokFeature tokenItalic toktype ] ++ - [("fo:font-weight", "bold") | - tokFeature tokenBold toktype ] ++ - [("style:text-underline-style", "solid") | - tokFeature tokenUnderline toktype ]) - tokStyles = tokenStyles style - tokFeature f toktype = maybe False f $ M.lookup toktype tokStyles - tokColor toktype = maybe [] (\c -> [("fo:color", T.pack (fromColor c))]) - $ (tokenColor =<< M.lookup toktype tokStyles) - `mplus` defaultColor style - tokBgColor toktype = maybe [] (\c -> [("fo:background-color", T.pack (fromColor c))]) - $ (tokenBackground =<< M.lookup toktype tokStyles) diff --git a/test/Tests/Writers/OOXML.hs b/test/Tests/Writers/OOXML.hs --- a/test/Tests/Writers/OOXML.hs +++ b/test/Tests/Writers/OOXML.hs @@ -45,6 +45,11 @@ (Comparison { mine = sort (elAttribs myElem) , good = sort (elAttribs goodElem) }))) + <|> (if length (elContent myElem) == length (elContent goodElem) + then Nothing + else Just + (ElemChildrenDiffer + (Comparison { mine = elContent myElem, good = elContent goodElem}))) <|> asum (zipWith compareXML (elContent myElem) (elContent goodElem)) compareXML (Text goodCData) (Text myCData) = (if cdVerbatim myCData == cdVerbatim goodCData @@ -60,6 +65,7 @@ data XMLDifference = ElemNamesDiffer (Comparison QName) | ElemAttributesDiffer (Comparison [Attr]) + | ElemChildrenDiffer (Comparison [Content]) | CDatasDiffer (Comparison CData) | CRefsDiffer (Comparison String) | OtherContentsDiffer (Comparison Content) diff --git a/test/command/6792.md b/test/command/6792.md --- a/test/command/6792.md +++ b/test/command/6792.md @@ -21,101 +21,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/command/8256.md b/test/command/8256.md --- a/test/command/8256.md +++ b/test/command/8256.md @@ -15,101 +15,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/command/9275.md b/test/command/9275.md new file mode 100644 --- /dev/null +++ b/test/command/9275.md @@ -0,0 +1,18 @@ +``` +% pandoc -t latex --biblatex +[@scott2000, p. 33] +[@scott2000, pp. 33-34 and elsewhere; @scott2001, ch. 4] +^D +\autocite[33]{scott2000} \autocites[33-34 and +elsewhere]{scott2000}[ch.~4]{scott2001} + +``` + +``` +% pandoc -t latex --biblatex -Mlang=de +[@scott2000, p. 33] +[@scott2000, S. 33] +^D +\autocite[p.~33]{scott2000} \autocite[33]{scott2000} + +``` diff --git a/test/command/9279.md b/test/command/9279.md new file mode 100644 --- /dev/null +++ b/test/command/9279.md @@ -0,0 +1,131 @@ +``` +% pandoc -f org -t native +#+LABEL: tbl:Cosasexample +#+CAPTION: Cosas ++-------+-------+ +| cosas | cosas | +| cosas | cosas | ++=======+=======+ +| cosas | cosas | +| cosas | cosas | ++-------+-------+ +^D +[ Table + ( "tbl:Cosasexample" , [] , [] ) + (Caption Nothing [ Plain [ Str "Cosas" ] ]) + [ ( AlignDefault , ColWidth 0.1111111111111111 ) + , ( AlignDefault , ColWidth 0.1111111111111111 ) + ] + (TableHead + ( "" , [] , [] ) + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "cosas" , SoftBreak , Str "cosas" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "cosas" , SoftBreak , Str "cosas" ] ] + ] + ]) + [ TableBody + ( "" , [] , [] ) + (RowHeadColumns 0) + [] + [ Row + ( "" , [] , [] ) + [ Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "cosas" , SoftBreak , Str "cosas" ] ] + , Cell + ( "" , [] , [] ) + AlignDefault + (RowSpan 1) + (ColSpan 1) + [ Plain [ Str "cosas" , SoftBreak , Str "cosas" ] ] + ] + ] + ] + (TableFoot ( "" , [] , [] ) []) +] +``` + +``` +% pandoc -f org -t markdown +#+LABEL: tbl:Cosasexample +#+CAPTION: Cosas ++-------+-------+ +| cosas | cosas | +| cosas | cosas | ++=======+=======+ +| cosas | cosas | +| cosas | cosas | ++-------+-------+ +^D + --------------- + cosas cosas + cosas cosas + ------- ------- + cosas cosas + cosas cosas + + --------------- + + : Cosas {#tbl:Cosasexample} + +``` + +``` +% pandoc -f org -t markdown +#+LABEL: tbl:Cosasexample ++-------+-------+ +| cosas | cosas | +| cosas | cosas | ++=======+=======+ +| cosas | cosas | +| cosas | cosas | ++-------+-------+ +^D + --------------- + cosas cosas + cosas cosas + ------- ------- + cosas cosas + cosas cosas + + --------------- + +``` + +``` +% pandoc -f org -t markdown +#+CAPTION: Cosas ++-------+-------+ +| cosas | cosas | +| cosas | cosas | ++=======+=======+ +| cosas | cosas | +| cosas | cosas | ++-------+-------+ +^D + --------------- + cosas cosas + cosas cosas + ------- ------- + cosas cosas + cosas cosas + + --------------- + + : Cosas + +``` diff --git a/test/command/9293.md b/test/command/9293.md new file mode 100644 --- /dev/null +++ b/test/command/9293.md @@ -0,0 +1,29 @@ +``` +% pandoc -f mediawiki -t native +* Linearity in the first argument: +*:\begin{align} +\langle a \mathbf u, \mathbf v\rangle &= a \langle \mathbf u, \mathbf v\rangle. \\ +\langle \mathbf u + \mathbf v, \mathbf w\rangle &= \langle \mathbf u, \mathbf w\rangle+ \langle \mathbf v, \mathbf w\rangle. +\end{align} +^D +[ BulletList + [ [ Plain + [ Str "Linearity" + , Space + , Str "in" + , Space + , Str "the" + , Space + , Str "first" + , Space + , Str "argument:" + ] + , Para + [ Math + DisplayMath + "\\begin{align}\n\\langle a \\mathbf u, \\mathbf v\\rangle &= a \\langle \\mathbf u, \\mathbf v\\rangle. \\\\\n\\langle \\mathbf u + \\mathbf v, \\mathbf w\\rangle &= \\langle \\mathbf u, \\mathbf w\\rangle+ \\langle \\mathbf v, \\mathbf w\\rangle.\n\\end{align}" + ] + ] + ] +] +``` diff --git a/test/docx/golden/block_quotes.docx b/test/docx/golden/block_quotes.docx Binary files a/test/docx/golden/block_quotes.docx and b/test/docx/golden/block_quotes.docx differ diff --git a/test/docx/golden/codeblock.docx b/test/docx/golden/codeblock.docx Binary files a/test/docx/golden/codeblock.docx and b/test/docx/golden/codeblock.docx differ diff --git a/test/docx/golden/comments.docx b/test/docx/golden/comments.docx Binary files a/test/docx/golden/comments.docx and b/test/docx/golden/comments.docx differ diff --git a/test/docx/golden/custom_style_no_reference.docx b/test/docx/golden/custom_style_no_reference.docx Binary files a/test/docx/golden/custom_style_no_reference.docx and b/test/docx/golden/custom_style_no_reference.docx differ diff --git a/test/docx/golden/custom_style_preserve.docx b/test/docx/golden/custom_style_preserve.docx Binary files a/test/docx/golden/custom_style_preserve.docx and b/test/docx/golden/custom_style_preserve.docx differ diff --git a/test/docx/golden/custom_style_reference.docx b/test/docx/golden/custom_style_reference.docx Binary files a/test/docx/golden/custom_style_reference.docx and b/test/docx/golden/custom_style_reference.docx differ diff --git a/test/docx/golden/definition_list.docx b/test/docx/golden/definition_list.docx Binary files a/test/docx/golden/definition_list.docx and b/test/docx/golden/definition_list.docx differ diff --git a/test/docx/golden/document-properties-short-desc.docx b/test/docx/golden/document-properties-short-desc.docx Binary files a/test/docx/golden/document-properties-short-desc.docx and b/test/docx/golden/document-properties-short-desc.docx differ diff --git a/test/docx/golden/document-properties.docx b/test/docx/golden/document-properties.docx Binary files a/test/docx/golden/document-properties.docx and b/test/docx/golden/document-properties.docx differ diff --git a/test/docx/golden/headers.docx b/test/docx/golden/headers.docx Binary files a/test/docx/golden/headers.docx and b/test/docx/golden/headers.docx differ diff --git a/test/docx/golden/image.docx b/test/docx/golden/image.docx Binary files a/test/docx/golden/image.docx and b/test/docx/golden/image.docx differ diff --git a/test/docx/golden/inline_code.docx b/test/docx/golden/inline_code.docx Binary files a/test/docx/golden/inline_code.docx and b/test/docx/golden/inline_code.docx differ diff --git a/test/docx/golden/inline_formatting.docx b/test/docx/golden/inline_formatting.docx Binary files a/test/docx/golden/inline_formatting.docx and b/test/docx/golden/inline_formatting.docx differ diff --git a/test/docx/golden/inline_images.docx b/test/docx/golden/inline_images.docx Binary files a/test/docx/golden/inline_images.docx and b/test/docx/golden/inline_images.docx differ diff --git a/test/docx/golden/link_in_notes.docx b/test/docx/golden/link_in_notes.docx Binary files a/test/docx/golden/link_in_notes.docx and b/test/docx/golden/link_in_notes.docx differ diff --git a/test/docx/golden/links.docx b/test/docx/golden/links.docx Binary files a/test/docx/golden/links.docx and b/test/docx/golden/links.docx differ diff --git a/test/docx/golden/lists.docx b/test/docx/golden/lists.docx Binary files a/test/docx/golden/lists.docx and b/test/docx/golden/lists.docx differ diff --git a/test/docx/golden/lists_continuing.docx b/test/docx/golden/lists_continuing.docx Binary files a/test/docx/golden/lists_continuing.docx and b/test/docx/golden/lists_continuing.docx differ diff --git a/test/docx/golden/lists_div_bullets.docx b/test/docx/golden/lists_div_bullets.docx Binary files a/test/docx/golden/lists_div_bullets.docx and b/test/docx/golden/lists_div_bullets.docx differ diff --git a/test/docx/golden/lists_multiple_initial.docx b/test/docx/golden/lists_multiple_initial.docx Binary files a/test/docx/golden/lists_multiple_initial.docx and b/test/docx/golden/lists_multiple_initial.docx differ diff --git a/test/docx/golden/lists_restarting.docx b/test/docx/golden/lists_restarting.docx Binary files a/test/docx/golden/lists_restarting.docx and b/test/docx/golden/lists_restarting.docx differ diff --git a/test/docx/golden/nested_anchors_in_header.docx b/test/docx/golden/nested_anchors_in_header.docx Binary files a/test/docx/golden/nested_anchors_in_header.docx and b/test/docx/golden/nested_anchors_in_header.docx differ diff --git a/test/docx/golden/notes.docx b/test/docx/golden/notes.docx Binary files a/test/docx/golden/notes.docx and b/test/docx/golden/notes.docx differ diff --git a/test/docx/golden/raw-blocks.docx b/test/docx/golden/raw-blocks.docx Binary files a/test/docx/golden/raw-blocks.docx and b/test/docx/golden/raw-blocks.docx differ diff --git a/test/docx/golden/raw-bookmarks.docx b/test/docx/golden/raw-bookmarks.docx Binary files a/test/docx/golden/raw-bookmarks.docx and b/test/docx/golden/raw-bookmarks.docx differ diff --git a/test/docx/golden/table_one_row.docx b/test/docx/golden/table_one_row.docx Binary files a/test/docx/golden/table_one_row.docx and b/test/docx/golden/table_one_row.docx differ diff --git a/test/docx/golden/table_with_list_cell.docx b/test/docx/golden/table_with_list_cell.docx Binary files a/test/docx/golden/table_with_list_cell.docx and b/test/docx/golden/table_with_list_cell.docx differ diff --git a/test/docx/golden/tables-default-widths.docx b/test/docx/golden/tables-default-widths.docx Binary files a/test/docx/golden/tables-default-widths.docx and b/test/docx/golden/tables-default-widths.docx differ diff --git a/test/docx/golden/tables.docx b/test/docx/golden/tables.docx Binary files a/test/docx/golden/tables.docx and b/test/docx/golden/tables.docx differ diff --git a/test/docx/golden/tables_separated_with_rawblock.docx b/test/docx/golden/tables_separated_with_rawblock.docx Binary files a/test/docx/golden/tables_separated_with_rawblock.docx and b/test/docx/golden/tables_separated_with_rawblock.docx differ diff --git a/test/docx/golden/track_changes_deletion.docx b/test/docx/golden/track_changes_deletion.docx Binary files a/test/docx/golden/track_changes_deletion.docx and b/test/docx/golden/track_changes_deletion.docx differ diff --git a/test/docx/golden/track_changes_insertion.docx b/test/docx/golden/track_changes_insertion.docx Binary files a/test/docx/golden/track_changes_insertion.docx and b/test/docx/golden/track_changes_insertion.docx differ diff --git a/test/docx/golden/track_changes_move.docx b/test/docx/golden/track_changes_move.docx Binary files a/test/docx/golden/track_changes_move.docx and b/test/docx/golden/track_changes_move.docx differ diff --git a/test/docx/golden/track_changes_scrubbed_metadata.docx b/test/docx/golden/track_changes_scrubbed_metadata.docx Binary files a/test/docx/golden/track_changes_scrubbed_metadata.docx and b/test/docx/golden/track_changes_scrubbed_metadata.docx differ diff --git a/test/docx/golden/unicode.docx b/test/docx/golden/unicode.docx Binary files a/test/docx/golden/unicode.docx and b/test/docx/golden/unicode.docx differ diff --git a/test/docx/golden/verbatim_subsuper.docx b/test/docx/golden/verbatim_subsuper.docx Binary files a/test/docx/golden/verbatim_subsuper.docx and b/test/docx/golden/verbatim_subsuper.docx differ diff --git a/test/lhs-test.html b/test/lhs-test.html --- a/test/lhs-test.html +++ b/test/lhs-test.html @@ -231,9 +231,6 @@ code span.vs { color: #4070a0; } /* VerbatimString */ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */ -

lhs test

diff --git a/test/lhs-test.html+lhs b/test/lhs-test.html+lhs --- a/test/lhs-test.html+lhs +++ b/test/lhs-test.html+lhs @@ -231,9 +231,6 @@ code span.vs { color: #4070a0; } /* VerbatimString */ code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */ -

lhs test

diff --git a/test/writer.html5 b/test/writer.html5 --- a/test/writer.html5 +++ b/test/writer.html5 @@ -170,9 +170,6 @@ } .display.math{display: block; text-align: center; margin: 0.5rem auto;} -
diff --git a/test/writer.opendocument b/test/writer.opendocument --- a/test/writer.opendocument +++ b/test/writer.opendocument @@ -3,101 +3,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/writer.opml b/test/writer.opml --- a/test/writer.opml +++ b/test/writer.opml @@ -21,52 +21,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - +