[merged new docbook paragraph rules from medborgon
Panu Kalliokoski <atehwa@sange.fi>**20040618080923
 Keywords: 
 
 Patches applied:
 
  * atehwa@sange.fi--2004-medborgon/stx2any--prod--2--patch-24
    More changes to paragraph rules
 
  * atehwa@sange.fi--2004-medborgon/stx2any--prod--2--patch-25
    Cross-merged paragraph rules from main to avoid conflicts
 
 
 (atehwa@sange.fi--2004/stx2any--prod--2--patch-28)
] {
hunk ./docbook-xml/make.m4 10
-  `w_close</Sect`'defn(`@w_sectlev')>define(`@w_sectlev',
+  `w_close</Sect`'defn(`@w_sectlev')>w_softopen`'define(`@w_sectlev',
hunk ./docbook-xml/make.m4 14
-`w_set_sect_level(`$1')<Title>$2</Title>')
+`w_set_sect_level(`$1')<Title>$2</Title>w_softopen')
hunk ./docbook-xml/make.m4 19
-define(`w_open', `w_paragraph`'define(`@w_para_flag',)')
+define(`w_softopen', `define(`@w_para_flag',t)')
+define(`w_open', `w_paragraph`'undefine(`@w_para_flag')')
hunk ./docbook-xml/make.m4 25
-w_define_env(*,`w_close<ItemizedList>',`w_close</ItemizedList>')
-w_define_env(-,`w_close<ItemizedList>',`w_close</ItemizedList>')
-w_define_env(#,`w_close<OrderedList>',`w_close</OrderedList>')
+w_define_env(*,`w_close<ItemizedList>',`w_close</ItemizedList>w_softopen')
+w_define_env(-,`w_close<ItemizedList>',`w_close</ItemizedList>w_softopen')
+w_define_env(#,`w_close<OrderedList>',`w_close</OrderedList>w_softopen')
hunk ./docbook-xml/make.m4 29
-w_define_env(q,`w_close<BlockQuote>w_open',`w_close</BlockQuote>')
-w_define_env(litblock,`w_close<Screen>',`w_close</Screen>')
+w_define_env(q,`w_close<BlockQuote>w_open',`w_close</BlockQuote>w_softopen')
+w_define_env(litblock,`w_close<Screen>',`w_close</Screen>w_softopen')
hunk ./docbook-xml/make.m4 34
-`w_close</VariableList>popdef(`@w_varitem_open')')
+`w_close</VariableList>popdef(`@w_varitem_open')w_softopen')
hunk ./docbook-xml/make.m4 45
-`ifelse(defn(`@w_varitem_open'),t,`w_close</VarListEntry>')'dnl
+`ifelse(defn(`@w_varitem_open'),t,`w_close</VarListEntry>w_softopen`'')'dnl
hunk ./docbook-xml/make.m4 57
-`w_close</Entry></Row></TBody></TGroup></InformalTable>')
+`w_close</Entry></Row></TBody></TGroup></InformalTable>w_softopen')
hunk ./docbook-xml/make.m4 61
-`w_close</Abstract>w_enddiv(ingr)')
+`w_close</Abstract>w_enddiv(ingr)w_softopen')
hunk ./docbook-xml/make.m4 79
-`w_close</Entry></Row></TBody></TGroup></InformalTable>'dnl
+`w_close</Entry></Row></TBody></TGroup></InformalTable>w_softopen`''dnl
hunk ./regression/abbrev.docbook-xml 86
-Paragraph in between
-</Sect3><Sect3><Title>1.4.2 another headline</Title>
+<Para>Paragraph in between
+</Para></Sect3><Sect3><Title>1.4.2 another headline</Title>
hunk ./regression/list.docbook-xml 24
-</Para></BlockQuote>quote?
+</Para></BlockQuote><Para>quote?
hunk ./regression/list.docbook-xml 26
-</ListItem></ItemizedList><Para>quote?
+</Para></ListItem></ItemizedList><Para>quote?
hunk ./regression/list.docbook-xml 46
-</Para></BlockQuote>back we go
+</Para></BlockQuote><Para>back we go
hunk ./regression/list.docbook-xml 48
-</ListItem></ItemizedList><ItemizedList><ListItem><Para>list intercept
+</Para></ListItem></ItemizedList><ItemizedList><ListItem><Para>list intercept
hunk ./regression/list.docbook-xml 51
-</Para></ListItem></VarListEntry></VariableList>it is so firm
-</ListItem><ListItem><Para>the problem's not here anymore
+</Para></ListItem></VarListEntry></VariableList><Para>it is so firm
+</Para></ListItem><ListItem><Para>the problem's not here anymore
hunk ./regression/list.docbook-xml 57
-</Para></ListItem></ItemizedList>the fun's begun
+</Para></ListItem></ItemizedList><Para>the fun's begun
hunk ./regression/list.docbook-xml 59
-</ListItem></VarListEntry><VarListEntry><Term>term two</Term>
+</Para></ListItem></VarListEntry><VarListEntry><Term>term two</Term>
}