On 8/4/23 19:25, Colin Watson wrote:
> tbl defaults to expecting table entries to be separated by tab
> characters. However, commit 5a0e4aec1af5cf7741c490bce704577e51e536b9
> converted these to spaces and inadvertently broke the rendering. Use
> semicolons as separators instead; these are less prone to being broken
> by tree-wide changes, and match the style used by
> build-aux/extract-ofp-fields.
Makes sense. Thanks!
>
> Reported-by: Lucas Nussbaum
> Reported-at: https://bugs.debian.org/1042358
> Signed-off-by: Colin Watson
> ---
> lib/meta-flow.xml | 25 +
> 1 file changed, 13 insertions(+), 12 deletions(-)
>
> diff --git a/lib/meta-flow.xml b/lib/meta-flow.xml
> index bdd12f6a7..0ac182be1 100644
> --- a/lib/meta-flow.xml
> +++ b/lib/meta-flow.xml
> @@ -3517,23 +3517,24 @@ actions=clone(load:0->NXM_OF_IN_PORT[],output:123)
>
>
>
> +tab(;);
> r r r r r.
> -CriteriaOpenFlow 1.0OpenFlow 1.1OpenFlow 1.2+ NXM
> -\_ \_ \_ \_ \_
> -[1] \fL\fR/\fL1\fR,\fL??\fR/\fL?\fR
> \fL\fR/\fL1\fR,\fL??\fR/\fL?\fR \fL\fR/\fL\fR,\fL--\fR
> \fL\fR/\fL\fR
> -[2] \fL\fR/\fL0\fR,\fL??\fR/\fL?\fR
> \fL\fR/\fL0\fR,\fL??\fR/\fL?\fR \fL\fR/\fL\fR,\fL--\fR
> \fL\fR/\fL\fR
> -[3] \fL0xxx\fR/\fL0\fR,\fL??\fR/\fL1\fR
> \fL0xxx\fR/\fL0\fR,\fL??\fR/\fL1\fR \fL1xxx\fR/\fL\fR,\fL--\fR
> \fL1xxx\fR/\fL1fff\fR
> -[4] \fL\fR/\fL1\fR,\fL0y\fR/\fL0\fR
> \fLfffe\fR/\fL0\fR,\fL0y\fR/\fL0\fR \fL1000\fR/\fL1000\fR,\fL0y\fR
> \fLz000\fR/\fLf000\fR
> -[5] \fL0xxx\fR/\fL0\fR,\fL0y\fR/\fL0\fR
> \fL0xxx\fR/\fL0\fR,\fL0y\fR/\fL0\fR \fL1xxx\fR/\fL\fR,\fL0y\fR
> \fLzxxx\fR/\fL\fR
> +Criteria;OpenFlow 1.0;OpenFlow 1.1;OpenFlow 1.2+;NXM
> +\_;\_;\_;\_;\_
> +[1];\fL\fR/\fL1\fR,\fL??\fR/\fL?\fR;\fL\fR/\fL1\fR,\fL??\fR/\fL?\fR;\fL\fR/\fL\fR,\fL--\fR;\fL\fR/\fL\fR
> +[2];\fL\fR/\fL0\fR,\fL??\fR/\fL?\fR;\fL\fR/\fL0\fR,\fL??\fR/\fL?\fR;\fL\fR/\fL\fR,\fL--\fR;\fL\fR/\fL\fR
> +[3];\fL0xxx\fR/\fL0\fR,\fL??\fR/\fL1\fR;\fL0xxx\fR/\fL0\fR,\fL??\fR/\fL1\fR;\fL1xxx\fR/\fL\fR,\fL--\fR;\fL1xxx\fR/\fL1fff\fR
> +[4];\fL\fR/\fL1\fR,\fL0y\fR/\fL0\fR;\fLfffe\fR/\fL0\fR,\fL0y\fR/\fL0\fR;\fL1000\fR/\fL1000\fR,\fL0y\fR;\fLz000\fR/\fLf000\fR
> +[5];\fL0xxx\fR/\fL0\fR,\fL0y\fR/\fL0\fR;\fL0xxx\fR/\fL0\fR,\fL0y\fR/\fL0\fR;\fL1xxx\fR/\fL\fR,\fL0y\fR;\fLzxxx\fR/\fL\fR
> .T&
> r r c c r.
I beleive, this should be 'r c c r r', otherwise they are no fully aligned.
> -[6] (none) (none) \fL1001\fR/\fL1001\fR,\fL--\fR \fL1001\fR/\fL1001\fR
> +[6];(none);(none);\fL1001\fR/\fL1001\fR,\fL--\fR;\fL1001\fR/\fL1001\fR
> .T&
> r r c c c.
And this should be 'r c c c r'.
> -[7] (none) (none) (none) \fL3000\fR/\fL3000\fR
> -[8] (none) (none) (none) \fL\fR/\fL0fff\fR
> -[9] (none) (none) (none) \fL\fR/\fLf000\fR
> -[10](none) (none) (none) \fL\fR/\fLefff\fR
> +[7];(none);(none);(none);\fL3000\fR/\fL3000\fR
> +[8];(none);(none);(none);\fL\fR/\fL0fff\fR
> +[9];(none);(none);(none);\fL\fR/\fLf000\fR
> +[10];(none);(none);(none);\fL\fR/\fLefff\fR
>
>
>
___
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev