aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-03-24 21:36:04 +0100
committerJohn MacFarlane <jgm@berkeley.edu>2017-03-24 22:15:46 +0100
commitaf57de0b277b26cc839a1c3862a2381f3a35986d (patch)
treeb371016adf31b95aed272550dffd91577dbb4885
parent1e13e98ecfba2d78a88ba42bb54c8cdc15929e2d (diff)
downloadpandoc-af57de0b277b26cc839a1c3862a2381f3a35986d.tar.gz
default.ms: Add settings for document variables like width.
-rw-r--r--Makefile2
-rw-r--r--data/templates/default.ms31
-rw-r--r--test/writer.ms32
3 files changed, 60 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2f6145da7..ef68819ef 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ sourcefiles=$(shell find pandoc.hs src test -name '*.hs')
BRANCH?=master
quick:
- stack install --flag 'pandoc:embed_data_files' --fast --test --test-arguments='-j4 --hide-successes'
+ stack install --flag 'pandoc:embed_data_files' --fast --test --test-arguments='-j4 --hide-successes $(TESTARGS)'
full:
stack install --flag 'pandoc:embed_data_files' --test --test-arguments='-j4' --pedantic
diff --git a/data/templates/default.ms b/data/templates/default.ms
index f5cd73496..6001d81b0 100644
--- a/data/templates/default.ms
+++ b/data/templates/default.ms
@@ -1,5 +1,5 @@
+.\" **** Custom macro definitions *********************************
.mso www.tmac
-.\" **** Custom macro definitions ****
.\" * Super/subscript
.\" (https://lists.gnu.org/archive/html/groff/2012-07/msg00046.html)
.ds { \v'-0.3m'\\s[\\n[.s]*9u/12u]
@@ -12,7 +12,32 @@
.ce
\l'20'
..
-.\" **********************************
+.\" **** Settings *************************************************
+.\" text width
+.nr LL 5.5i
+.\" left margin
+.nr PO 1.25i
+.\" top margin
+.nr HM 1.25in
+.\" bottom margin
+.nr FM 1.25in
+.\" header/footer width
+.nr LT \n[LL]
+.\" point size (pt x 1000)
+.nr PS 10000
+.\" line height (pt x 1000)
+.nr VS 12000
+.\" font family: A, BM, H, HN, N, P, T, ZCM
+.fam T
+.\" paragraph indent
+.nr PI 0
+.\" interparagraph space
+.nr PD 0.33v
+.\" footnote width
+.nr FL \n[LL]
+.\" footnote point size
+.nr FPS (\n[PS] - 2000)
+.\" ***************************************************************
$if(adjusting)$
.ad $adjusting$
$endif$
@@ -48,6 +73,8 @@ $endfor$
$for(include-before)$
$include-before$
$endfor$
+.\" 1 column (use .2C for two column)
+.1C
$body$
$if(toc)$
$toc$
diff --git a/test/writer.ms b/test/writer.ms
index 223fbd525..391223540 100644
--- a/test/writer.ms
+++ b/test/writer.ms
@@ -1,4 +1,5 @@
-.\" **** Custom macro definitions ****
+.\" **** Custom macro definitions *********************************
+.mso www.tmac
.\" * Super/subscript
.\" (https://lists.gnu.org/archive/html/groff/2012-07/msg00046.html)
.ds { \v'-0.3m'\\s[\\n[.s]*9u/12u]
@@ -11,7 +12,32 @@
.ce
\l'20'
..
-.\" **********************************
+.\" **** Settings *************************************************
+.\" text width
+.nr LL 5.5i
+.\" left margin
+.nr PO 1.25i
+.\" top margin
+.nr HM 1.25in
+.\" bottom margin
+.nr FM 1.25in
+.\" header/footer width
+.nr LT \n[LL]
+.\" point size (pt x 1000)
+.nr PS 10000
+.\" line height (pt x 1000)
+.nr VS 12000
+.\" font family: A, BM, H, HN, N, P, T, ZCM
+.fam T
+.\" paragraph indent
+.nr PI 0
+.\" interparagraph space
+.nr PD 0.33v
+.\" footnote width
+.nr FL \n[LL]
+.\" footnote point size
+.nr FPS (\n[PS] - 2000)
+.\" ***************************************************************
.hy
.EQ
delim ||
@@ -23,6 +49,8 @@ John MacFarlane
.AU
Anonymous
.ND "July 17, 2006"
+.\" 1 column (use .2C for two column)
+.1C
.LP
This is a set of tests for pandoc.
Most of them are adapted from