v2 v3: manpage, reinstate escaping of hyphens

6 files changed, 12 insertions, 0 deletions

diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index bc8bbe36..1ea45430 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -32,6 +32,9 @@ http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.8-1
 
   * sysenv, lowriter (instead of oowriter)
 
+  * manpage, reinstate escape of hyphens (clearly preferred, else lintian
+    reports hyphen-used-as-minus-sign)
+
 %% 2.9.2.orig.tar.gz (2011-04-20:16/3) [see 3.0.7]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.7-1
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 68d5fa48..8fb5986e 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -37,6 +37,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.8.orig.tar.gz
 
   * sysenv, lowriter (instead of libreoffice)
 
+  * manpage, reinstate escape of hyphens (clearly preferred, else lintian
+    reports hyphen-used-as-minus-sign)
+
 %% 3.0.7.orig.tar.gz (2011-04-20:16/3)
 http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.7-1
 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.7.orig.tar.gz
diff --git a/lib/sisu/v2/manpage.rb b/lib/sisu/v2/manpage.rb
index a040f1a0..f9c75227 100644
--- a/lib/sisu/v2/manpage.rb
+++ b/lib/sisu/v2/manpage.rb
@@ -293,6 +293,7 @@ WOK
           dob.obj.gsub!(/┆/,'|')
           dob.obj.gsub!(/\s\.(\S+)/,' \\.\1')
           dob.obj.gsub!(/(\n\.)(\S\S\S+)/m,'\1\\.\2')
+          dob.obj.gsub!(/-/,'\-') #manpages use this
           dob.obj.gsub!(/~/,'~') if dob.obj #manpages use this
           if dob.is =~/group|verse|alt|code/
             if dob.is =='code'
diff --git a/lib/sisu/v2/param.rb b/lib/sisu/v2/param.rb
index c500c282..656490d9 100644
--- a/lib/sisu/v2/param.rb
+++ b/lib/sisu/v2/param.rb
@@ -733,12 +733,14 @@ module SiSU_Param
           end
           if manpage['name']
             manpage['name']=manpage['name'].join("\n.br\n")
+            manpage['name'].gsub!(/(-)/m,"\\\\\\1")
             manpage['name'].gsub!(/\A/,"\n.br\n.SH NAME\n.br\n")
           else
             manpage['name']='man page "name/whatis" information not provided, set in header @man: name=[whatis information]'
           end
           if manpage['synopsis']
             manpage['synopsis']=manpage['synopsis'].join("\n\n.br\n")
+            manpage['synopsis'].gsub!(/(-)/m,"\\\\\\1")
             manpage['synopsis'].gsub!(/\A/,"\n.br\n.SH SYNOPSIS\n.br\n")
           else
             manpage['synopsis']=''
diff --git a/lib/sisu/v3/manpage.rb b/lib/sisu/v3/manpage.rb
index 362d9cda..17fef80b 100644
--- a/lib/sisu/v3/manpage.rb
+++ b/lib/sisu/v3/manpage.rb
@@ -293,6 +293,7 @@ WOK
           dob.obj.gsub!(/┆/,'|')
           dob.obj.gsub!(/\s\.(\S+)/,' \\.\1')
           dob.obj.gsub!(/(\n\.)(\S\S\S+)/m,'\1\\.\2')
+          dob.obj.gsub!(/-/,'\-') #manpages use this
           dob.obj.gsub!(/~/,'~') if dob.obj #manpages use this
           if dob.is =~/block|group|verse|alt|code/
             if dob.is =='code'
diff --git a/lib/sisu/v3/param.rb b/lib/sisu/v3/param.rb
index c2968564..8aa543db 100644
--- a/lib/sisu/v3/param.rb
+++ b/lib/sisu/v3/param.rb
@@ -744,12 +744,14 @@ module SiSU_Param
           end
           if manpage['name']
             manpage['name']=manpage['name'].join("\n.br\n")
+            manpage['name'].gsub!(/(-)/m,"\\\\\\1")
             manpage['name'].gsub!(/\A/,"\n.br\n.SH NAME\n.br\n")
           else
             manpage['name']='man page "name/whatis" information not provided, set in header @man: name=[whatis information]'
           end
           if manpage['synopsis']
             manpage['synopsis']=manpage['synopsis'].join("\n\n.br\n")
+            manpage['synopsis'].gsub!(/(-)/m,"\\\\\\1")
             manpage['synopsis'].gsub!(/\A/,"\n.br\n.SH SYNOPSIS\n.br\n")
           else
             manpage['synopsis']=''