[Groff-commit] groff ChangeLog NEWS tmac/doc-common tmac/doc.t...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     09/10/26 07:51:03

Modified files:
        .              : ChangeLog NEWS 
        tmac           : doc-common doc.tmac groff_mdoc.man 

Log message:
        Implement `%U' in mdoc for URL references.
        
        * tmac/doc-common (%U): New register.
        (Rd): Handle `doc-url-count' and `doc-url-name'.
        
        * tmac/doc.tmac (doc-url-count, doc-url-name): New registers.
        (doc-save-global-vars, doc-restore-global-vars, doc-reset-reference,
        doc-print-reference): Handle `doc-url-count' and `doc-url-name'.
        (%U): New macro.
        
        * NEWS, tmac/groff_mdoc.man: Document `%U' macro.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1211&r2=1.1212
http://cvs.savannah.gnu.org/viewcvs/groff/NEWS?cvsroot=groff&r1=1.258&r2=1.259
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/doc-common?cvsroot=groff&r1=1.39&r2=1.40
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/doc.tmac?cvsroot=groff&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/groff_mdoc.man?cvsroot=groff&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1211
retrieving revision 1.1212
diff -u -b -r1.1211 -r1.1212
--- ChangeLog   9 Sep 2009 14:07:19 -0000       1.1211
+++ ChangeLog   26 Oct 2009 07:51:02 -0000      1.1212
@@ -1,3 +1,17 @@
+2009-10-26  Jörg Sonnenberger  <address@hidden>
+
+       Implement `%U' in mdoc for URL references.
+
+       * tmac/doc-common (%U): New register.
+       (Rd): Handle `doc-url-count' and `doc-url-name'.
+
+       * tmac/doc.tmac (doc-url-count, doc-url-name): New registers.
+       (doc-save-global-vars, doc-restore-global-vars, doc-reset-reference,
+       doc-print-reference): Handle `doc-url-count' and `doc-url-name'.
+       (%U): New macro.
+
+       * NEWS, tmac/groff_mdoc.man: Document `%U' macro.
+
 2009-09-09  Jari Aalto  <address@hidden>
 
        * src/roff/groff/groff.man: Point to troff(1) for `-w' and `-W'.

Index: NEWS
===================================================================
RCS file: /cvsroot/groff/groff/NEWS,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -b -r1.258 -r1.259
--- NEWS        21 Feb 2009 07:40:22 -0000      1.258
+++ NEWS        26 Oct 2009 07:51:02 -0000      1.259
@@ -24,6 +24,12 @@
   request emits warnings in this category when the requested macro file does
   not exist.
 
+Macro Packages
+--------------
+
+o A new macro `%U' has been added to the mdoc package to indicate a URL
+  reference within an .Rs/.Re environment.
+
 
 VERSION 1.20.1
 ==============

Index: tmac/doc-common
===================================================================
RCS file: /cvsroot/groff/groff/tmac/doc-common,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -b -r1.39 -r1.40
--- tmac/doc-common     24 Dec 2008 06:10:25 -0000      1.39
+++ tmac/doc-common     26 Oct 2009 07:51:02 -0000      1.40
@@ -46,6 +46,7 @@
 .nr %Q 1
 .nr %R 1
 .nr %T 1
+.nr %U 1
 .nr %V 1
 .nr Ac 3
 .nr Ad 12n
@@ -1170,6 +1171,8 @@
 .  tm doc-reference-title-count == \n[doc-reference-title-count]
 .  tm doc-reference-title-name == `\*[doc-reference-title-name]'
 .  tm doc-reference-title-name-for-book == 
`\*[doc-reference-title-name-for-book]'
+.  tm doc-url-count == \n[doc-url-count]
+.  tm doc-url-name == `\*[doc-url-name]'
 .  tm doc-volume-count == \n[doc-volume-count]
 .  tm doc-volume-name == `\*[doc-volume-name]'
 .  tm doc-have-author == \n[doc-have-author]

Index: tmac/doc.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/doc.tmac,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- tmac/doc.tmac       1 Apr 2009 06:59:08 -0000       1.40
+++ tmac/doc.tmac       26 Oct 2009 07:51:02 -0000      1.41
@@ -3430,6 +3430,8 @@
 .  nr doc-reference-title-count-saved \n[doc-reference-title-count]
 .  ds doc-reference-title-name-saved "\*[doc-reference-title-name]
 .  ds doc-reference-title-name-for-book-saved 
"\*[doc-reference-title-name-for-book]
+.  nr doc-url-count-saved \n[doc-url-count]
+.  ds doc-url-name-saved "\*[doc-url-name]
 .  nr doc-volume-count-saved \n[doc-volume-count]
 .  ds doc-volume-name-saved "\*[doc-volume-name]
 .  nr doc-have-author-saved \n[doc-have-author]
@@ -3570,6 +3572,8 @@
 .  nr doc-reference-title-count \n[doc-reference-title-count-saved]
 .  ds doc-reference-title-name "\*[doc-reference-title-name-saved]
 .  ds doc-reference-title-name-for-book 
"\*[doc-reference-title-name-for-book-saved]
+.  nr doc-url-count \n[doc-url-count-saved]
+.  ds doc-url-name "\*[doc-url-name-saved]
 .  nr doc-volume-count \n[doc-volume-count-saved]
 .  ds doc-volume-name "\*[doc-volume-name-saved]
 .  nr doc-have-author \n[doc-have-author-saved]
@@ -5194,6 +5198,8 @@
 .\" NS   doc-reference-title-name-for-book
 .\" NS   doc-report-count
 .\" NS   doc-report-name
+.\" NS   doc-url-count
+.\" NS   doc-url-name
 .\" NS   doc-volume-count
 .\" NS   doc-volume-name
 .
@@ -5208,6 +5214,7 @@
 .  nr doc-corporate-count 0
 .  nr doc-report-count 0
 .  nr doc-reference-title-count 0
+.  nr doc-url-count 0
 .  nr doc-volume-count 0
 .  nr doc-date-count 0
 .  nr doc-page-number-count 0
@@ -5222,6 +5229,7 @@
 .  ds doc-report-name
 .  ds doc-reference-title-name
 .  ds doc-reference-title-name-for-book
+.  ds doc-url-name
 .  ds doc-volume-name
 .  ds doc-date
 .  ds doc-page-number-string
@@ -5316,6 +5324,13 @@
 .    doc-finish-reference \n[doc-volume-count]
 .  \}
 .
+.  if \n[doc-url-count] \{\
+.    unformat doc-url-name
+.    chop doc-url-name
+.    nop \*[doc-url-name]\c
+.    doc-finish-reference \n[doc-url-count]
+.  \}
+.
 .  if \n[doc-page-number-count] \{\
 .    unformat doc-page-number-string
 .    chop doc-page-number-string
@@ -6019,6 +6034,18 @@
 ..
 .
 .
+.\" NS doc-url-count global register
+.\" NS   counter of hypertext references
+.
+.nr doc-url-count 0
+.
+.
+.\" NS doc-url-name global box
+.\" NS   string of collected hypertext references
+.
+.ds doc-url-name
+.
+.
 .\" NS doc-volume-count global register
 .\" NS   counter of reference title references
 .
@@ -6031,6 +6058,48 @@
 .ds doc-volume-name
 .
 .
+.\" NS %U user macro
+.\" NS   hypertext reference
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS   doc-reference-count
+.\" NS   doc-url-count
+.\" NS
+.\" NS local variables:
+.\" NS   doc-env-%U
+.\" NS
+.\" NS width register `%U' set in doc-common
+.
+.de %U
+.  if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
+.    tm Usage: .%U URL ... (#\n[.c])
+.    return
+.  \}
+.
+.  nr doc-url-count +1
+.  nr doc-reference-count +1
+.
+.  ds doc-macro-name %U
+.  doc-parse-args \$@
+.
+.  nr doc-arg-ptr +1
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.
+.  \" append to reference box
+.  boxa doc-url-name
+.  ev doc-env-%U
+.  evc 0
+.  in 0
+.  nf
+.  doc-do-references
+..
+.
+.
 .\" NS %V user macro
 .\" NS   reference volume
 .\" NS
@@ -6039,7 +6108,7 @@
 .\" NS   doc-curr-font
 .\" NS   doc-curr-size
 .\" NS   doc-macro-name
-.\" NS   doc-reference-title-count
+.\" NS   doc-reference-count
 .\" NS   doc-volume-count
 .\" NS
 .\" NS local variables:

Index: tmac/groff_mdoc.man
===================================================================
RCS file: /cvsroot/groff/groff/tmac/groff_mdoc.man,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- tmac/groff_mdoc.man 2 Jan 2009 16:31:20 -0000       1.48
+++ tmac/groff_mdoc.man 26 Oct 2009 07:51:02 -0000      1.49
@@ -2556,6 +2556,8 @@
 Report name.
 .It Li .%T
 Title of article.
+.It Li .%U
+Optional hypertext reference.
 .It Li .%V
 Volume.
 .El