SF.net SVN: docutils:[10072 ] trunk

grubert--- via Docutils-checkins <[email protected]> Thu, 03 Apr 2025 17:09:11 +0000
Newsgroups gmane.text.docutils.cvs
Message-ID <[email protected]> 
Revision: 10072
          http://sourceforge.net/p/docutils/code/10072
Author:   grubert
Date:     2025-04-03 17:09:10 +0000 (Thu, 03 Apr 2025)
Log Message:
-----------
no space between macro reference and following "."

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-03 10:56:55 UTC (rev 10071)
+++ trunk/docutils/docutils/writers/manpage.py	2025-04-03 17:09:10 UTC (rev 10072)
@@ -359,8 +359,14 @@
                     self.body[i] = "%s %s\\c\n" % (
                             self.body[i][:3], self.body[i+1][0])
                     self.body[i+1] = self.body[i+1][1:]
-                    if self.body[i+1][0] == '.':
+                    if self.body[i+1].startswith('.'):
                         self.body[i+1] = '\\&' + self.body[i+1]
+                    # TODO blank line to ".\n" see a)
+                    # INWORK next line starts with escaped "."
+                elif self.body[i+1][:3] == r'\&.':
+                    self.body[i] = "%s .\\c\n" % ( self.body[i][:3])
+                    self.body[i+1] = self.body[i+1][3:]
+                    # TODO blank line to ".\n" see a)
         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-03 10:56:55 UTC (rev 10071)
+++ trunk/sandbox/manpage-writer/expected/ref-2025-urue.man	2025-04-03 17:09:10 UTC (rev 10072)
@@ -57,6 +57,6 @@
 and \c
 .UR https://github.com/OooOoooo
 OooOoooo
-.UE
-\&.
+.UE .\c
+
 .\" End of generated man page.

Modified: trunk/sandbox/manpage-writer/expected/ref-2025-urue.utf8
===================================================================
--- trunk/sandbox/manpage-writer/expected/ref-2025-urue.utf8	2025-04-03 10:56:55 UTC (rev 10071)
+++ trunk/sandbox/manpage-writer/expected/ref-2025-urue.utf8	2025-04-03 17:09:10 UTC (rev 10072)
@@ -2,6 +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;;https://github.com/nn\nn]8;;\ and ]8;;https://github.com/OooOoooo\OooOoooo]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;;\.
 
                                                                             ()

Modified: trunk/sandbox/manpage-writer/expected/refs-urue.man
===================================================================
--- trunk/sandbox/manpage-writer/expected/refs-urue.man	2025-04-03 10:56:55 UTC (rev 10071)
+++ trunk/sandbox/manpage-writer/expected/refs-urue.man	2025-04-03 17:09:10 UTC (rev 10072)
@@ -101,14 +101,14 @@
 External hyperlinks, like \c
 .UR https://www.python.org/
 Python
-.UE
-\&.
+.UE .\c
+
 .sp
 embedded External hyperlinks, like \c
 .UR https://www.python.org/
 Python
-.UE
-\&.
+.UE .\c
+
 .SS Internal Hyperlink Targets
 .sp
 Internal cross\-references, like example\&.
@@ -123,8 +123,8 @@
 .UR https://www.python.org/
 my favourite
 programming language
-.UE
-\&.
+.UE .\c
+
 .SH Titles are targets, too
 .sp
 Implicit references, like Titles are

Modified: trunk/sandbox/manpage-writer/expected/refs-urue.utf8
===================================================================
--- trunk/sandbox/manpage-writer/expected/refs-urue.utf8	2025-04-03 10:56:55 UTC (rev 10071)
+++ trunk/sandbox/manpage-writer/expected/refs-urue.utf8	2025-04-03 17:09:10 UTC (rev 10072)
@@ -55,9 +55,9 @@
             here.
 
    External Hyperlink Targets
-       External hyperlinks, like ]8;;https://www.python.org/\Python]8;;\ .
+       External hyperlinks, like ]8;;https://www.python.org/\Python]8;;\.
 
-       embedded External hyperlinks, like ]8;;https://www.python.org/\Python]8;;\ .
+       embedded External hyperlinks, like ]8;;https://www.python.org/\Python]8;;\.
 
    Internal Hyperlink Targets
        Internal cross-references, like example.
@@ -66,7 +66,7 @@
 
    Indirect Hyperlink Targets
        ]8;;https://www.python.org/\Python]8;;\
-        is ]8;;https://www.python.org/\my favourite programming language]8;;\ .
+        is ]8;;https://www.python.org/\my favourite programming language]8;;\.
 
 Titles are targets, too
        Implicit references, like Titles are targets, too.

Modified: trunk/sandbox/manpage-writer/expected-mandoc/ref-2025-urue.utf8
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/ref-2025-urue.utf8	2025-04-03 10:56:55 UTC (rev 10071)
+++ trunk/sandbox/manpage-writer/expected-mandoc/ref-2025-urue.utf8	2025-04-03 17:09:10 UTC (rev 10072)
@@ -3,6 +3,6 @@
 NNaammee
         - Aaaaa ([email protected] <mailto:[email protected]>), Bbb <https://github.com/cc>
         ([email protected] <mailto:[email protected]>).  mm <https://github.com/m> nn
-       <https://github.com/nn> and OooOoooo <https://github.com/OooOoooo> .
+       <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-03 10:56:55 UTC (rev 10071)
+++ trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.man	2025-04-03 17:09:10 UTC (rev 10072)
@@ -101,14 +101,14 @@
 External hyperlinks, like \c
 .UR https://www.python.org/
 Python
-.UE
-\&.
+.UE .\c
+
 .sp
 embedded External hyperlinks, like \c
 .UR https://www.python.org/
 Python
-.UE
-\&.
+.UE .\c
+
 .SS Internal Hyperlink Targets
 .sp
 Internal cross\-references, like example\&.
@@ -123,8 +123,8 @@
 .UR https://www.python.org/
 my favourite
 programming language
-.UE
-\&.
+.UE .\c
+
 .SH Titles are targets, too
 .sp
 Implicit references, like Titles are

Modified: trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.ps
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.ps	2025-04-03 10:56:55 UTC (rev 10071)
+++ trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.ps	2025-04-03 17:09:10 UTC (rev 10072)
@@ -199,15 +199,13 @@
 127.292(hyperlinks,)c
 179.234(like)c
 198.484(Python)c
-232.408(<https://www.python.org/>)c
-355.740(.)c
+232.408(<https://www.python.org/>.)c
 87.274 456.764(embedded)s
 135.234(External)c
 175.252(hyperlinks,)c
 227.194(like)c
 246.444(Python)c
-280.368(<https://www.python.org/>)c
-403.700(.)c
+280.368(<https://www.python.org/>.)c
 f1
 76.274 425.986(Internal)s
 117.524(Hyperlink)c
@@ -235,8 +233,7 @@
 116.919(favourite)c
 159.379(programming)c
 222.013(language)c
-264.473(<https://www.python.org/>)c
-387.805(.)c
+264.473(<https://www.python.org/>.)c
 f1
 68.024 287.485(Titles)s
 97.053(are)c

Modified: trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.utf8
===================================================================
--- trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.utf8	2025-04-03 10:56:55 UTC (rev 10071)
+++ trunk/sandbox/manpage-writer/expected-mandoc/refs-urue.utf8	2025-04-03 17:09:10 UTC (rev 10072)
@@ -57,9 +57,9 @@
             here.
 
    EExxtteerrnnaall HHyyppeerrlliinnkk TTaarrggeettss
-       External hyperlinks, like Python <https://www.python.org/> .
+       External hyperlinks, like Python <https://www.python.org/>.
 
-       embedded External hyperlinks, like Python <https://www.python.org/> .
+       embedded External hyperlinks, like Python <https://www.python.org/>.
 
    IInntteerrnnaall HHyyppeerrlliinnkk TTaarrggeettss
        Internal cross-references, like example.
@@ -68,7 +68,7 @@
 
    IInnddiirreecctt HHyyppeerrlliinnkk TTaarrggeettss
        Python <https://www.python.org/>
-        is my favourite programming language <https://www.python.org/> .
+        is my favourite programming language <https://www.python.org/>.
 
 TTiittlleess aarree ttaarrggeettss,, ttoooo
        Implicit references, like Titles are targets, too.

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