Skip to content

Commit

Permalink
Fix merge conflict with rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
r0ckarong committed Mar 23, 2023
2 parents db974b9 + 15e4640 commit fc5b0f0
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions lib/rgl/rdot.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ module DOT
# https://www.graphviz.org/Documentation/dotguide.pdf
# January 5, 2015

# attributes due to
# https://www.graphviz.org/Documentation/dotguide.pdf
# January 5, 2015

# options for node declaration
NODE_OPTS = [
'color', # default: black; node shape color
Expand Down Expand Up @@ -236,6 +240,10 @@ def quote_label(label)
# Return a quoted version of the label otherwise.
'"' + label.split(/(\\n|\\r|\\l)/).collect do |part|
case part
when "\\n", "\\r", "\\l"
part
else
part.gsub('\\', '\\\\\\\\').gsub('"', '\\\\"').gsub("\n", '\\n')
when "\\n", "\\r", "\\l"
part
else
Expand Down Expand Up @@ -345,6 +353,8 @@ def to_s(leader = '', indent = ' ')
leader + (@name.nil? ? '' : quote_ID(@name) + " ") + "[\n" +
stringified_options + "\n" +
leader + "]"
stringified_options + "\n" +
leader + "]"
end
end
end # class Node
Expand Down Expand Up @@ -424,6 +434,7 @@ def to_s(leader = '', indent = ' ')

hdr + (options.empty? ? '' : options + "\n\n") +
(elements.empty? ? '' : elements + "\n") + leader + "}"
(elements.empty? ? '' : elements + "\n") + leader + "}"
end
end # class Graph

Expand Down Expand Up @@ -508,6 +519,8 @@ def to_s(leader = '', indent = ' ')
leader + quote_ID(f_s) + ' ' + edge_link + ' ' + quote_ID(t_s) + " [\n" +
stringified_options + "\n" +
leader + "]"
stringified_options + "\n" +
leader + "]"
end
end

Expand Down

0 comments on commit fc5b0f0

Please sign in to comment.