Changeset 98
- Timestamp:
- 11/26/08 10:53:36 (3 years ago)
- Location:
- trunk/model
- Files:
-
- 42 added
- 7 edited
-
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/docM.transf (modified) (1 diff)
-
tests/Optim/sources/testGhis/chapitre1.content (modified) (18 diffs)
-
tests/Optim/sources/testGhis/intro.content (modified) (2 diffs)
-
tests/Optim/sources/testGhis/rapport.report (modified) (1 diff)
-
tests/Optim/sources/testGhis/res (added)
-
tests/Optim/sources/testGhis/res/GPL.refs (added)
-
tests/Optim/sources/testGhis/res/LGPL.refs (added)
-
tests/Optim/sources/testGhis/res/anim.swf (added)
-
tests/Optim/sources/testGhis/res/anim.swf/anim.swf (added)
-
tests/Optim/sources/testGhis/res/anim.swf/meta.xml (added)
-
tests/Optim/sources/testGhis/res/anim.swf/props.xml (added)
-
tests/Optim/sources/testGhis/res/cahier_des_charges.refs (added)
-
tests/Optim/sources/testGhis/res/def.refs (added)
-
tests/Optim/sources/testGhis/res/def_02.refs (added)
-
tests/Optim/sources/testGhis/res/fragment.xml (added)
-
tests/Optim/sources/testGhis/res/image.gif (added)
-
tests/Optim/sources/testGhis/res/image.gif/image.gif (added)
-
tests/Optim/sources/testGhis/res/image.gif/meta.xml (added)
-
tests/Optim/sources/testGhis/res/image.gif/props.xml (added)
-
tests/Optim/sources/testGhis/res/image.jpeg (added)
-
tests/Optim/sources/testGhis/res/image.jpeg/image.jpeg (added)
-
tests/Optim/sources/testGhis/res/image.jpeg/meta.xml (added)
-
tests/Optim/sources/testGhis/res/image.jpeg/props.xml (added)
-
tests/Optim/sources/testGhis/res/image.jpg (added)
-
tests/Optim/sources/testGhis/res/image.jpg/image.jpg (added)
-
tests/Optim/sources/testGhis/res/image.jpg/meta.xml (added)
-
tests/Optim/sources/testGhis/res/image.jpg/props.xml (added)
-
tests/Optim/sources/testGhis/res/imageGallery.png (added)
-
tests/Optim/sources/testGhis/res/imageGallery.png/imageGallery.png (added)
-
tests/Optim/sources/testGhis/res/imageGallery.png/meta.xml (added)
-
tests/Optim/sources/testGhis/res/imageGallery.png/props.xml (added)
-
tests/Optim/sources/testGhis/res/images.images (added)
-
tests/Optim/sources/testGhis/res/ref2.refs (added)
-
tests/Optim/sources/testGhis/res/res.odg (added)
-
tests/Optim/sources/testGhis/res/res.odg/meta.xml (added)
-
tests/Optim/sources/testGhis/res/res.odg/props.xml (added)
-
tests/Optim/sources/testGhis/res/res.odg/res.odg (added)
-
tests/Optim/sources/testGhis/res/res.ods (added)
-
tests/Optim/sources/testGhis/res/res.ods/meta.xml (added)
-
tests/Optim/sources/testGhis/res/res.ods/props.xml (added)
-
tests/Optim/sources/testGhis/res/res.ods/res.ods (added)
-
tests/Optim/sources/testGhis/res/res_02.refs (added)
-
tests/Optim/sources/testGhis/res/video.flv (added)
-
tests/Optim/sources/testGhis/res/video.flv/meta.xml (added)
-
tests/Optim/sources/testGhis/res/video.flv/props.xml (added)
-
tests/Optim/sources/testGhis/res/video.flv/video.flv (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/model/sources/office/gen/od/gen/paper.odtemplate
r97 r98 15 15 </sm:WPageMaster> 16 16 <sm:WPageMaster style="content"> 17 <sm:header> 18 <sm:headerContent> 19 <sm:right> 20 <sm:WTextArea style="chapRefHeader"> 21 <sm:dynamicString> 22 <sm:refHeading format="number and name" level="1"/> 23 </sm:dynamicString> 24 </sm:WTextArea> 25 </sm:right> 26 </sm:headerContent> 27 </sm:header> 17 28 <sm:body> 18 29 <sm:callRootModel/> 19 </sm:body>20 </sm:WPageMaster>21 <sm:WPageMaster style="doc" name="Table des Annexes">22 <sm:body>23 30 <sm:showDataBlocks refCategory="doc" hideIfNoBlocks="yes"> 24 31 <sm:WSection> 25 32 <sm:heading> 26 33 <sm:title> 27 <sm:fixedString value="; Table des Annexes"/>34 <sm:fixedString value=";Bibliographie"/> 28 35 </sm:title> 29 36 <sm:forEachBlock> 30 37 <sm:WSection> 31 38 <sm:WParagraph> 32 <sm:fixedString value=";Annexe "/> 33 <sm:callBlockPosition numbering="1"/> 34 <sm:fixedString value="; : "/> 39 <sm:fixedString value=";["/> 35 40 <sm:callBlockLabel/> 41 <sm:fixedString value="; ]"/> 36 42 </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> 43 <sm:callBlockData/> 44 <sm:WParagraph> 45 <sm:fixedString value=";Cf. page(s) "/> 46 <sm:callBlockPages separator=", "/> 47 <sm:fixedString value=";."/> 48 </sm:WParagraph> 45 49 </sm:WSection> 46 50 </sm:forEachBlock> … … 73 77 </sm:showDataBlocks> 74 78 </sm:body> 79 <sm:footer> 80 <sm:footerContent> 81 <sm:right> 82 <sm:WTextArea style="num"> 83 <sm:dynamicString> 84 <sm:pageNumber/> 85 </sm:dynamicString> 86 </sm:WTextArea> 87 </sm:right> 88 </sm:footerContent> 89 </sm:footer> 75 90 </sm:WPageMaster> 76 91 </sm:contentStruct> 77 92 <sm:dataBlockDeclaration category="doc" sort="ascending" hideSameBlock="yes" hideEmptyBlocks="yes"> 78 93 <sm:content> 79 <sm:WInline style="indexDoc"> 80 <sm:formattingMark> 81 <sm:nonBreakingSpace/> 82 </sm:formattingMark> 83 <sm:fixedString value=";(cf. Annexe "/> 84 <sm:callBlockPosition numbering="1"/> 85 <sm:fixedString value="; page "/> 86 <sm:refBlock position="firstCallData"> 87 <sm:blockPage/> 88 </sm:refBlock> 89 <sm:fixedString value=";)"/> 94 <sm:WInline style="doc"> 95 <sm:fixedString value=";["/> 96 <sm:callBlockLabel/> 97 <sm:fixedString value=";]"/> 90 98 </sm:WInline> 91 99 </sm:content> -
trunk/model/sources/office/gen/od/transf/base/txt.transf
r97 r98 36 36 <sm:textLink/> 37 37 <sm:dataBlock category="doc"> 38 <sm:sortKey>39 <sm:subModelTitle format="fullTitleText"/>40 </sm:sortKey>41 38 <sm:label> 42 39 <sm:textLink/> -
trunk/model/sources/office/gen/od/transf/ref/docM.transf
r95 r98 3 3 <sm:model sc:refUri="/office/model/ref/docM.model"/> 4 4 <sm:content> 5 <sm:forField codes="code"> 6 <sm:WParagraph> 7 <sm:fieldValueString/> 8 </sm:WParagraph> 9 </sm:forField> 5 10 <sm:forField codes="title"> 6 11 <sm:WParagraph> -
trunk/model/tests/Optim/sources/testGhis/chapitre1.content
r97 r98 24 24 25 25 26 26 27 <sc:inlineStyle role="imp">Important Important</sc:inlineStyle> 27 28 </sc:para> 28 29 <sc:para sc:id="t139">Citation<sc:phrase role="quote" sc:id="t174"> Citation</sc:phrase> 30 29 31 30 32 … … 40 42 </sc:para> 41 43 <sc:para sc:id="t141"> 42 <sc:uLink role="doc" sc:id="t177" sc:refUri="/testGhis/res _02.refs">Document / ref. biblio</sc:uLink>44 <sc:uLink role="doc" sc:id="t177" sc:refUri="/testGhis/res/res_02.refs">Document / ref. biblio</sc:uLink> 43 45 </sc:para> 44 46 <sc:para sc:id="t142"> 45 <sc:uLink role="def" sc:id="t179" sc:refUri="/testGhis/ def.refs">Définition</sc:uLink>47 <sc:uLink role="def" sc:id="t179" sc:refUri="/testGhis/res/def.refs">Définition</sc:uLink> 46 48 </sc:para> 47 <sc:para sc:id="t143">Imagette <sc:inlineImg role="ico" sc:id="t181" sc:refUri="/testGhis/ image.gif"/>49 <sc:para sc:id="t143">Imagette <sc:inlineImg role="ico" sc:id="t181" sc:refUri="/testGhis/res/image.gif"/> 48 50 </sc:para> 49 51 <sc:table role="" sc:id="t70"> … … 63 65 </sc:cell> 64 66 <sc:cell sc:id="t78"> 65 <sc:para sc:id="t97">qsfd<sc:inlineImg role="ico" sc:id="t283" sc:refUri="/testGhis/ image.gif"/>67 <sc:para sc:id="t97">qsfd<sc:inlineImg role="ico" sc:id="t283" sc:refUri="/testGhis/res/image.gif"/> 66 68 </sc:para> 67 69 </sc:cell> … … 73 75 <sc:cell sc:id="t80"> 74 76 <sc:para sc:id="t101"> 75 <sc:uLink role="def" sc:id="t284" sc:refUri="/testGhis/ def.refs">21</sc:uLink>77 <sc:uLink role="def" sc:id="t284" sc:refUri="/testGhis/res/def.refs">21</sc:uLink> 76 78 </sc:para> 77 79 </sc:cell> … … 126 128 <sc:cell sc:id="t257"> 127 129 <sc:para sc:id="t234"> 128 <sc:uLink role="doc" sc:id="t285" sc:refUri="/testGhis/res _02.refs">etr</sc:uLink>130 <sc:uLink role="doc" sc:id="t285" sc:refUri="/testGhis/res/res_02.refs">etr</sc:uLink> 129 131 </sc:para> 130 132 </sc:cell> … … 140 142 <sc:cell sc:id="t262"> 141 143 <sc:para sc:id="t238"> 142 <sc:uLink role="url" sc:id="t286" url=" www.ubuntu-fr.org">dsf</sc:uLink>144 <sc:uLink role="url" sc:id="t286" url="http://www.ubuntu-fr.org">dsf</sc:uLink> 143 145 </sc:para> 144 146 </sc:cell> … … 192 194 <sc:para sc:id="t198">Liste riche à puce 2</sc:para> 193 195 <sc:para sc:id="t199"> 194 <sc:uLink role="def" sc:id="t301" sc:refUri="/testGhis/ def_02.refs">zazazaza (def2)</sc:uLink>196 <sc:uLink role="def" sc:id="t301" sc:refUri="/testGhis/res/def_02.refs">zazazaza (def2)</sc:uLink> 195 197 </sc:para> 196 198 <sc:para sc:id="t200"> 197 <sc:uLink role="doc" sc:id="t302" sc:refUri="/testGhis/re f2.refs">azazazaz</sc:uLink> (doc2)</sc:para>199 <sc:uLink role="doc" sc:id="t302" sc:refUri="/testGhis/res/ref2.refs">azazazaz</sc:uLink> (doc2)</sc:para> 198 200 </sc:listItem> 199 201 <sc:listItem sc:id="t201"> … … 249 251 </of:txt> 250 252 </sp:txt> 251 <sp:img sc:refUri="/testGhis/ imageGallery.png"/>252 <sp:anim sc:refUri="/testGhis/ video.flv"/>253 <sp:anim sc:refUri="/testGhis/ images.images"/>254 <sp:img sc:refUri="/testGhis/res .ods"/>255 <sp:img sc:refUri="/testGhis/res .odg"/>253 <sp:img sc:refUri="/testGhis/res/imageGallery.png"/> 254 <sp:anim sc:refUri="/testGhis/res/video.flv"/> 255 <sp:anim sc:refUri="/testGhis/res/images.images"/> 256 <sp:img sc:refUri="/testGhis/res/res.ods"/> 257 <sp:img sc:refUri="/testGhis/res/res.odg"/> 256 258 </of:flow> 257 259 </sp:co> … … 271 273 </of:txt> 272 274 </sp:txt> 273 <sp:img sc:refUri="/testGhis/ image.gif"/>274 <sp:img sc:refUri="/testGhis/ image.jpg"/>275 <sp:img sc:refUri="/testGhis/res/image.gif"/> 276 <sp:img sc:refUri="/testGhis/res/image.jpg"/> 275 277 </of:flow> 276 278 </sp:co> … … 290 292 </of:txt> 291 293 </sp:txt> 292 <sp:img sc:refUri="/testGhis/ image.jpg"/>294 <sp:img sc:refUri="/testGhis/res/image.jpg"/> 293 295 </of:flow> 294 296 </sp:co> … … 308 310 </of:txt> 309 311 </sp:txt> 310 <sp:img sc:refUri="/testGhis/ image.jpeg"/>312 <sp:img sc:refUri="/testGhis/res/image.jpeg"/> 311 313 </of:flow> 312 314 </sp:co> … … 334 336 </of:txt> 335 337 </sp:txt> 336 <sp:img sc:refUri="/testGhis/ image.gif"/>338 <sp:img sc:refUri="/testGhis/res/image.gif"/> 337 339 </of:flow> 338 340 </sp:co> … … 352 354 </of:txt> 353 355 </sp:txt> 354 <sp:img sc:refUri="/testGhis/ image.gif"/>355 <sp:img sc:refUri="/testGhis/ image.jpeg"/>356 <sp:img sc:refUri="/testGhis/res/image.gif"/> 357 <sp:img sc:refUri="/testGhis/res/image.jpeg"/> 356 358 </of:flow> 357 359 </sp:co> … … 379 381 </of:txt> 380 382 </sp:txt> 381 <sp:img sc:refUri="/testGhis/ image.gif"/>383 <sp:img sc:refUri="/testGhis/res/image.gif"/> 382 384 </of:flow> 383 385 </sp:co> … … 403 405 </of:flow> 404 406 </sp:pres> 405 <sp:img sc:refUri="/testGhis/ imageGallery.png">407 <sp:img sc:refUri="/testGhis/res/imageGallery.png"> 406 408 <of:filter/> 407 409 </sp:img> 408 <sp:img sc:refUri="/testGhis/ image.jpg">410 <sp:img sc:refUri="/testGhis/res/image.jpg"> 409 411 <of:filter/> 410 412 </sp:img> … … 424 426 </of:flow> 425 427 </sp:pres> 426 <sp:img sc:refUri="/testGhis/ image.jpeg">428 <sp:img sc:refUri="/testGhis/res/image.jpeg"> 427 429 <of:filter/> 428 430 </sp:img> … … 431 433 </of:gallery> 432 434 </sp:gallery> 433 <sp:frag sc:refUri="/testGhis/ fragment.xml"/>435 <sp:frag sc:refUri="/testGhis/res/fragment.xml"/> 434 436 <sp:info> 435 437 <of:filter/> … … 525 527 <sp:txt> 526 528 <of:txt> 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>529 <sc:para sc:id="t11">Test texte de section info <sc:uLink role="def" sc:id="t317" sc:refUri="/testGhis/res/LGPL.refs">LGPL</sc:uLink></sc:para> 528 530 </of:txt> 529 531 </sp:txt> -
trunk/model/tests/Optim/sources/testGhis/intro.content
r97 r98 20 20 </of:txt> 21 21 </sp:txt> 22 <sp:img sc:refUri="/testGhis/ imageGallery.png"/>23 <sp:img sc:refUri="/testGhis/ image.jpeg"/>24 <sp:anim sc:refUri="/testGhis/ anim.swf"/>22 <sp:img sc:refUri="/testGhis/res/imageGallery.png"/> 23 <sp:img sc:refUri="/testGhis/res/image.jpeg"/> 24 <sp:anim sc:refUri="/testGhis/res/anim.swf"/> 25 25 </of:flow> 26 26 </sp:co> … … 47 47 <sp:txt> 48 48 <of:txt> 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>49 <sc:para sc:id="t15">Test texte bloc information dans section d'intro <sc:uLink role="def" sc:id="t16" sc:refUri="/testGhis/res/GPL.refs">Définition dans le texte GPL</sc:uLink></sc:para> 50 <sc:para sc:id="t18">Référence dans le texte <sc:uLink role="doc" sc:id="t17" sc:refUri="/testGhis/res/cahier_des_charges.refs">Cahier des charges</sc:uLink></sc:para> 51 51 </of:txt> 52 52 </sp:txt> -
trunk/model/tests/Optim/sources/testGhis/rapport.report
r79 r98 3 3 <of:report xmlns:of="scpf.org:office" xmlns:sp="http://www.utc.fr/ics/scenari/v3/primitive" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"> 4 4 <of:reportM> 5 <sp:title>Test </sp:title>5 <sp:title>Test ceci est un titre long long Test ceci est un titre long long Test ceci est un titre long long</sp:title> 6 6 </of:reportM> 7 7 <sp:pre sc:refUri="/testGhis/intro.content">
Note: See TracChangeset
for help on using the changeset viewer.
