Sun Oct 25 18:33:36 2009 UTC ()
Add .%U to mark up URLs in bibliographic entries of mdoc(7) pages.
Discussed with wiz, Kristaps Dzonsons and Ruslan Ermilov, proposed
(without reaction) on the groff mailing list.


(joerg)
diff -r1.8 -r1.9 src/gnu/dist/groff/tmac/doc-common
diff -r1.5 -r1.6 src/gnu/dist/groff/tmac/doc.tmac
diff -r1.10 -r1.11 src/gnu/dist/groff/tmac/groff_mdoc.man
cvs diff -r1.8 -r1.9 src/gnu/dist/groff/tmac/Attic/doc-common (expand / switch to unified diff)

--- src/gnu/dist/groff/tmac/Attic/doc-common 2006/02/06 18:25:49 1.8
+++ src/gnu/dist/groff/tmac/Attic/doc-common 2009/10/25 18:33:36 1.9
@@ -36,26 +36,27 @@ @@ -36,26 +36,27 @@
36.\" the same name must exist. Its value must not be zero. 36.\" the same name must exist. Its value must not be zero.
37. 37.
38.nr %A 1 38.nr %A 1
39.nr %B 1 39.nr %B 1
40.nr %D 1 40.nr %D 1
41.nr %I 1 41.nr %I 1
42.nr %J 1 42.nr %J 1
43.nr %N 1 43.nr %N 1
44.nr %O 1 44.nr %O 1
45.nr %P 1 45.nr %P 1
46.nr %Q 1 46.nr %Q 1
47.nr %R 1 47.nr %R 1
48.nr %T 1 48.nr %T 1
 49.nr %U 1
49.nr %V 1 50.nr %V 1
50.nr Ac 3 51.nr Ac 3
51.nr Ad 12n 52.nr Ad 12n
52.nr An 12n 53.nr An 12n
53.nr Ao 12n 54.nr Ao 12n
54.nr Ap 2 55.nr Ap 2
55.nr Aq 12n 56.nr Aq 12n
56.nr Ar 12n 57.nr Ar 12n
57.nr At 1 58.nr At 1
58.nr Bc 3 59.nr Bc 3
59.nr Bf 8n\" ? 60.nr Bf 8n\" ?
60.nr Bk 8n\" ? 61.nr Bk 8n\" ?
61.nr Bl 1 62.nr Bl 1
@@ -1086,26 +1087,28 @@ @@ -1086,26 +1087,28 @@
1086. tm doc-issue-count == \n[doc-issue-count] 1087. tm doc-issue-count == \n[doc-issue-count]
1087. tm doc-issue-name == `\*[doc-issue-name]' 1088. tm doc-issue-name == `\*[doc-issue-name]'
1088. tm doc-optional-count == \n[doc-optional-count] 1089. tm doc-optional-count == \n[doc-optional-count]
1089. tm doc-optional-string == `\*[doc-optional-string]' 1090. tm doc-optional-string == `\*[doc-optional-string]'
1090. tm doc-page-number-count == \n[doc-page-number-count] 1091. tm doc-page-number-count == \n[doc-page-number-count]
1091. tm doc-page-number-string == `\*[doc-page-number-string]' 1092. tm doc-page-number-string == `\*[doc-page-number-string]'
1092. tm doc-corporate-count == \n[doc-corporate-count] 1093. tm doc-corporate-count == \n[doc-corporate-count]
1093. tm doc-corporate-name == `\*[doc-corporate-name]' 1094. tm doc-corporate-name == `\*[doc-corporate-name]'
1094. tm doc-report-count == \n[doc-report-count] 1095. tm doc-report-count == \n[doc-report-count]
1095. tm doc-report-name == `\*[doc-report-name]' 1096. tm doc-report-name == `\*[doc-report-name]'
1096. tm doc-reference-title-count == \n[doc-reference-title-count] 1097. tm doc-reference-title-count == \n[doc-reference-title-count]
1097. tm doc-reference-title-name == `\*[doc-reference-title-name]' 1098. tm doc-reference-title-name == `\*[doc-reference-title-name]'
1098. tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]' 1099. tm doc-reference-title-name-for-book == `\*[doc-reference-title-name-for-book]'
 1100. tm doc-url-count == \n[doc-url-count]
 1101. tm doc-url-name == `\*[doc-url-name]'
1099. tm doc-volume-count == \n[doc-volume-count] 1102. tm doc-volume-count == \n[doc-volume-count]
1100. tm doc-volume-name == `\*[doc-volume-name]' 1103. tm doc-volume-name == `\*[doc-volume-name]'
1101. tm doc-have-author == \n[doc-have-author] 1104. tm doc-have-author == \n[doc-have-author]
1102. 1105.
1103. tm doc-document-title == `\*[doc-document-title]' 1106. tm doc-document-title == `\*[doc-document-title]'
1104. tm doc-volume == `\*[doc-volume]' 1107. tm doc-volume == `\*[doc-volume]'
1105. tm doc-section == `\*[doc-section]' 1108. tm doc-section == `\*[doc-section]'
1106. tm doc-operating-system == `\*[doc-operating-system]' 1109. tm doc-operating-system == `\*[doc-operating-system]'
1107. tm doc-date-string == `\*[doc-date-string]' 1110. tm doc-date-string == `\*[doc-date-string]'
1108. tm doc-header-space == \n[doc-header-space] 1111. tm doc-header-space == \n[doc-header-space]
1109. tm doc-footer-space == \n[doc-footer-space] 1112. tm doc-footer-space == \n[doc-footer-space]
1110. tm doc-display-vertical == \n[doc-display-vertical] 1113. tm doc-display-vertical == \n[doc-display-vertical]
1111. tm doc-header-string == `\*[doc-header-string]' 1114. tm doc-header-string == `\*[doc-header-string]'
cvs diff -r1.5 -r1.6 src/gnu/dist/groff/tmac/Attic/doc.tmac (expand / switch to unified diff)

--- src/gnu/dist/groff/tmac/Attic/doc.tmac 2006/02/06 18:25:49 1.5
+++ src/gnu/dist/groff/tmac/Attic/doc.tmac 2009/10/25 18:33:36 1.6
@@ -3420,26 +3420,28 @@ @@ -3420,26 +3420,28 @@
3420. nr doc-issue-count-saved \n[doc-issue-count] 3420. nr doc-issue-count-saved \n[doc-issue-count]
3421. ds doc-issue-name-saved "\*[doc-issue-name] 3421. ds doc-issue-name-saved "\*[doc-issue-name]
3422. nr doc-optional-count-saved \n[doc-optional-count] 3422. nr doc-optional-count-saved \n[doc-optional-count]
3423. ds doc-optional-string-saved "\*[doc-optional-string] 3423. ds doc-optional-string-saved "\*[doc-optional-string]
3424. nr doc-page-number-count-saved \n[doc-page-number-count] 3424. nr doc-page-number-count-saved \n[doc-page-number-count]
3425. ds doc-page-number-string-saved "\*[doc-page-number-string] 3425. ds doc-page-number-string-saved "\*[doc-page-number-string]
3426. nr doc-corporate-count-saved \n[doc-corporate-count] 3426. nr doc-corporate-count-saved \n[doc-corporate-count]
3427. ds doc-corporate-name-saved "\*[doc-corporate-name] 3427. ds doc-corporate-name-saved "\*[doc-corporate-name]
3428. nr doc-report-count-saved \n[doc-report-count] 3428. nr doc-report-count-saved \n[doc-report-count]
3429. ds doc-report-name-saved "\*[doc-report-name] 3429. ds doc-report-name-saved "\*[doc-report-name]
3430. nr doc-reference-title-count-saved \n[doc-reference-title-count] 3430. nr doc-reference-title-count-saved \n[doc-reference-title-count]
3431. ds doc-reference-title-name-saved "\*[doc-reference-title-name] 3431. ds doc-reference-title-name-saved "\*[doc-reference-title-name]
3432. ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book] 3432. ds doc-reference-title-name-for-book-saved "\*[doc-reference-title-name-for-book]
 3433. nr doc-url-count-saved \n[doc-url-count]
 3434. ds doc-url-name-saved "\*[doc-url-name]
3433. nr doc-volume-count-saved \n[doc-volume-count] 3435. nr doc-volume-count-saved \n[doc-volume-count]
3434. ds doc-volume-name-saved "\*[doc-volume-name] 3436. ds doc-volume-name-saved "\*[doc-volume-name]
3435. nr doc-have-author-saved \n[doc-have-author] 3437. nr doc-have-author-saved \n[doc-have-author]
3436. 3438.
3437. ds doc-document-title-saved "\*[doc-document-title] 3439. ds doc-document-title-saved "\*[doc-document-title]
3438. ds doc-volume-saved "\*[doc-volume] 3440. ds doc-volume-saved "\*[doc-volume]
3439. ds doc-section-saved "\*[doc-section] 3441. ds doc-section-saved "\*[doc-section]
3440. ds doc-operating-system-saved "\*[doc-operating-system] 3442. ds doc-operating-system-saved "\*[doc-operating-system]
3441. ds doc-date-string-saved "\*[doc-date-string] 3443. ds doc-date-string-saved "\*[doc-date-string]
3442. nr doc-header-space-saved \n[doc-header-space] 3444. nr doc-header-space-saved \n[doc-header-space]
3443. nr doc-footer-space-saved \n[doc-footer-space] 3445. nr doc-footer-space-saved \n[doc-footer-space]
3444. nr doc-display-vertical-saved \n[doc-display-vertical] 3446. nr doc-display-vertical-saved \n[doc-display-vertical]
3445. ds doc-header-string-saved "\*[doc-header-string] 3447. ds doc-header-string-saved "\*[doc-header-string]
@@ -3560,26 +3562,28 @@ @@ -3560,26 +3562,28 @@
3560. nr doc-issue-count \n[doc-issue-count-saved] 3562. nr doc-issue-count \n[doc-issue-count-saved]
3561. ds doc-issue-name "\*[doc-issue-name-saved] 3563. ds doc-issue-name "\*[doc-issue-name-saved]
3562. nr doc-optional-count \n[doc-optional-count-saved] 3564. nr doc-optional-count \n[doc-optional-count-saved]
3563. ds doc-optional-string "\*[doc-optional-string-saved] 3565. ds doc-optional-string "\*[doc-optional-string-saved]
3564. nr doc-page-number-count \n[doc-page-number-count-saved] 3566. nr doc-page-number-count \n[doc-page-number-count-saved]
3565. ds doc-page-number-string "\*[doc-page-number-string-saved] 3567. ds doc-page-number-string "\*[doc-page-number-string-saved]
3566. nr doc-corporate-count \n[doc-corporate-count-saved] 3568. nr doc-corporate-count \n[doc-corporate-count-saved]
3567. ds doc-corporate-name "\*[doc-corporate-name-saved] 3569. ds doc-corporate-name "\*[doc-corporate-name-saved]
3568. nr doc-report-count \n[doc-report-count-saved] 3570. nr doc-report-count \n[doc-report-count-saved]
3569. ds doc-report-name "\*[doc-report-name-saved] 3571. ds doc-report-name "\*[doc-report-name-saved]
3570. nr doc-reference-title-count \n[doc-reference-title-count-saved] 3572. nr doc-reference-title-count \n[doc-reference-title-count-saved]
3571. ds doc-reference-title-name "\*[doc-reference-title-name-saved] 3573. ds doc-reference-title-name "\*[doc-reference-title-name-saved]
3572. ds doc-reference-title-name-for-book "\*[doc-reference-title-name-for-book-saved] 3574. ds doc-reference-title-name-for-book "\*[doc-reference-title-name-for-book-saved]
 3575. nr doc-url-count \n[doc-url-count-saved]
 3576. ds doc-url-name "\*[doc-url-name-saved]
3573. nr doc-volume-count \n[doc-volume-count-saved] 3577. nr doc-volume-count \n[doc-volume-count-saved]
3574. ds doc-volume-name "\*[doc-volume-name-saved] 3578. ds doc-volume-name "\*[doc-volume-name-saved]
3575. nr doc-have-author \n[doc-have-author-saved] 3579. nr doc-have-author \n[doc-have-author-saved]
3576. 3580.
3577. ds doc-document-title "\*[doc-document-title-saved] 3581. ds doc-document-title "\*[doc-document-title-saved]
3578. ds doc-volume "\*[doc-volume-saved] 3582. ds doc-volume "\*[doc-volume-saved]
3579. ds doc-section "\*[doc-section-saved] 3583. ds doc-section "\*[doc-section-saved]
3580. ds doc-operating-system "\*[doc-operating-system-saved] 3584. ds doc-operating-system "\*[doc-operating-system-saved]
3581. ds doc-date-string "\*[doc-date-string-saved] 3585. ds doc-date-string "\*[doc-date-string-saved]
3582. nr doc-header-space \n[doc-header-space-saved] 3586. nr doc-header-space \n[doc-header-space-saved]
3583. nr doc-footer-space \n[doc-footer-space-saved] 3587. nr doc-footer-space \n[doc-footer-space-saved]
3584. nr doc-display-vertical \n[doc-display-vertical-saved] 3588. nr doc-display-vertical \n[doc-display-vertical-saved]
3585. ds doc-header-string "\*[doc-header-string-saved] 3589. ds doc-header-string "\*[doc-header-string-saved]
@@ -5184,40 +5188,43 @@ @@ -5184,40 +5188,43 @@
5184.\" NS doc-journal-name 5188.\" NS doc-journal-name
5185.\" NS doc-optional-count 5189.\" NS doc-optional-count
5186.\" NS doc-optional-string 5190.\" NS doc-optional-string
5187.\" NS doc-page-number-count 5191.\" NS doc-page-number-count
5188.\" NS doc-page-number-string 5192.\" NS doc-page-number-string
5189.\" NS doc-publisher-count 5193.\" NS doc-publisher-count
5190.\" NS doc-publisher-name 5194.\" NS doc-publisher-name
5191.\" NS doc-reference-count 5195.\" NS doc-reference-count
5192.\" NS doc-reference-title-count 5196.\" NS doc-reference-title-count
5193.\" NS doc-reference-title-name 5197.\" NS doc-reference-title-name
5194.\" NS doc-reference-title-name-for-book 5198.\" NS doc-reference-title-name-for-book
5195.\" NS doc-report-count 5199.\" NS doc-report-count
5196.\" NS doc-report-name 5200.\" NS doc-report-name
 5201.\" NS doc-url-count
 5202.\" NS doc-url-name
5197.\" NS doc-volume-count 5203.\" NS doc-volume-count
5198.\" NS doc-volume-name 5204.\" NS doc-volume-name
5199. 5205.
5200.de doc-reset-reference 5206.de doc-reset-reference
5201. while (\n[doc-author-count]) \{\ 5207. while (\n[doc-author-count]) \{\
5202. ds doc-author-name\n[doc-author-count] 5208. ds doc-author-name\n[doc-author-count]
5203. nr doc-author-count -1 5209. nr doc-author-count -1
5204. \} 5210. \}
5205. nr doc-journal-count 0 5211. nr doc-journal-count 0
5206. nr doc-issue-count 0 5212. nr doc-issue-count 0
5207. nr doc-optional-count 0 5213. nr doc-optional-count 0
5208. nr doc-corporate-count 0 5214. nr doc-corporate-count 0
5209. nr doc-report-count 0 5215. nr doc-report-count 0
5210. nr doc-reference-title-count 0 5216. nr doc-reference-title-count 0
 5217. nr doc-url-count 0
5211. nr doc-volume-count 0 5218. nr doc-volume-count 0
5212. nr doc-date-count 0 5219. nr doc-date-count 0
5213. nr doc-page-number-count 0 5220. nr doc-page-number-count 0
5214. nr doc-book-count 0 5221. nr doc-book-count 0
5215. nr doc-publisher-count 0 5222. nr doc-publisher-count 0
5216. nr doc-reference-count 0 5223. nr doc-reference-count 0
5217. 5224.
5218. ds doc-journal-name 5225. ds doc-journal-name
5219. ds doc-issue-name 5226. ds doc-issue-name
5220. ds doc-optional-string 5227. ds doc-optional-string
5221. ds doc-corporate-name 5228. ds doc-corporate-name
5222. ds doc-report-name 5229. ds doc-report-name
5223. ds doc-reference-title-name 5230. ds doc-reference-title-name
@@ -5306,26 +5313,33 @@ @@ -5306,26 +5313,33 @@
5306. unformat doc-issue-name 5313. unformat doc-issue-name
5307. chop doc-issue-name 5314. chop doc-issue-name
5308. nop \*[doc-issue-name]\c 5315. nop \*[doc-issue-name]\c
5309. doc-finish-reference \n[doc-issue-count] 5316. doc-finish-reference \n[doc-issue-count]
5310. \} 5317. \}
5311. 5318.
5312. if \n[doc-volume-count] \{\ 5319. if \n[doc-volume-count] \{\
5313. unformat doc-volume-name 5320. unformat doc-volume-name
5314. chop doc-volume-name 5321. chop doc-volume-name
5315. nop \*[doc-volume-name]\c 5322. nop \*[doc-volume-name]\c
5316. doc-finish-reference \n[doc-volume-count] 5323. doc-finish-reference \n[doc-volume-count]
5317. \} 5324. \}
5318. 5325.
 5326. if \n[doc-url-count] \{\
 5327. unformat doc-url-name
 5328. chop doc-url-name
 5329. nop \*[doc-url-name]\c
 5330. doc-finish-reference \n[doc-url-count]
 5331. \}
 5332.
5319. if \n[doc-page-number-count] \{\ 5333. if \n[doc-page-number-count] \{\
5320. unformat doc-page-number-string 5334. unformat doc-page-number-string
5321. chop doc-page-number-string 5335. chop doc-page-number-string
5322. nop \*[doc-page-number-string]\c 5336. nop \*[doc-page-number-string]\c
5323. doc-finish-reference \n[doc-page-number-count] 5337. doc-finish-reference \n[doc-page-number-count]
5324. \} 5338. \}
5325. 5339.
5326. if \n[doc-corporate-count] \{\ 5340. if \n[doc-corporate-count] \{\
5327. unformat doc-corporate-name 5341. unformat doc-corporate-name
5328. chop doc-corporate-name 5342. chop doc-corporate-name
5329. nop \*[doc-corporate-name]\c 5343. nop \*[doc-corporate-name]\c
5330. doc-finish-reference \n[doc-corporate-count] 5344. doc-finish-reference \n[doc-corporate-count]
5331. \} 5345. \}
@@ -6009,47 +6023,95 @@ @@ -6009,47 +6023,95 @@
6009. evc 0 6023. evc 0
6010. in 0 6024. in 0
6011. nf 6025. nf
6012. nop \*[doc-Em-font]\c 6026. nop \*[doc-Em-font]\c
6013. doc-do-references 6027. doc-do-references
6014. \} 6028. \}
6015. el \{\ 6029. el \{\
6016. nop \*[doc-Em-font]\c 6030. nop \*[doc-Em-font]\c
6017. doc-print-recursive 6031. doc-print-recursive
6018. \} 6032. \}
6019.. 6033..
6020. 6034.
6021. 6035.
 6036.\" NS doc-url-count global register
 6037.\" NS counter of hypertext references
 6038.
 6039.nr doc-url-count 0
 6040.
 6041.
6022.\" NS doc-volume-count global register 6042.\" NS doc-volume-count global register
6023.\" NS counter of reference title references 6043.\" NS counter of reference title references
6024. 6044.
6025.nr doc-volume-count 0 6045.nr doc-volume-count 0
6026. 6046.
6027. 6047.
6028.\" NS doc-volume-name global box 6048.\" NS doc-volume-name global box
6029.\" NS string of collected volume references 6049.\" NS string of collected volume references
6030. 6050.
6031.ds doc-volume-name 6051.ds doc-volume-name
6032. 6052.
6033. 6053.
 6054.\" NS %U user macro
 6055.\" NS hypertext reference
 6056.\" NS
 6057.\" NS modifies:
 6058.\" NS doc-arg-ptr
 6059.\" NS doc-curr-font
 6060.\" NS doc-curr-size
 6061.\" NS doc-macro-name
 6062.\" NS doc-reference-count
 6063.\" NS doc-url-count
 6064.\" NS
 6065.\" NS local variables:
 6066.\" NS doc-env-%U
 6067.\" NS
 6068.\" NS width register `%U' set in doc-common
 6069.
 6070.de %U
 6071. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
 6072. tm Usage: .%U URL ... (#\n[.c])
 6073. return
 6074. \}
 6075.
 6076. nr doc-url-count +1
 6077. nr doc-reference-count +1
 6078.
 6079. ds doc-macro-name %U
 6080. doc-parse-args \$@
 6081.
 6082. nr doc-arg-ptr +1
 6083. nr doc-curr-font \n[.f]
 6084. nr doc-curr-size \n[.ps]
 6085.
 6086. \" append to reference box
 6087. boxa doc-url-name
 6088. ev doc-env-%U
 6089. evc 0
 6090. in 0
 6091. nf
 6092. doc-do-references
 6093..
 6094.
 6095.
6034.\" NS %V user macro 6096.\" NS %V user macro
6035.\" NS reference volume 6097.\" NS reference volume
6036.\" NS 6098.\" NS
6037.\" NS modifies: 6099.\" NS modifies:
6038.\" NS doc-arg-ptr 6100.\" NS doc-arg-ptr
6039.\" NS doc-curr-font 6101.\" NS doc-curr-font
6040.\" NS doc-curr-size 6102.\" NS doc-curr-size
6041.\" NS doc-macro-name 6103.\" NS doc-macro-name
6042.\" NS doc-reference-title-count 6104.\" NS doc-reference-count
6043.\" NS doc-volume-count 6105.\" NS doc-volume-count
6044.\" NS 6106.\" NS
6045.\" NS local variables: 6107.\" NS local variables:
6046.\" NS doc-env-%V 6108.\" NS doc-env-%V
6047.\" NS 6109.\" NS
6048.\" NS width register `%V' set in doc-common 6110.\" NS width register `%V' set in doc-common
6049. 6111.
6050.de %V 6112.de %V
6051. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\ 6113. if (\n[doc-arg-limit] : (\n[.$] == 0)) \{\
6052. tm Usage: .%V volume ... (#\n[.c]) 6114. tm Usage: .%V volume ... (#\n[.c])
6053. return 6115. return
6054. \} 6116. \}
6055. 6117.
cvs diff -r1.10 -r1.11 src/gnu/dist/groff/tmac/Attic/groff_mdoc.man (expand / switch to unified diff)

--- src/gnu/dist/groff/tmac/Attic/groff_mdoc.man 2009/05/19 09:04:50 1.10
+++ src/gnu/dist/groff/tmac/Attic/groff_mdoc.man 2009/10/25 18:33:36 1.11
@@ -2518,26 +2518,28 @@ Issuer/publisher name. @@ -2518,26 +2518,28 @@ Issuer/publisher name.
2518Journal name. 2518Journal name.
2519.It Li .%N 2519.It Li .%N
2520Issue number. 2520Issue number.
2521.It Li .%O 2521.It Li .%O
2522Optional information. 2522Optional information.
2523.It Li .%P 2523.It Li .%P
2524Page number. 2524Page number.
2525.It Li .%Q 2525.It Li .%Q
2526Corporate or foreign author. 2526Corporate or foreign author.
2527.It Li .%R 2527.It Li .%R
2528Report name. 2528Report name.
2529.It Li .%T 2529.It Li .%T
2530Title of article. 2530Title of article.
 2531.It Li .%U
 2532Optional hypertext reference.
2531.It Li .%V 2533.It Li .%V
2532Volume. 2534Volume.
2533.El 2535.El
2534.Pp 2536.Pp
2535Macros beginning with 2537Macros beginning with
2536.Ql % 2538.Ql %
2537are not callable but accept multiple arguments in the usual way. 2539are not callable but accept multiple arguments in the usual way.
2538Only the 2540Only the
2539.Ql .Tn 2541.Ql .Tn
2540macro is handled properly as a parameter; other macros will cause strange 2542macro is handled properly as a parameter; other macros will cause strange
2541output. 2543output.
2542.Ql .%B 2544.Ql .%B
2543and 2545and