[PATCH v3 3/3] doc: update diagrams for compatibility.

Bryce Harrington bryce at osg.samsung.com
Wed Jan 28 17:59:33 PST 2015


On Wed, Jan 28, 2015 at 05:54:57PM -0800, Bryce Harrington wrote:
> On Wed, Jan 28, 2015 at 05:24:06PM -0800, Jon A. Cruz wrote:
> > Change attribute separators for compatiblity with graphviz older than 2.30.
> > 
> > Signed-off-by: Jon A. Cruz <jonc at osg.samsung.com>
> 
> Changes look good, and I verified the output comes up fine in firefox,
> and actually looks a bit nicer than the current image.
> 
> Reviewed-by: Bryce Harrington <bryce at osg.samsung.com>
> Tested-by: Bryce Harrington <bryce at osg.samsung.com>

Thanks, applied:

   f858550..7575e2e  master -> master

 
> Btw, patch 1/3 never came through to me, although patchwork sees it fine.
> 
> > ---
> >  doc/doxygen/dot/wayland-architecture.gv | 44 ++++++++++++++---------------
> >  doc/doxygen/dot/x-architecture.gv       | 50 ++++++++++++++++-----------------
> >  2 files changed, 47 insertions(+), 47 deletions(-)
> > 
> > diff --git a/doc/doxygen/dot/wayland-architecture.gv b/doc/doxygen/dot/wayland-architecture.gv
> > index b86f4b5..2d5db84 100644
> > --- a/doc/doxygen/dot/wayland-architecture.gv
> > +++ b/doc/doxygen/dot/wayland-architecture.gv
> > @@ -1,39 +1,39 @@
> >  digraph arch_wayland {
> >      edge[
> > -        fontname="DejaVu Sans";
> > -        dir="both";
> > -        arrowtail="dot";
> > -        arrowsize=.5;
> > -        fontname="DejaVu Sans"
> > -        fontsize="18";
> > +        fontname="DejaVu Sans",
> > +        dir="both",
> > +        arrowtail="dot",
> > +        arrowsize=.5,
> > +        fontname="DejaVu Sans",
> > +        fontsize="18",
> >      ]
> >  
> >      node[
> > -        shape="Mrecord";
> > -        color=none;
> > -        fillcolor="#ffbc00";
> > -        style="filled";
> > -        fontname="DejaVu Sans"
> > -        fontsize="18";
> > +        shape="Mrecord",
> > +        color=none,
> > +        fillcolor="#ffbc00",
> > +        style="filled",
> > +        fontname="DejaVu Sans",
> > +        fontsize="18",
> >     ]
> >  
> > -    c1 [label="Wayland Client"; URL="#c1"]
> > -    c2 [label="Wayland Client"; URL="#c2"]
> > +    c1 [label="Wayland Client", URL="#c1"]
> > +    c2 [label="Wayland Client", URL="#c2"]
> >  
> > -    comp [tooltip="Wayland Compositor" label="|{|Wayland\nCompositor|}|"; URL="#comp"]
> > +    comp [tooltip="Wayland Compositor", label="|{|Wayland\nCompositor|}|", URL="#comp"]
> >  
> > -    impl [tooltip="KMS evdev Kernel" label="|{{KMS|evdev}|Kernel}|"; URL="#impl"]
> > +    impl [tooltip="KMS evdev Kernel", label="|{{KMS|evdev}|Kernel}|", URL="#impl"]
> >  
> >  
> > -    c1 -> comp [taillabel="③"; labeldistance=2.5; URL="#step_3"];
> > +    c1 -> comp [taillabel="③", labeldistance=2.5, URL="#step_3"];
> >      c2 -> comp;
> >  
> > -    comp -> c1 [label="②"; URL="#step_2"];
> > +    comp -> c1 [label="②", URL="#step_2"];
> >      comp -> c2;
> >  
> > -    comp -> impl [xlabel = "④"; URL="#step_4"];
> > -    comp -> impl [style = invis; label="    "];
> > -    impl -> comp [xlabel = "①"; URL="#step_1"];
> > +    comp -> impl [xlabel = "④", URL="#step_4"];
> > +    comp -> impl [style = invis, label="    "];
> > +    impl -> comp [xlabel = "①", URL="#step_1"];
> >  
> >      c1 -> c2 [style=invis];
> > - }
> > +}
> > diff --git a/doc/doxygen/dot/x-architecture.gv b/doc/doxygen/dot/x-architecture.gv
> > index 85c98a3..4ea49bf 100644
> > --- a/doc/doxygen/dot/x-architecture.gv
> > +++ b/doc/doxygen/dot/x-architecture.gv
> > @@ -1,52 +1,52 @@
> >  digraph arch_x {
> >      edge[
> > -        fontname="DejaVu Sans";
> > -        dir="both";
> > -        arrowtail="dot";
> > -        arrowsize=.5;
> > -        fontname="DejaVu Sans"
> > -        fontsize="18";
> > +        fontname="DejaVu Sans",
> > +        dir="both",
> > +        arrowtail="dot",
> > +        arrowsize=.5,
> > +        fontname="DejaVu Sans",
> > +        fontsize="18",
> >      ]
> >  
> >      node[
> > -        shape="Mrecord";
> > -        color=none;
> > -        fillcolor="#ffbc00";
> > -        style="filled";
> > -        fontname="DejaVu Sans"
> > -        fontsize="18";
> > +        shape="Mrecord",
> > +        color=none,
> > +        fillcolor="#ffbc00",
> > +        style="filled",
> > +        fontname="DejaVu Sans",
> > +        fontsize="18",
> >      ]
> >  
> >      {
> >          rank=same;
> > -        c1 [label="X Client"; URL="#c1"]
> > -        c3 [label="X Client"; URL="#c3"]
> > +        c1 [label="X Client", URL="#c1"]
> > +        c3 [label="X Client", URL="#c3"]
> >      }
> > -    c2 [label="X Client"; URL="#c2"]
> > +    c2 [label="X Client", URL="#c2"]
> >  
> >      {
> >          rank=same;
> > -        xserver [tooltip="X Server" label="|{|X Server|}|"; URL="#xserver"]
> > -        comp [tooltip="Compositor" label="|{|Compositor|}|"; URL="#comp"]
> > +        xserver [tooltip="X Server", label="|{|X Server|}|", URL="#xserver"]
> > +        comp [tooltip="Compositor", label="|{|Compositor|}|", URL="#comp"]
> >      }
> >  
> > -    impl [tooltip="KMS evdev Kernel" label="|{{KMS|evdev}|Kernel}|"; URL="#impl"]
> > +    impl [tooltip="KMS evdev Kernel", label="|{{KMS|evdev}|Kernel}|", URL="#impl"]
> >  
> > -    c1 -> xserver [taillabel="③"; labeldistance=2; URL="#step_3"];
> > +    c1 -> xserver [taillabel="③", labeldistance=2, URL="#step_3"];
> >      c2 -> xserver;
> >      c3 -> xserver;
> >  
> > -    xserver -> c1 [taillabel="②"; labeldistance=2; URL="#step_2"];
> > +    xserver -> c1 [taillabel="②", labeldistance=2, URL="#step_2"];
> >      xserver -> c2;
> >      xserver -> c3;
> >  
> > -    xserver -> impl [taillabel = "⑥"; labeldistance=1.75; URL="#step_6"];
> > -    xserver -> impl [style = invis; label="    "];
> > -    impl -> xserver [taillabel = "①"; labeldistance=1.75; URL="#step_1"];
> > +    xserver -> impl [taillabel="⑥", labeldistance=1.75, URL="#step_6"];
> > +    xserver -> impl [style=invis, label="    "];
> > +    impl -> xserver [taillabel="①", labeldistance=1.75, URL="#step_1"];
> >  
> >      xserver -> comp [style=invis];
> > -    xserver -> comp [taillabel="④"; labeldistance=1.75; labelangle=-45; URL="#step_4"];
> > -    comp -> xserver [taillabel="⑤"; URL="#step_5"];
> > +    xserver -> comp [taillabel="④", labeldistance=1.75, labelangle=-45, URL="#step_4"];
> > +    comp -> xserver [taillabel="⑤", URL="#step_5"];
> >      comp -> xserver [style=invis]
> >  
> >      c1 -> c2 [style=invis];
> > -- 
> > 2.1.0
> > 
> > _______________________________________________
> > wayland-devel mailing list
> > wayland-devel at lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/wayland-devel
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list