Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
H
head.hackage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
4
Merge Requests
4
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Glasgow Haskell Compiler
head.hackage
Commits
b5814438
Commit
b5814438
authored
Dec 19, 2020
by
Ryan Scott
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'allow-pandoc' into 'master'
Remove pandoc from expected failures See merge request
!135
parents
dca612cf
e3b1755a
Pipeline
#30405
failed with stages
in 249 minutes and 7 seconds
Changes
3
Pipelines
33
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
55 deletions
+0
-55
ci/config.sh
ci/config.sh
+0
-1
patches/pandoc-2.11.2.patch
patches/pandoc-2.11.2.patch
+0
-54
patches/pandoc-2.11.3.1.patch
patches/pandoc-2.11.3.1.patch
+0
-0
No files found.
ci/config.sh
View file @
b5814438
...
...
@@ -80,7 +80,6 @@ case $version in
9.1.
*
)
# package ticket
broken
"pandoc"
19044
broken
"plots"
19042
;;
...
...
patches/pandoc-2.11.2.patch
deleted
100644 → 0
View file @
dca612cf
diff --git a/src/Text/Pandoc/Options.hs b/src/Text/Pandoc/Options.hs
index c7f1a56..371b774 100644
--- a/src/Text/Pandoc/Options.hs
+++ b/src/Text/Pandoc/Options.hs
@@ -314,6 +314,11 @@
defaultMathJaxURL = "https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-chtml-full.j
defaultKaTeXURL :: Text
defaultKaTeXURL = "https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.11.1/"
+-- Update documentation in doc/filters.md if this is changed.
+$(deriveJSON defaultOptions{ constructorTagModifier =
+ camelCaseStrToHyphenated
+ } ''TrackChanges)
+
-- Update documentation in doc/filters.md if this is changed.
$(deriveJSON defaultOptions ''ReaderOptions)
@@ -338,11 +343,6 @@
$(deriveJSON defaultOptions{ constructorTagModifier =
$(deriveJSON defaultOptions ''HTMLSlideVariant)
--- Update documentation in doc/filters.md if this is changed.
-$(deriveJSON defaultOptions{ constructorTagModifier =
- camelCaseStrToHyphenated
- } ''TrackChanges)
-
$(deriveJSON defaultOptions{ constructorTagModifier =
camelCaseStrToHyphenated
} ''WrapOption)
diff --git a/src/Text/Pandoc/Readers/Docx/Combine.hs b/src/Text/Pandoc/Readers/Docx/Combine.hs
index 46112af..dd17f2b 100644
--- a/src/Text/Pandoc/Readers/Docx/Combine.hs
+++ b/src/Text/Pandoc/Readers/Docx/Combine.hs
@@ -57,7 +57,7 @@
module Text.Pandoc.Readers.Docx.Combine ( smushInlines
)
where
-import Data.List
+import qualified Data.List as L
import Data.Bifunctor
import Data.Sequence ( ViewL (..), ViewR (..), viewl, viewr, spanr, spanl
, (><), (|>) )
@@ -135,9 +135,9 @@
combineSingletonInlines :: Inlines -> Inlines -> Inlines
combineSingletonInlines x y =
let (xfs, xs) = unstackInlines x
(yfs, ys) = unstackInlines y
- shared = xfs `intersect` yfs
- x_remaining = xfs \\ shared
- y_remaining = yfs \\ shared
+ shared = xfs `L.intersect` yfs
+ x_remaining = xfs L.\\ shared
+ y_remaining = yfs L.\\ shared
x_rem_attr = filter isAttrModifier x_remaining
y_rem_attr = filter isAttrModifier y_remaining
in
patches/pandoc-2.11.3.patch
→
patches/pandoc-2.11.3.
1.
patch
View file @
b5814438
File moved
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment