Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ms writer: fix definition lists so indent even when...

Browse source 
paragraph indent is set to 0 (as is the default).

Also ensure indent for display math that falls back
to TeX.
This commit is contained in:
John MacFarlane 2020-03-07 21:54:29 -08:00
parent 2ab83a56e6
commit 87875763c8
2 changed files with 43 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Text/Pandoc/Writers/Ms.hs
View file

@ -321,8 +321,9 @@ definitionListItemToMs opts (label, defs) = do
rest' <- liftM vcat $
mapM (\item -> blockToMs opts item) rest
first' <- blockToMs opts first
return $ first' $$ literal ".RS" $$ rest' $$ literal ".RE"
return $ nowrap (literal ".IP " <> doubleQuotes labelText) $$ contents
return $ first' $$ literal ".RS 3" $$ rest' $$ literal ".RE"
return $ nowrap (literal ".IP " <> doubleQuotes labelText <> " 3") $$
contents
-- | Convert list of Pandoc block elements to ms.
blockListToMs :: PandocMonad m
@ -400,7 +401,7 @@ inlineToMs opts (Math DisplayMath str) = do
case res of
Left il -> do
contents <- inlineToMs opts il
return $ cr <> literal ".RS" $$ contents $$ literal ".RE"
return $ cr <> literal ".RS 3" $$ contents $$ literal ".RE"
Right r -> return $
cr <> literal ".EQ" $$ literal r $$ literal ".EN" <> cr
inlineToMs _ il@(RawInline f str)

78
test/writer.ms
View file

@ -445,57 +445,57 @@ Definition Lists
.pdfhref M "definition-lists"
.LP
Tight using spaces:
.IP "\f[B]apple\f[R]"
.IP "\f[B]apple\f[R]" 3
red fruit
.RS
.RS 3
.RE
.IP "\f[B]orange\f[R]"
.IP "\f[B]orange\f[R]" 3
orange fruit
.RS
.RS 3
.RE
.IP "\f[B]banana\f[R]"
.IP "\f[B]banana\f[R]" 3
yellow fruit
.RS
.RS 3
.RE
.LP
Tight using tabs:
.IP "\f[B]apple\f[R]"
.IP "\f[B]apple\f[R]" 3
red fruit
.RS
.RS 3
.RE
.IP "\f[B]orange\f[R]"
.IP "\f[B]orange\f[R]" 3
orange fruit
.RS
.RS 3
.RE
.IP "\f[B]banana\f[R]"
.IP "\f[B]banana\f[R]" 3
yellow fruit
.RS
.RS 3
.RE
.LP
Loose:
.IP "\f[B]apple\f[R]"
.IP "\f[B]apple\f[R]" 3
red fruit
.RS
.RS 3
.RE
.IP "\f[B]orange\f[R]"
.IP "\f[B]orange\f[R]" 3
orange fruit
.RS
.RS 3
.RE
.IP "\f[B]banana\f[R]"
.IP "\f[B]banana\f[R]" 3
yellow fruit
.RS
.RS 3
.RE
.LP
Multiple blocks with italics:
.IP "\f[B]\f[BI]apple\f[B]\f[R]"
.IP "\f[B]\f[BI]apple\f[B]\f[R]" 3
red fruit
.RS
.RS 3
.PP
contains seeds, crisp, pleasant to taste
.RE
.IP "\f[B]\f[BI]orange\f[B]\f[R]"
.IP "\f[B]\f[BI]orange\f[B]\f[R]" 3
orange fruit
.RS
.RS 3
.IP
.nf
\f[C]
@ -509,48 +509,48 @@ orange block quote
.RE
.LP
Multiple definitions, tight:
.IP "\f[B]apple\f[R]"
.IP "\f[B]apple\f[R]" 3
red fruit
.RS
.RS 3
.RE
computer
.RS
.RS 3
.RE
.IP "\f[B]orange\f[R]"
.IP "\f[B]orange\f[R]" 3
orange fruit
.RS
.RS 3
.RE
bank
.RS
.RS 3
.RE
.LP
Multiple definitions, loose:
.IP "\f[B]apple\f[R]"
.IP "\f[B]apple\f[R]" 3
red fruit
.RS
.RS 3
.RE
computer
.RS
.RS 3
.RE
.IP "\f[B]orange\f[R]"
.IP "\f[B]orange\f[R]" 3
orange fruit
.RS
.RS 3
.RE
bank
.RS
.RS 3
.RE
.LP
Blank line after term, indented marker, alternate markers:
.IP "\f[B]apple\f[R]"
.IP "\f[B]apple\f[R]" 3
red fruit
.RS
.RS 3
.RE
computer
.RS
.RS 3
.RE
.IP "\f[B]orange\f[R]"
.IP "\f[B]orange\f[R]" 3
orange fruit
.RS
.RS 3
.IP " 1." 4
sublist
.IP " 2." 4