Added -split and -nosplit "I-Don't-Like" note to mdoc.7 (there really must be another...

Fixed .Er -width conversion.

diff --git a/mdoc.7 b/mdoc.7
index 214f9018a8ae39030103aa83a9a5b1faac49c076..6228cc676d5d8525782240a3284cd97c2ff4b92e 100644 (file)
--- a/mdoc.7
+++ b/mdoc.7
@@ -1,4 +1,4 @@
-.\"    $Id: mdoc.7,v 1.30 2009/06/17 14:08:47 kristaps Exp $
+.\"    $Id: mdoc.7,v 1.31 2009/06/22 12:22:35 kristaps Exp $

 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"


@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" 
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\" 

-.Dd $Mdocdate: June 17 2009 $
+.Dd $Mdocdate: June 22 2009 $

 .Dt MDOC 7
 .Os
 .\" SECTION
 .Dt MDOC 7
 .Os
 .\" SECTION


@@ -618,4 +618,9 @@ etc.).
 There's no way to refer to references in
 .Sq \&.Rs/.Re
 blocks.
 There's no way to refer to references in
 .Sq \&.Rs/.Re
 blocks.

+.\" LIST-ITEM
+.It
+The \-split and \-nosplit arguments to 
+.Sq \&.An
+are inane.

 .El
 .El

diff --git a/mdoc_strings.c b/mdoc_strings.c
index e9e0b4094c4d6dda75625bdd3743179c5ef3e1b6..126a2439e0ca9126e8e66e02d1c86f351ad10c07 100644 (file)
--- a/mdoc_strings.c
+++ b/mdoc_strings.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_strings.c,v 1.7 2009/06/17 10:53:32 kristaps Exp $ */
+/*     $Id: mdoc_strings.c,v 1.8 2009/06/22 12:22:35 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -221,6 +221,7 @@ mdoc_atotime(const char *p)
 }
 
 
 }
 
 

+/* FIXME: move this into an editable .in file. */

 size_t
 mdoc_macro2len(int macro)
 {
 size_t
 mdoc_macro2len(int macro)
 {


@@ -255,7 +256,7 @@ mdoc_macro2len(int macro)
        case(MDOC_Em):
                return(10);
        case(MDOC_Er):
        case(MDOC_Em):
                return(10);
        case(MDOC_Er):

-               return(12);
+               return(17);

        case(MDOC_Ev):
                return(15);
        case(MDOC_Fa):
        case(MDOC_Ev):
                return(15);
        case(MDOC_Fa):