[groff] 01/01: Updated example files for 2.1-a

[Peter Schaffter]

PTPi pushed a commit to branch master
in repository groff.

commit 72c5d994c4de3ae41c7d026ddcc761fc7293453f
Author: Peter Schaffter <address@hidden>
Date:   Tue Apr 28 12:43:09 2015 -0400

    Updated example files for 2.1-a
---
 contrib/mom/examples/mom-pdf.mom     |    7 ++-
 contrib/mom/examples/sample_docs.mom |   17 +++++---
 contrib/mom/examples/typesetting.mom |   74 +++++++++++++++++-----------------
 3 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/contrib/mom/examples/mom-pdf.mom b/contrib/mom/examples/mom-pdf.mom
index b972c69..0749f41 100644
--- a/contrib/mom/examples/mom-pdf.mom
+++ b/contrib/mom/examples/mom-pdf.mom
@@ -116,8 +116,8 @@ If not, see:
 .char \[-Tpdf]            \*[BD]-Tpdf\*[PREV]
 .char \[-Tps]             \*[BD]-Tps\*[PREV]
 .\" Strings for inline code
-.ds cod  "\E*[CODE]\&\E*[COND]
-.ds codx "\E*[CONDX]\E*[CODE off]\&
+.ds cod  \E*[CODE]\&\E*[COND]
+.ds codx \E*[CONDX]\E*[CODE off]\&
 .\" Paragraph spacing
 .de PP2
 . ALD .3v
@@ -128,6 +128,7 @@ If not, see:
 . QUOTE
 . nop \*[COND]\\$*\*[CONDX]
 . QUOTE OFF
+. sp -\\n[#SHIM]u
 ..
 .\" Note box
 .de BOX-NOTE
@@ -618,7 +619,7 @@ the output through \[ps2pdf]\*[B]
 .FLOAT
 .QUAD LEFT
 .BR_AT_LINE_KERN
-.IQ
+.IL -2P
 .BOX-NOTE (\n[.l]u-6P) 3P
 .EW .3
 \*[BD]Note:\*[PREV] Owing to a known bug, PDF files piped
diff --git a/contrib/mom/examples/sample_docs.mom 
b/contrib/mom/examples/sample_docs.mom
index 8c06262..c2cb79a 100644
--- a/contrib/mom/examples/sample_docs.mom
+++ b/contrib/mom/examples/sample_docs.mom
@@ -81,13 +81,13 @@
 .DOC_COVER_TITLE_STYLE \
   SIZE +8 \
   SMALLCAPS \
-  UNDERLINE 1 3p
+  UNDERLINE 1 3p 
 .DOC_COVER_SUBTITLE_STYLE \
   FONT I \
-  SIZE +3 \
+  SIZE +2 \
   LEAD 18 \
-  SPACE .5v
-.DOC_COVER_COPYRIGHT_SIZE +.5
+  SPACE .75v
+.DOC_COVER_COPYRIGHT_SIZE -.5
 \#
 .COVER_TITLE_SIZE +5
 .COVER_ATTRIBUTE_STYLE \
@@ -99,7 +99,7 @@
 .COVER_DOCTYPE_STYLE \
   SIZE +4 \
   UNDERLINE DOUBLE 1
-.COVER_COPYRIGHT_SIZE +.5
+.COVER_COPYRIGHT_SIZE -.5
 \#
 \# Here we style the docheader a bit.
 \#
@@ -280,11 +280,11 @@ nonumy eirmod tempor invidunt ut labore et do\%lo\%re 
magna.
 \#
 \# Style the title page
 \#
-.COVER_CHAPTER_SIZE +3
+.COVER_CHAPTER_SIZE +6
 .COVER_CHAPTER_TITLE_STYLE \
   SIZE +5 \
   SPACE .25v
-.COVER_MISC_SIZE +.5
+.COVER_MISC_SIZE -.25
 \#
 \# What goes on the title page
 \#
@@ -292,6 +292,9 @@ nonumy eirmod tempor invidunt ut labore et do\%lo\%re magna.
 \#
 \# Begin the document
 \#
+.CHAPTER_SIZE +3.5
+.CHAPTER_TITLE_SIZE +5
+.CHAPTER_TITLE_SPACE +3p
 .START
 .EPIGRAPH BLOCK
 Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam
diff --git a/contrib/mom/examples/typesetting.mom 
b/contrib/mom/examples/typesetting.mom
index 6965da3..0ed2d46 100644
--- a/contrib/mom/examples/typesetting.mom
+++ b/contrib/mom/examples/typesetting.mom
@@ -1,6 +1,5 @@
-.\" -*- mode: troff; coding: utf-8; -*-
-.
-\# Copyright (C) 2004-2014  Free Software Foundation, Inc.
+\# Copyright 2004, 2005, 2006, 2009, 2010, 2011, 2012
+\# Free Software Foundation, Inc.
 \#
 \# Copying and distribution of this file, with or without modification,
 \# are permitted in any medium without royalty provided the copyright
@@ -37,7 +36,7 @@
 .SP |1i-1v     \" Advance 1 inch from top of paper to first baseline
 Example 1\*[BU 2]:
 .ALD .25v      \" Advance an extra 1/4 linespace
-.UNDERSCORE 3.75p "T\*[BU 4]asting notes using padding, string tabs \
+.UNDERSCORE 3.5p "T\*[BU 4]asting notes using padding, string tabs \
 and multi-columns"
 \#
 .SP            \" Add an extra line space
@@ -82,27 +81,27 @@ and multi-columns"
 \#
 .TAB 1                 \" Notice that this tab gets set line-for-line
 \*[IT]Peelee Island    \" Set italic
-\*[PREV]Gewürztraminer \" Revert to former font (roman)
+\*[PREV]Gew�rztraminer \" Revert to former font (roman)
 2000
 (Canada)
 .MCR           \" Return to top of column
 .TAB 2         \" Call tab 2; in multi-column mode, don't use .TN
-Jaune pâle.
+Jaune p�le.
 .MCR
 .TB 3          \" Notice that from here on, we use the alias TB instead of TAB
-Frais, fruité, ci\%tronné, arômes fortes de lichee et de fruits
+Frais, fruit�, ci\%tronn�, ar�mes fortes de lichee et de fruits
 tropicaux.
 .MCR
 .TB 4
-Doux, fruité, bien équilibré avec une bonne acidité.
+Doux, fruit�, bien �quilibr� avec une bonne acidit�.
 .MCR
 .TB 5
-Bon apéro.  Servir avec des plats
+Bon ap�ro.  Servir avec des plats
 .RW .1         \" Reduce Whitespace between letters to tighten this line
 indiens ou \%chinois.
 .RW 0          \" Back to normal spacing between letters
 .BR
-Excellent rapport qualité/prix.
+Excellent rapport qualit�/prix.
 .MCX 8p        \" Multi-column mode off; advance an extra 8 points
 .MCO           \" Re-invoke multi-columns for next wine description
 .TB 1
@@ -112,11 +111,11 @@ Excellent rapport qualité/prix.
 (Uraguay)
 .MCR
 .TB 2
-Rubis foncé, vio\%lacée, presque opaque.
+Rubis fonc�, vio\%lac�e, presque opaque.
 .MCR
 .TB 3
-Belles arômes de fruits foncés (prunes, cerises noires, cassis).
-Odeurs tertiares de cuir, cèdre, violets, eucalyptus, avec une trace
+Belles ar�mes de fruits fonc�s (prunes, cerises noires, cassis).
+Odeurs tertiares de cuir, c�dre, violets, eucalyptus, avec une trace
 exotique de Band-Aid*\*[BU 12].
 \#
 \# The \*[BU 12], above, pulls the period back so that it falls
@@ -125,11 +124,11 @@ exotique de Band-Aid*\*[BU 12].
 \#
 .MCR
 .TB 4
-Très rond, tannins mûres et veloutés, avec un long finis fruité et
+Tr�s rond, tannins m�res et velout�s, avec un long finis fruit� et
 doucement alcoolique.
 .MCR
 .TB 5
-Superbe\|!  Une aubaine à ne pas manquer.  Prêt à boire maintenant.
+Superbe\|!  Une aubaine � ne pas manquer.  Pr�t � boire maintenant.
 .MCX 1v  \" Multi-columns off; advance an extra linespace
 \#
 \# Now, an example of a hanging indent.  This is excessively fussy
@@ -194,7 +193,7 @@ itself around the word "Massaging".  We circumvent this by 
using the
 groff inline escapes \[lq] and \[rq] (leftquote and rightquote).
 .COMMENT OFF
 \#
-.UNDERSCORE 3.75p "\[lq]Massaging\[rq] \*[BCK 1p]a passage of rag right text"
+.UNDERSCORE 3.5p "\[lq]Massaging\[rq] \*[BCK 1p]a passage of rag right text"
 .SP            \" Add an extra linespace
 \#
 .PT_SIZE 12.5
@@ -298,12 +297,12 @@ done the wrong.
 \#
 Example 3:
 .ALD .25v
-.UNDERSCORE 3.75p "A \*[BU2]recipe for enumerated lists using indents"
-.SP .75v        \" Add an extra half line space
-.FAM      T    \" New Century Schoolbook family
+.UNDERSCORE 3.5p "A \*[BU2]recipe for enumerated lists using indents"
+.SP .5v        \" Add an extra half line space
+.FAM      N    \" New Century Schoolbook family
 .FT       R
-.PT_SIZE 12
-.LS      14
+.PT_SIZE 11
+.LS      13
 .HY            \" Turn hyphenation back on
 .JUSTIFY       \" Justify text
 This example demonstrates the use of left and hanging indents for
@@ -318,7 +317,7 @@ to use (string) tabs, as seen in Example 4.
 enumerated lists automatically.  These examples merely show hanging
 indents and string tabs in use.
 \#
-.SP .25v
+.ALD 6p
 .JUSTIFY       \" Justify text
 .IL \w'\0.\0'  \" Establish a left indent equal to 2 figure spaces plus a 
period.
 .HI \w'\0.\0'  \" Establish a hanging indent equal to the left indent.
@@ -391,12 +390,12 @@ go back to the top level (numbered) list...
 \#
 Example 4:
 .ALD .25v
-.UNDERSCORE 3.75p "A \*[BU 2]recipe for nested lists using string tabs"
-.SP .75v
-.FAM T
+.UNDERSCORE 3.5p "A \*[BU 2]recipe for nested lists using string tabs"
+.SP .5v
+.FAM N
 .FT  R
-.PT_SIZE 12
-.LS  14
+.PT_SIZE 11
+.LS  13
 .JUSTIFY
 Although setting up string tabs is a bit more complex than setting
 up indents, it's \*[BU 3]well worth the effort, especially for
@@ -500,14 +499,15 @@ structures easier than with the indent macros.
 .FT      B
 .PT_SIZE 12
 .LS      14
+.RLD 2p
 .LEFT
 \#
 Example 5:
 .ALD .25v
-.UNDERSCORE 3.75p "Word spacing"
+.UNDERSCORE 3.5p "Word spacing"
 .ALD 8p
-.FAM T
-.PT_SIZE 12
+.FAM P         \" Palatino family
+.PT_SIZE 11
 .LS  14
 \#
 \# The "label" lines for the following are set in Helvetica
@@ -524,13 +524,13 @@ N\*[BU1]o\*[BU1]w \*[BU1]is the time for all good men to 
come to the aid of the
 .FT R
 .WS +2
 N\*[BU1]o\*[BU1]w \*[BU1]is the time for all good men to come to the aid of 
the party.
-.WS  +0
+.WS  DEFAULT
 .ALD 4p
 \f[HB]\*S[-1]Word spacing adjusted by \*[UP 1p]\*[BU3]+\*[DOWN 
1p]4\*S[+1]\*[PREV]
 .FT R
 .WS +4
 N\*[BU1]o\*[BU1]w \*[BU1]is the time for all good men to come to the aid of 
the party.
-.WS  +0
+.WS  DEFAULT
 .ALD 4p
 \f[HB]\*S[-1]Word spacing adjusted by \*[UP 1p]\*[BU3]+\*[DOWN 
1p]6\*S[+1]\*[PREV]
 .FT R
@@ -547,11 +547,11 @@ N\*[BU1]o\*[BU1]w \*[BU1]is the time for all good men to 
come to the aid of the
 .LEFT
 Example 6:
 .ALD .25v
-.UNDERSCORE 3.75p "Line kerning"
+.UNDERSCORE 3.5p "Line kerning"
 .ALD 8p
-.FAM     T     \" Palatino family
+.FAM     P     \" Palatino family
 .FT      R
-.PT_SIZE 12
+.PT_SIZE 11
 .LS      15
 \#
 \# Here, we set up some tabs so the examples can go into facing columns.
@@ -580,7 +580,6 @@ Example 6:
 \f[HB]\*S[-1]Line "tightened" \[en] .RW .3\*S[+1]\*[PREV]
 .RW .3
 "But this is \*[IT]important!\/"\*[PREV]she exclaimed.
-.RW 0
 .MCR
 .TB 2
 \f[HB]\*S[-1]Unkerned line\*S[+1]\*[PREV]
@@ -598,6 +597,7 @@ Example 6:
 .EW .3
 "But this is \*[IT]important!\/"\*[PREV]she exclaimed.
 .MCX 1.5v
+.EW 0
 \#
 .FAM     T
 .FT      B
@@ -607,7 +607,7 @@ Example 6:
 \#
 Example 7:
 .ALD .25v
-.UNDERSCORE 3.75p "Cutaround using left\*[FU 2]/right indents, \
+.UNDERSCORE 3.5p "Cutaround using left\*[FU 2]/right indents, \
 multi columns and a dropcap"
 .SP
 \#