projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: Fix bug in "ovsdb-tool compact" test.
[openvswitch]
/
ovsdb
/
ovsdb-doc.in
diff --git
a/ovsdb/ovsdb-doc.in
b/ovsdb/ovsdb-doc.in
index cb21c1f40d34b1c3433db22a251c4f9b951fff51..c4faf6f2c705a3e89d47ac1d4b2a74dba26ccaff 100755
(executable)
--- a/
ovsdb/ovsdb-doc.in
+++ b/
ovsdb/ovsdb-doc.in
@@
-14,9
+14,14
@@
from OVSDB import *
argv0 = sys.argv[0]
argv0 = sys.argv[0]
-def textToNroff(s):
+def textToNroff(s
, font=r'\fR'
):
def escape(match):
c = match.group(0)
def escape(match):
c = match.group(0)
+ if c == '-':
+ if font == r'\fB':
+ return r'\-'
+ else:
+ return '-'
if c == '\\':
return r'\e'
elif c == '"':
if c == '\\':
return r'\e'
elif c == '"':
@@
-26,17
+31,18
@@
def textToNroff(s):
else:
raise Error("bad escape")
else:
raise Error("bad escape")
- s = re.sub('([\\\\"\'])', escape, s)
+ # Escape - \ " ' as needed by nroff.
+ s = re.sub('([-"\'\\\\])', escape, s)
if s.startswith('.'):
s = '\\' + s
return s
def escapeNroffLiteral(s):
if s.startswith('.'):
s = '\\' + s
return s
def escapeNroffLiteral(s):
- return r'\fB%s\fR' % textToNroff(s)
+ return r'\fB%s\fR' % textToNroff(s
, r'\fB'
)
def inlineXmlToNroff(node, font):
if node.nodeType == node.TEXT_NODE:
def inlineXmlToNroff(node, font):
if node.nodeType == node.TEXT_NODE:
- return textToNroff(node.data)
+ return textToNroff(node.data
, font
)
elif node.nodeType == node.ELEMENT_NODE:
if node.tagName == 'code' or node.tagName == 'em':
s = r'\fB'
elif node.nodeType == node.ELEMENT_NODE:
if node.tagName == 'code' or node.tagName == 'em':
s = r'\fB'