git.iko.soy/typeable/pandoc
on master help sign in
LaTeX Writer: Add support for customizable alignment of columns in beamer (#6331)

Add support for customizable alignment of columns in beamer. Closes #4805, closes #4150.

commit97fe2ea16cca643e4f9d3a77e39ad8c3a3ff01d5 authorandrebauer <bauerand@informatik.uni-marburg.de> dateSun 3 May 2020, 02:08 (6 years ago) parent0fafe9d
3 files changed+99−5
compare with master
unifiedsplit
MANUAL.txt+35 src/Text/Pandoc/Writers/LaTeX.hs+24−5 test/command/4805-beamer-columns-alignment.md+40
MANUAL.txt+35
@@ -5379,6 +5379,41 @@ containers with class `column` and a `width` attribute:
53795379 :::
53805380 ::::::::::::::
53815381
5382+### Additional columns attributes in beamer
5383+
5384+The div containers with classes `columns` and `column` can optionally have
5385+an `align` attribute.
5386+The class `columns` can optionally have a `totalwidth` attribute or an
5387+`onlytextwidth` class.
5388+
5389+ :::::::::::::: {.columns align=center totalwidth=8em}
5390+ ::: {.column width="40%"}
5391+ contents...
5392+ :::
5393+ ::: {.column width="60%" align=bottom}
5394+ contents...
5395+ :::
5396+ ::::::::::::::
5397+
5398+The `align` attributes on `columns` and `column` can be used with the
5399+values `top`, `top-baseline`, `center` and `bottom` to vertically align
5400+the columns. It defaults to `top` in `columns`.
5401+
5402+The `totalwidth` attribute limits the width of the columns to the given value.
5403+
5404+ :::::::::::::: {.columns align=top .onlytextwidth}
5405+ ::: {.column width="40%" align=center}
5406+ contents...
5407+ :::
5408+ ::: {.column width="60%"}
5409+ contents...
5410+ :::
5411+ ::::::::::::::
5412+
5413+The class `onlytextwidth` sets the `totalwidth` to `\textwidth`.
5414+
5415+See Section 12.7 of the [Beamer User's Guide] for more details.
5416+
53825417## Frame attributes in beamer
53835418
53845419Sometimes it is necessary to add the LaTeX `[fragile]` option to
src/Text/Pandoc/Writers/LaTeX.hs+24−5
@@ -1031,6 +1031,14 @@ sectionHeader classes ident level lst = do
10311031 braces txtNoNotes
10321032 else empty
10331033
1034+mapAlignment :: Text -> Text
1035+mapAlignment a = case a of
1036+ "top" -> "T"
1037+ "top-baseline" -> "t"
1038+ "bottom" -> "b"
1039+ "center" -> "c"
1040+ _ -> a
1041+
10341042wrapDiv :: PandocMonad m => Attr -> Doc Text -> LW m (Doc Text)
10351043wrapDiv (_,classes,kvs) t = do
10361044 beamer <- gets stBeamer
@@ -1038,14 +1046,25 @@ wrapDiv (_,classes,kvs) t = do
10381046 lang <- toLang $ lookup "lang" kvs
10391047 let wrapColumns = if beamer && "columns" `elem` classes
10401048 then \contents ->
1041− inCmd "begin" "columns" <> brackets "T"
1042− $$ contents
1043− $$ inCmd "end" "columns"
1049+ let valign = maybe "T" mapAlignment (lookup "align" kvs)
1050+ totalwidth = maybe [] (\x -> ["totalwidth=" <> x])
1051+ (lookup "totalwidth" kvs)
1052+ onlytextwidth = filter ((==) "onlytextwidth") classes
1053+ options = text $ T.unpack $ T.intercalate "," $
1054+ valign : totalwidth ++ onlytextwidth
1055+ in inCmd "begin" "columns" <> brackets options
1056+ $$ contents
1057+ $$ inCmd "end" "columns"
10441058 else id
10451059 wrapColumn = if beamer && "column" `elem` classes
10461060 then \contents ->
1047− let w = maybe "0.48" fromPct (lookup "width" kvs)
1048− in inCmd "begin" "column" <>
1061+ let valign =
1062+ maybe ""
1063+ (brackets . text . T.unpack . mapAlignment)
1064+ (lookup "align" kvs)
1065+ w = maybe "0.48" fromPct (lookup "width" kvs)
1066+ in inCmd "begin" "column" <>
1067+ valign <>
10491068 braces (literal w <> "\\textwidth")
10501069 $$ contents
10511070 $$ inCmd "end" "column"
test/command/4805-beamer-columns-alignment.mdnew file+40
@@ -0,0 +1,40 @@
1+```
2+pandoc -t beamer
3+:::: { .columns }
4+::: { .column align=center }
5+:::
6+::: { .column align=bottom }
7+:::
8+::::
9+
10+:::: { .columns align=bottom .onlytextwidth }
11+::: { .column align=top }
12+:::
13+::: { .column align=top-baseline }
14+:::
15+::::
16+
17+:::: { .columns totalwidth=7em }
18+::::
19+^D
20+\begin{frame}
21+\begin{columns}[T]
22+\begin{column}[c]{0.48\textwidth}
23+\end{column}
24+
25+\begin{column}[b]{0.48\textwidth}
26+\end{column}
27+\end{columns}
28+
29+\begin{columns}[b,onlytextwidth]
30+\begin{column}[T]{0.48\textwidth}
31+\end{column}
32+
33+\begin{column}[t]{0.48\textwidth}
34+\end{column}
35+\end{columns}
36+
37+\begin{columns}[T,totalwidth=7em]
38+\end{columns}
39+\end{frame}
40+```