SF.net SVN: docutils:[10066 ] trunk

grubert--- via Docutils-checkins <[email protected]> Tue, 01 Apr 2025 11:39:59 +0000
Newsgroups gmane.text.docutils.cvs
Message-ID <[email protected]>
Revision: 10066
          http://sourceforge.net/p/docutils/code/10066
Author:   grubert
Date:     2025-04-01 11:39:59 +0000 (Tue, 01 Apr 2025)
Log Message:
-----------
do not generate blank line after macro references

Modified Paths:
--------------
    trunk/docutils/docutils/writers/manpage.py
    trunk/sandbox/manpage-writer/expected/ref-2025-urue.man
    trunk/sandbox/manpage-writer/expected/ref-2025-urue.utf8
    trunk/sandbox/manpage-writer/expected/refs-urue.man
    trunk/sandbox/manpage-writer/expected/refs-urue.utf8
    trunk/sandbox/manpage-writer/expected-mandoc/ref-2025-urue.utf8
    trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man
    trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.ps
    trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.utf8

Modified: trunk/docutils/docutils/writers/manpage.py
===================================================================
--- trunk/docutils/docutils/writers/manpage.py	2025-04-01 10:53:02 UTC (rev 10065)
+++ trunk/docutils/docutils/writers/manpage.py	2025-04-01 11:39:59 UTC (rev 10066)
@@ -349,6 +349,10 @@
                            or self.body[i - 3][:4] == '\n.B ')
                       ):
                     self.body[i] = '.\n'
+            elif self.body[i][:4] in ('.UE\n', '.ME\n'):
+                # TODO open("XXX.txt","a").write("---\n"+str(self.body[i-1:i+2])+"\n---\n")
+                if self.body[i+1][0] in ('\n', '\r'):
+                    self.body[i+1] = '.' + self.body[i+1]
         return ''.join(self.head + self.body + self.foot)
 
     def deunicode(self, text):

Modified: trunk/sandbox/manpage-writer/expected/ref-2025-urue.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/ref-2025-urue.man	2025-04-01 10:53:02 UTC (rev 10065)
+++ trunk/sandbox/manpage-writer/expected/ref-2025-urue.man	2025-04-01 11:39:59 UTC (rev 10066)
@@ -49,11 +49,11 @@
 .UR https://github.com/m
 mm
 .UE
-
+.
 .UR https://github.com/nn
 nn
 .UE
-
+.
 and \c
 .UR https://github.com/OooOoooo
 OooOoooo

Modified: trunk/sandbox/manpage-writer/expected/ref-2025-urue.utf8
===================================================================
--- trunk/sandbox/manpage-writer/expected/ref-2025-urue.utf8	2025-04-01 10:53:02 UTC (rev 10065)
+++ trunk/sandbox/manpage-writer/expected/ref-2025-urue.utf8	2025-04-01 11:39:59 UTC (rev 10066)
@@ -2,10 +2,6 @@
 
 Name
         - Aaaaa (]8;;mailto:mailto:[email protected]\[email protected]]8;;\ ), ]8;;https://github.com/cc\Bbb]8;;\
-        (]8;;mailto:mailto:[email protected]\[email protected]]8;;\ ), ]8;;https://github.com/m\mm]8;;\
+        (]8;;mailto:mailto:[email protected]\[email protected]]8;;\ ), ]8;;https://github.com/m\mm]8;;\ ]8;;https://github.com/nn\nn]8;;\ and ]8;;https://github.com/OooOoooo\OooOoooo]8;;\ .
 
-       ]8;;https://github.com/nn\nn]8;;\
-
-       and ]8;;https://github.com/OooOoooo\OooOoooo]8;;\ .
-
                                                                             ()

Modified: trunk/sandbox/manpage-writer/expected/refs-urue.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/refs-urue.man	2025-04-01 10:53:02 UTC (rev 10065)
+++ trunk/sandbox/manpage-writer/expected/refs-urue.man	2025-04-01 11:39:59 UTC (rev 10066)
@@ -148,19 +148,19 @@
 .UR tel:+48-816-555-1212
 tel:+48\-816\-555\-1212
 .UE
-
+.
 .UR urn:isbn:0-486-27557-4
 urn:isbn:0\-486\-27557\-4
 .UE
-
+.
 .UR news:comp.infosystems.www.servers.unix
 news:comp.infosystems.www.servers.unix
 .UE
-
+.
 .UR https://[email protected]:123/forum/questions/?tag=networking&order=newest#top
 https://[email protected]:123/forum/questions/?tag=networking&order=newest#top
 .UE
-
+.
 .SS Standalone email addresses
 .sp
 like \c
@@ -167,5 +167,5 @@
 .MT mailto:[email protected]
 [email protected]
 .ME
-
+.
 .\" End of generated man page.

Modified: trunk/sandbox/manpage-writer/expected/refs-urue.utf8
===================================================================
--- trunk/sandbox/manpage-writer/expected/refs-urue.utf8	2025-04-01 10:53:02 UTC (rev 10065)
+++ trunk/sandbox/manpage-writer/expected/refs-urue.utf8	2025-04-01 11:39:59 UTC (rev 10066)
@@ -79,18 +79,11 @@
         with your questions.
 
    URIs with known schemes
-       ]8;;tel:+48-816-555-1212\tel:+48-816-555-1212]8;;\
+       ]8;;tel:+48-816-555-1212\tel:+48-816-555-1212]8;;\     ]8;;urn:isbn:0-486-27557-4\urn:isbn:0-486-27557-4]8;;\      ]8;;news:comp.infosystems.www.servers.unix\news:comp.infosys‐
+       tems.www.servers.unix]8;;\  ]8;;https://[email protected]:123/forum/questions/?tag=networking&order=newest#top\https://[email protected]:123/forum/ques‐
+       tions/?tag=network‐ ing&order=newest#top]8;;\
 
-       ]8;;urn:isbn:0-486-27557-4\urn:isbn:0-486-27557-4]8;;\
-
-       ]8;;news:comp.infosystems.www.servers.unix\news:comp.infosystems.www.servers.unix]8;;\
-
-       ]8;;https://[email protected]:123/forum/questions/?tag=networking&order=newest#top\https://[email protected]:123/forum/questions/?tag=network‐
-       ing&order=newest#top]8;;\
-
-
    Standalone email addresses
        like ]8;;mailto:mailto:[email protected]\[email protected]]8;;\
 
-
                                                                             ()

Modified: trunk/sandbox/manpage-writer/expected-mandoc/ref-2025-urue.utf8
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/ref-2025-urue.utf8	2025-04-01 10:53:02 UTC (rev 10065)
+++ trunk/sandbox/manpage-writer/expected-mandoc/ref-2025-urue.utf8	2025-04-01 11:39:59 UTC (rev 10066)
@@ -2,10 +2,7 @@
 
 NNaammee
         - Aaaaa ([email protected] <mailto:[email protected]> ), Bbb <https://github.com/cc>
-        ([email protected] <mailto:[email protected]> ), mm <https://github.com/m>
+        ([email protected] <mailto:[email protected]> ), mm <https://github.com/m> nn
+       <https://github.com/nn> and OooOoooo <https://github.com/OooOoooo> .
 
-       nn <https://github.com/nn>
-
-       and OooOoooo <https://github.com/OooOoooo> .
-
                                                                             ()

Modified: trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man	2025-04-01 10:53:02 UTC (rev 10065)
+++ trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man	2025-04-01 11:39:59 UTC (rev 10066)
@@ -148,19 +148,19 @@
 .UR tel:+48-816-555-1212
 tel:+48\-816\-555\-1212
 .UE
-
+.
 .UR urn:isbn:0-486-27557-4
 urn:isbn:0\-486\-27557\-4
 .UE
-
+.
 .UR news:comp.infosystems.www.servers.unix
 news:comp.infosystems.www.servers.unix
 .UE
-
+.
 .UR https://[email protected]:123/forum/questions/?tag=networking&order=newest#top
 https://[email protected]:123/forum/questions/?tag=networking&order=newest#top
 .UE
-
+.
 .SS Standalone email addresses
 .sp
 like \c
@@ -167,5 +167,5 @@
 .MT mailto:[email protected]
 [email protected]
 .ME
-
+.
 .\" End of generated man page.

Modified: trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.ps
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.ps	2025-04-01 10:53:02 UTC (rev 10065)
+++ trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.ps	2025-04-01 11:39:59 UTC (rev 10066)
@@ -276,6 +276,10 @@
 f0
 87.274 118.206(tel:+48-816-555-1212)s
 187.275(<tel:+48-816-555-1212>)c
+299.684(urn:isbn:0-486-27557-4)c
+407.539(<urn:isbn:0-486-27557-4>)c
+87.274 102.817(news:comp.infosystems.www.servers.unix)s
+278.223(<news:comp.infosystems.www.servers.unix>)c
 f0
 68.024 739.233(\(\))s
 536.932(\(\))c
@@ -283,18 +287,14 @@
 showpage
 %%Page: 3 3
 f0
-87.274 702.988(urn:isbn:0-486-27557-4)s
-195.129(<urn:isbn:0-486-27557-4>)c
-87.274 672.210(news:comp.infosystems.www.servers.unix)s
-278.223(<news:comp.infosystems.www.servers.unix>)c
-87.274 641.432(https://[email protected]:123/forum/questions/?tag=networking&order=newest#top)s
-87.274 626.043(<https://[email protected]:123/forum/questions/?tag=networking&order=newest#top>)s
+87.274 702.988(https://[email protected]:123/forum/questions/?tag=networking&order=newest#top)s
+87.274 687.599(<https://[email protected]:123/forum/questions/?tag=networking&order=newest#top>)s
 f1
-76.274 579.876(Standalone)s
+76.274 656.821(Standalone)s
 131.593(email)c
 160.006(addresses)c
 f0
-87.274 564.487(like)s
+87.274 641.432(like)s
 106.524([email protected])c
 230.296(<mailto:[email protected]>)c
 f0

Modified: trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.utf8
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.utf8	2025-04-01 10:53:02 UTC (rev 10065)
+++ trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.utf8	2025-04-01 11:39:59 UTC (rev 10066)
@@ -81,19 +81,13 @@
         with your questions.
 
    UURRIIss wwiitthh kknnoowwnn sscchheemmeess
-       tel:+48-816-555-1212 <tel:+48-816-555-1212>
-
-       urn:isbn:0-486-27557-4 <urn:isbn:0-486-27557-4>
-
-       news:comp.infosystems.www.servers.unix
+       tel:+48-816-555-1212 <tel:+48-816-555-1212> urn:isbn:0-486-27557-4
+       <urn:isbn:0-486-27557-4> news:comp.infosystems.www.servers.unix
        <news:comp.infosystems.www.servers.unix>
-
        https://[email protected]:123/forum/questions/?tag=networking&order=newest#top
        <https://[email protected]:123/forum/questions/?tag=networking&order=newest#top>
 
-
    SSttaannddaalloonnee eemmaaiill aaddddrreesssseess
        like [email protected] <mailto:[email protected]>
 
-
                                                                             ()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



_______________________________________________
Docutils-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/docutils-checkins