Changeset 97
- Timestamp:
- 24.11.2008 14:54:36 (16 months ago)
- Location:
- trunk/model
- Files:
-
- 7 added
- 6 modified
-
sources/office/gen/od/gen/paper.odstyle.odt (modified) (previous)
-
sources/office/gen/od/gen/paper.odtemplate (modified) (2 diffs)
-
sources/office/gen/od/transf/base/txt.transf (modified) (1 diff)
-
sources/office/gen/od/transf/ref.transflist (modified) (1 diff)
-
sources/office/gen/od/transf/ref/def.transf (added)
-
sources/office/gen/od/transf/ref/defM.transf (added)
-
tests/Optim/sources/testGhis/GPL.refs (added)
-
tests/Optim/sources/testGhis/LGPL.refs (added)
-
tests/Optim/sources/testGhis/cahier_des_charges.refs (added)
-
tests/Optim/sources/testGhis/chapitre1.content (modified) (4 diffs)
-
tests/Optim/sources/testGhis/def_02.refs (added)
-
tests/Optim/sources/testGhis/intro.content (modified) (1 diff)
-
tests/Optim/sources/testGhis/ref2.refs (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/model/sources/office/gen/od/gen/paper.odtemplate
r96 r97 23 23 <sm:showDataBlocks refCategory="doc" hideIfNoBlocks="yes"> 24 24 <sm:WSection> 25 <sm:WParagraph> 26 <sm:fixedString value=";Table des Annexes"/> 27 </sm:WParagraph> 28 <sm:forEachBlock> 29 <sm:WSection> 30 <sm:WParagraph> 31 <sm:fixedString value=";Annexe "/> 32 <sm:callBlockPosition numbering="1"/> 33 <sm:fixedString value="; : "/> 34 <sm:callBlockLabel/> 35 </sm:WParagraph> 25 <sm:heading> 26 <sm:title> 27 <sm:fixedString value=";Table des Annexes"/> 28 </sm:title> 29 <sm:forEachBlock> 30 <sm:WSection> 31 <sm:WParagraph> 32 <sm:fixedString value=";Annexe "/> 33 <sm:callBlockPosition numbering="1"/> 34 <sm:fixedString value="; : "/> 35 <sm:callBlockLabel/> 36 </sm:WParagraph> 37 <sm:WSection> 38 <sm:callBlockData/> 39 <sm:WParagraph> 40 <sm:fixedString value=";Cf. page(s) "/> 41 <sm:callBlockPages separator=", "/> 42 <sm:fixedString value=";."/> 43 </sm:WParagraph> 44 </sm:WSection> 45 </sm:WSection> 46 </sm:forEachBlock> 47 </sm:heading> 48 </sm:WSection> 49 </sm:showDataBlocks> 50 <sm:showDataBlocks refCategory="def" hideIfNoBlocks="yes"> 51 <sm:WSection> 52 <sm:heading> 53 <sm:title> 54 <sm:fixedString value=";Glossaire"/> 55 </sm:title> 56 <sm:forEachBlock> 57 <sm:WSection> 58 <sm:WParagraph> 59 <sm:callBlockLabel/> 60 </sm:WParagraph> 61 </sm:WSection> 36 62 <sm:WSection> 37 63 <sm:callBlockData/> 64 <sm:WParagraph> 65 <sm:fixedString value=";Cf. page(s) "/> 66 <sm:callBlockPages separator=", "/> 67 <sm:fixedString value=";."/> 68 </sm:WParagraph> 38 69 </sm:WSection> 39 </sm: WSection>40 </sm: forEachBlock>70 </sm:forEachBlock> 71 </sm:heading> 41 72 </sm:WSection> 42 73 </sm:showDataBlocks> … … 52 83 <sm:fixedString value=";(cf. Annexe "/> 53 84 <sm:callBlockPosition numbering="1"/> 85 <sm:fixedString value="; page "/> 86 <sm:refBlock position="firstCallData"> 87 <sm:blockPage/> 88 </sm:refBlock> 54 89 <sm:fixedString value=";)"/> 55 90 </sm:WInline> 56 91 </sm:content> 57 92 </sm:dataBlockDeclaration> 93 <sm:dataBlockDeclaration category="def" sort="ascending" hideSameBlock="yes" hideEmptyBlocks="yes"> 94 <sm:content> 95 <sm:WInline style="def"> 96 <sm:callBlockPosition numbering="1"/> 97 </sm:WInline> 98 </sm:content> 99 </sm:dataBlockDeclaration> 58 100 </sm:odTemplateText> -
trunk/model/sources/office/gen/od/transf/base/txt.transf
r96 r97 47 47 </sm:dataBlock> 48 48 </sm:uLinkTag> 49 <sm:uLinkTag role="def"> 50 <sm:textLink/> 51 <sm:dataBlock category="def"> 52 <sm:sortKey> 53 <sm:subModelTitle/> 54 </sm:sortKey> 55 <sm:label> 56 <sm:textLink/> 57 </sm:label> 58 <sm:data> 59 <sm:callSubModel/> 60 </sm:data> 61 </sm:dataBlock> 62 </sm:uLinkTag> 49 63 <sm:phraseTag role="quote"/> 50 64 <sm:inlineStyleTag role="imp"/> -
trunk/model/sources/office/gen/od/transf/ref.transflist
r95 r97 1 1 <?xml version="1.0" encoding="UTF-8"?> 2 2 <sm:transformerList xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling"> 3 <sm:transformer sc:refUri="/office/gen/od/transf/ref/def.transf"/> 4 <sm:transformer sc:refUri="/office/gen/od/transf/ref/defM.transf"/> 3 5 <sm:transformer sc:refUri="/office/gen/od/transf/ref/doc.transf"/> 4 6 <sm:transformer sc:refUri="/office/gen/od/transf/ref/docM.transf"/> -
trunk/model/tests/Optim/sources/testGhis/chapitre1.content
r92 r97 22 22 23 23 24 25 24 26 <sc:inlineStyle role="imp">Important Important</sc:inlineStyle> 25 27 </sc:para> 26 28 <sc:para sc:id="t139">Citation<sc:phrase role="quote" sc:id="t174"> Citation</sc:phrase> 29 30 27 31 28 32 … … 64 68 <sc:cell sc:id="t79"> 65 69 <sc:para sc:id="t99"> 66 <sc:phrase xml:lang="français"role="quote" sc:id="t282">12</sc:phrase>70 <sc:phrase role="quote" sc:id="t282">12</sc:phrase> 67 71 </sc:para> 68 72 </sc:cell> … … 187 191 <sc:listItem sc:id="t197"> 188 192 <sc:para sc:id="t198">Liste riche à puce 2</sc:para> 189 <sc:para sc:id="t199">zazazaza</sc:para> 190 <sc:para sc:id="t200">azazazaz</sc:para> 193 <sc:para sc:id="t199"> 194 <sc:uLink role="def" sc:id="t301" sc:refUri="/testGhis/def_02.refs">zazazaza (def2)</sc:uLink> 195 </sc:para> 196 <sc:para sc:id="t200"> 197 <sc:uLink role="doc" sc:id="t302" sc:refUri="/testGhis/ref2.refs">azazazaz</sc:uLink> (doc2)</sc:para> 191 198 </sc:listItem> 192 199 <sc:listItem sc:id="t201"> … … 518 525 <sp:txt> 519 526 <of:txt> 520 <sc:para sc:id="t11">Test texte de section info </sc:para>527 <sc:para sc:id="t11">Test texte de section info <sc:uLink role="def" sc:id="t317" sc:refUri="/testGhis/LGPL.refs">LGPL</sc:uLink></sc:para> 521 528 </of:txt> 522 529 </sp:txt> -
trunk/model/tests/Optim/sources/testGhis/intro.content
r80 r97 47 47 <sp:txt> 48 48 <of:txt> 49 <sc:para sc:id="t15">Test texte bloc information dans section d'intro</sc:para> 49 <sc:para sc:id="t15">Test texte bloc information dans section d'intro <sc:uLink role="def" sc:id="t16" sc:refUri="/testGhis/GPL.refs">Définition dans le texte LGPL</sc:uLink></sc:para> 50 <sc:para>Référence dans le texte <sc:uLink role="doc" sc:id="t17" sc:refUri="/testGhis/cahier_des_charges.refs">Cahier des charges</sc:uLink></sc:para> 50 51 </of:txt> 51 52 </sp:txt>
