<div dir="ltr">Is there no way to just make the scanner use the text without adding extra nesting? </div><div class="gmail_extra"> <div class="gmail_quote">On Mon, Nov 9, 2015 at 9:14 AM, Derek Foreman <<a href="mailto:derekf@osg.samsung.com" target="_blank">derekf@osg.samsung.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On 08/11/15 09:58 PM, Peter Hutterer wrote: > The scanner parses CDATA in <entry> but lets it disappear otherwise. To have > descriptive text associated with the <entry>, we need a <description> tag - > and that must have a summary attribute. The current scanner doesn't handle > <description> however, so to get the summary printed in the output file we > still need the summary attribute in the entry tag too. Kinda gross. wayland.xml seems to get this wrong all over the place? (wrt missing summary= in some sections) Should we be teaching the scanner about <description> to avoid the need for duplication? > Signed-off-by: Peter Hutterer <<a href="mailto:peter.hutterer@who-t.net">peter.hutterer@who-t.net</a>> Reviewed-by: Derek Foreman <<a href="mailto:derekf@osg.samsung.com">derekf@osg.samsung.com</a>> <div class="HOEnZb"><div class="h5"> > --- > unstable/xdg-shell/xdg-shell-unstable-v5.xml | 34 +++++++++++++++++----------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/unstable/xdg-shell/xdg-shell-unstable-v5.xml b/unstable/xdg-shell/xdg-shell-unstable-v5.xml > index 64346fb..127992b 100644 > --- a/unstable/xdg-shell/xdg-shell-unstable-v5.xml > +++ b/unstable/xdg-shell/xdg-shell-unstable-v5.xml > @@ -340,23 +340,31 @@ > 0x1000 - 0x1FFF: GNOME > </description> > <entry name="maximized" value="1" summary="the surface is maximized"> > - The surface is maximized. The window geometry specified in the configure > - event must be obeyed by the client. > + <description summary="the surface is maximized"> > + The surface is maximized. The window geometry specified in the configure > + event must be obeyed by the client. > + </description> > </entry> > <entry name="fullscreen" value="2" summary="the surface is fullscreen"> > - The surface is fullscreen. The window geometry specified in the configure > - event must be obeyed by the client. > + <description summary="the surface is fullscreen"> > + The surface is fullscreen. The window geometry specified in the configure > + event must be obeyed by the client. > + </description> > </entry> > - <entry name="resizing" value="3"> > - The surface is being resized. The window geometry specified in the > - configure event is a maximum; the client cannot resize beyond it. > - Clients that have aspect ratio or cell sizing configuration can use > - a smaller size, however. > + <entry name="resizing" value="3" summary="the surface is being resized"> > + <description summary="the surface is being resized"> > + The surface is being resized. The window geometry specified in the > + configure event is a maximum; the client cannot resize beyond it. > + Clients that have aspect ratio or cell sizing configuration can use > + a smaller size, however. > + </description> > </entry> > - <entry name="activated" value="4"> > - Client window decorations should be painted as if the window is > - active. Do not assume this means that the window actually has > - keyboard or pointer focus. > + <entry name="activated" value="4" summary="the surface is now activated"> > + <description summary="the surface is now activated"> > + Client window decorations should be painted as if the window is > + active. Do not assume this means that the window actually has > + keyboard or pointer focus. > + </description> > </entry> > </enum> > > </div></div><div class="HOEnZb"><div class="h5">_______________________________________________ wayland-devel mailing list <a href="mailto:wayland-devel@lists.freedesktop.org">wayland-devel@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/wayland-devel" rel="noreferrer" target="_blank">http://lists.freedesktop.org/mailman/listinfo/wayland-devel</a> </div></div></blockquote></div> </div>