[PATCH 2/9] doc: Preserve spaces

Bill Spitzak spitzak at gmail.com
Tue Nov 25 09:41:57 PST 2014


On 11/25/2014 06:47 AM, Pekka Paalanen wrote:
> On Tue, 11 Nov 2014 18:42:55 -0800
> Bill Spitzak <spitzak at gmail.com> wrote:
>
>> Slight variation on Pekka's patch. It seems harmless to put this anywhere.
>
> I assume you refer to
> http://cgit.freedesktop.org/wayland/wayland/commit/?id=4a661c5b0c9c66102a142cd8d327dcad8007f1d7
>
> Unfortunately every generation of the html docs changed some internal
> ids, so seeing what actually changed is hard, but I don't see what this
> changes.

It makes the spaces be preserved in the code samples in the Doxygen 
output. Doxygen changes the spaces to <sp/> and it looks like publican 
just ignores these. This patch changes all <sp/> back into spaces and 
seems to work.

> What does this do really, and does it make the above mentioned commit
> redundant?

It is redundant as this changes <sp/> everywhere, not just in code 
samples. I think though there are cross-patches here, as the version I 
was working on did not have the other patch, I found that in the mailing 
list.

> Oh, the next patch removes the old hunk.

Yes I think this is due to rebase inserting the other patch and then 
this removed it.

>
> Thanks,
> pq
>
>> ---
>>   doc/publican/doxygen-to-publican.xsl |    4 ++++
>>   1 file changed, 4 insertions(+)
>>
>> diff --git a/doc/publican/doxygen-to-publican.xsl b/doc/publican/doxygen-to-publican.xsl
>> index b6ca5f3..99193e1 100644
>> --- a/doc/publican/doxygen-to-publican.xsl
>> +++ b/doc/publican/doxygen-to-publican.xsl
>> @@ -108,6 +108,10 @@
>>     <xsl:text> </xsl:text>
>>   </xsl:template>
>>
>> +<xsl:template match="sp">
>> +  <xsl:text> </xsl:text>
>> +</xsl:template>
>> +
>>   <xsl:template match="programlisting">
>>     <programlisting><xsl:apply-templates /></programlisting>
>>   </xsl:template>
>



More information about the wayland-devel mailing list