Changeset 1668
- Timestamp:
- 03/01/10 10:42:44 (5 months ago)
- Location:
- trunk/model/sources/academic/gen
- Files:
-
- 1 added
- 4 modified
-
_od/transf/Ue/Ue.transf (modified) (5 diffs)
-
_od/widgets/headerSection.odwidget (added)
-
quadra/paper/paper.generator (modified) (1 diff)
-
quadra/paper/paper.odtemplate (modified) (13 diffs)
-
quadra/paper/paper.skin.odt (modified) (previous)
Legend:
- Unmodified
- Added
- Removed
-
trunk/model/sources/academic/gen/_od/transf/Ue/Ue.transf
r1445 r1668 1 <?xml version="1.0" encoding="UTF-8"?><sm:compositionOdtTransf xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"> 1 <?xml version="1.0" encoding="UTF-8"?> 2 <sm:compositionOdtTransf xmlns:sc="http://www.utc.fr/ics/scenari/v3/core" xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"> 2 3 <sm:model sc:refUri="/academic/model/Ue/ue.model"/> 3 4 <sm:content> 4 5 <sm:for codes="obj"> 5 <sm:WParagraph style="breakNewSection" display="always"/> 6 <sm:WSection style="pageTitleSct"> 7 <sm:label/> 8 <sm:WParagraph style="pageTitle"> 6 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 7 <sm:odContentZone key="addInTdm"> 8 <sm:fixedString value="true"/> 9 </sm:odContentZone> 10 <sm:odContentZone key="zTitle"> 9 11 <sm:fixedString value=";Objectifs"/> 10 </sm:WParagraph> 11 <sm:WParagraph style="pageId" display="always"/> 12 </sm:WSection> 12 </sm:odContentZone> 13 </sm:Widget> 13 14 <sm:callSubModel/> 14 15 </sm:for> 15 16 <sm:for codes="intro"> 16 <sm:WParagraph style="breakNewSection" display="always"/> 17 <sm:WSection style="pageTitleSct"> 18 <sm:label/> 19 <sm:WParagraph style="pageTitle"> 17 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 18 <sm:odContentZone key="addInTdm"> 19 <sm:fixedString value="true"/> 20 </sm:odContentZone> 21 <sm:odContentZone key="zTitle"> 20 22 <sm:fixedString value=";Introduction"/> 21 </sm:WParagraph> 22 <sm:WParagraph style="pageId" display="always"/> 23 </sm:WSection> 23 </sm:odContentZone> 24 </sm:Widget> 24 25 <sm:callSubModel/> 25 26 </sm:for> … … 30 31 <sm:inDataOrder> 31 32 <sm:for codes="courseUa assmntUa div courseUc practUc trainUc"> 32 <sm:WParagraph style="breakNewSection" display="always"/>33 33 <sm:heading> 34 34 <sm:title> … … 36 36 <sm:fixedTitle value=";Section"/> 37 37 </sm:title> 38 <sm:WSection style="chapter"> 39 <sm:label/> 40 <sm:WParagraph style="chapterName"> 38 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 39 <sm:odContentZone key="addInTdm"> 40 <sm:fixedString value="true"/> 41 </sm:odContentZone> 42 <sm:odContentZone key="zTitle"> 41 43 <sm:WInline style="hidden"> 42 44 <!--Obligé pour la tdm--> … … 49 51 <sm:refHeading format="name" level="1"/> 50 52 </sm:dynamicString> 51 </sm: WParagraph>52 <sm: WParagraph style="chapterNumber">53 </sm:odContentZone> 54 <sm:odContentZone key="zPage"> 53 55 <sm:dynamicString> 54 56 <sm:refHeading format="number" level="1"/> 55 57 </sm:dynamicString> 56 </sm:WParagraph> 57 <!--style spaceAfter nécessaire car OO interprète mal le @spaceAfter sur un paragraphe : saut de page intempestif--> 58 <sm:WParagraph style="spaceAfter" display="always"/> 59 </sm:WSection> 58 </sm:odContentZone> 59 </sm:Widget> 60 60 <sm:WSection style="sectionToc"> 61 61 <sm:label/> … … 77 77 </sm:inDataOrder> 78 78 <sm:for codes="conclu"> 79 <sm:WParagraph style="breakNewSection" display="always"/> 80 <sm:WSection style="pageTitleSct"> 81 <sm:label/> 82 <sm:WParagraph style="pageTitle"> 79 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 80 <sm:odContentZone key="addInTdm"> 81 <sm:fixedString value="true"/> 82 </sm:odContentZone> 83 <sm:odContentZone key="zTitle"> 83 84 <sm:fixedString value=";Conclusion"/> 84 </sm:WParagraph> 85 <sm:WParagraph style="pageId" display="always"/> 86 </sm:WSection> 85 </sm:odContentZone> 86 </sm:Widget> 87 87 <sm:callSubModel/> 88 88 </sm:for> -
trunk/model/sources/academic/gen/quadra/paper/paper.generator
r1652 r1668 24 24 <sm:mode debug="no"/> 25 25 <sm:output format="odt" openOfficeVersion="3.x"/> 26 <!-- 27 28 <sm:layoutOptimisations xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling"> 29 30 <sm:keepEnumTitle/> 31 32 </sm:layoutOptimisations>--> 26 <sm:layoutOptimisations> 27 <sm:keepEnumTitle/> 28 </sm:layoutOptimisations> 33 29 </sm:odGenerator> -
trunk/model/sources/academic/gen/quadra/paper/paper.odtemplate
r1652 r1668 26 26 <sm:headerContentLeft> 27 27 <sm:left> 28 <sm:WArea style="partTitle ">28 <sm:WArea style="partTitleLeft"> 29 29 <sm:WParagraph style="partTitleLeftP"> 30 30 <sm:dynamicString> … … 37 37 <sm:headerContentRight> 38 38 <sm:left> 39 <sm:WArea style="partTitle 2">39 <sm:WArea style="partTitleRight"> 40 40 <sm:WParagraph style="partTitleRightP"> 41 41 <sm:dynamicString> … … 143 143 </sm:when> 144 144 </sm:choose> 145 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="def"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Définition"/></sm:odContentZone></sm:Widget>-->146 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="ex"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Exemple"/></sm:odContentZone></sm:Widget>-->147 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="rem"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Remarque"/></sm:odContentZone></sm:Widget>-->148 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="adv"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Conseil"/></sm:odContentZone></sm:Widget>-->149 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="warning"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Attention"/></sm:odContentZone></sm:Widget>-->150 <!---->151 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="comp"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Complément"/></sm:odContentZone></sm:Widget>-->152 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="meth"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Méthode"/></sm:odContentZone></sm:Widget>-->153 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="remind"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Rappel"/></sm:odContentZone></sm:Widget>-->154 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="basic"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Fondamental"/></sm:odContentZone></sm:Widget>-->155 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="syntax"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Syntaxe"/></sm:odContentZone></sm:Widget>-->156 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="legal"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Légal"/></sm:odContentZone></sm:Widget>-->157 <!--<sm:Widget xmlns:sm="http://www.utc.fr/ics/scenari/v3/modeling" sc:refUri="/academic/gen/_od/widgets/typo.odwidget" xmlns:sc="http://www.utc.fr/ics/scenari/v3/core"><sm:odContentZone key="zPrefixIco"><sm:fixedString value="simul"/></sm:odContentZone><sm:odContentZone key="zTxt"><sm:fixedString value="Simulateur"/></sm:odContentZone></sm:Widget>-->158 145 </sm:when> 159 146 </sm:choose> 160 147 <!--# Table des matières--> 161 <sm:WParagraph style="breakNewSection" display="always"/> 162 <sm:WSection style="pageTitleSct"> 163 <sm:WParagraph style="pageTitleNoTdm"> 148 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 149 <sm:odContentZone key="addInTdm"> 150 <sm:fixedString value="false"/> 151 </sm:odContentZone> 152 <sm:odContentZone key="zTitle"> 164 153 <sm:fixedString value=";Table des matières"/> 165 </sm:WParagraph> 166 <sm:WParagraph style="pageId" display="always"/> 167 </sm:WSection> 154 </sm:odContentZone> 155 </sm:Widget> 168 156 <sm:WTableOfContents style="toc"/> 169 157 <!--# Contenu--> … … 171 159 <!--# Ressources pointées non affichées dans le contenu--> 172 160 <sm:showDataBlocks refCategory="res" hideIfNoBlocks="yes"> 173 <sm:WParagraph style="breakNewSection" display="always"/> 174 <sm:WSection style="pageTitleSct"> 175 <sm:WParagraph style="pageTitle"> 161 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 162 <sm:odContentZone key="addInTdm"> 163 <sm:fixedString value="true"/> 164 </sm:odContentZone> 165 <sm:odContentZone key="zTitle"> 176 166 <sm:fixedString value=";Ressources annexes"/> 177 </sm:WParagraph> 178 <sm:WParagraph style="pageId" display="always"/> 179 </sm:WSection> 167 </sm:odContentZone> 168 </sm:Widget> 180 169 <sm:WSection style="resContent"> 181 170 <sm:forEachBlock> … … 196 185 <sm:when xpath="/*/*/op:odRootM/sp:annsettings/sp:quest='yes'"> 197 186 <sm:showDataBlocks refCategory="synth" hideIfNoBlocks="yes"> 198 <sm:WParagraph style="breakNewSection" display="always"/> 199 <sm:WSection style="pageTitleSct"> 200 <sm:WParagraph style="pageTitle"> 187 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 188 <sm:odContentZone key="addInTdm"> 189 <sm:fixedString value="true"/> 190 </sm:odContentZone> 191 <sm:odContentZone key="zTitle"> 201 192 <sm:fixedString value=";Questions de synthèse"/> 202 </sm:WParagraph> 203 <sm:WParagraph style="pageId" display="always"/> 204 </sm:WSection> 193 </sm:odContentZone> 194 </sm:Widget> 205 195 <sm:WSection style="synthContent"> 206 196 <sm:forEachBlock> … … 223 213 <sm:when xpath="/*/*/op:odRootM/sp:annsettings/sp:solution='yes'"> 224 214 <sm:showDataBlocks refCategory="sol" hideIfNoBlocks="yes"> 225 <sm:WParagraph style="breakNewSection" display="always"/> 226 <sm:WSection style="pageTitleSct"> 227 <sm:WParagraph style="pageTitle"> 215 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 216 <sm:odContentZone key="addInTdm"> 217 <sm:fixedString value="true"/> 218 </sm:odContentZone> 219 <sm:odContentZone key="zTitle"> 228 220 <sm:fixedString value=";Solution des exercices de TD"/> 229 </sm:WParagraph> 230 <sm:WParagraph style="pageId" display="always"/> 231 </sm:WSection> 221 </sm:odContentZone> 222 </sm:Widget> 232 223 <sm:WSection style="solExContent"> 233 224 <sm:forEachBlock> … … 258 249 <sm:when xpath="/*/*/op:odRootM/sp:annsettings/sp:solutionQuiz='yes'"> 259 250 <sm:showDataBlocks refCategory="solQuiz" hideIfNoBlocks="yes"> 260 <sm:WParagraph style="breakNewSection" display="always"/> 261 <sm:WSection style="pageTitleSct"> 262 <sm:WParagraph style="pageTitle"> 251 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 252 <sm:odContentZone key="addInTdm"> 253 <sm:fixedString value="true"/> 254 </sm:odContentZone> 255 <sm:odContentZone key="zTitle"> 263 256 <sm:fixedString value=";Solution des Quiz"/> 264 </sm:WParagraph> 265 <sm:WParagraph style="pageId" display="always"/> 266 </sm:WSection> 257 </sm:odContentZone> 258 </sm:Widget> 267 259 <sm:WSection style="solExContent"> 268 260 <sm:forEachBlock> … … 293 285 <sm:when xpath="/*/*/op:odRootM/sp:annsettings/sp:glos='yes'"> 294 286 <sm:showDataBlocks refCategory="glos" hideIfNoBlocks="yes"> 295 <sm:WParagraph style="breakNewSection" display="always"/> 296 <sm:WSection style="pageTitleSct"> 297 <sm:WParagraph style="pageTitle"> 287 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 288 <sm:odContentZone key="addInTdm"> 289 <sm:fixedString value="true"/> 290 </sm:odContentZone> 291 <sm:odContentZone key="zTitle"> 298 292 <sm:fixedString value=";Glossaire"/> 299 </sm:WParagraph> 300 <sm:WParagraph style="pageId" display="always"/> 301 </sm:WSection> 293 </sm:odContentZone> 294 </sm:Widget> 302 295 <sm:WSection style="glosContent"> 303 296 <sm:forEachBlock> … … 312 305 <sm:when xpath="/*/*/op:odRootM/sp:annsettings/sp:acr='yes'"> 313 306 <sm:showDataBlocks refCategory="acr" hideIfNoBlocks="yes"> 314 <sm:WParagraph style="breakNewSection" display="always"/> 315 <sm:WSection style="pageTitleSct"> 316 <sm:WParagraph style="pageTitle"> 307 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 308 <sm:odContentZone key="addInTdm"> 309 <sm:fixedString value="true"/> 310 </sm:odContentZone> 311 <sm:odContentZone key="zTitle"> 317 312 <sm:fixedString value=";Signification des abréviations"/> 318 </sm:WParagraph> 319 <sm:WParagraph style="pageId" display="always"/> 320 </sm:WSection> 313 </sm:odContentZone> 314 </sm:Widget> 321 315 <sm:WSection style="acrContent"> 322 316 <sm:forEachBlock> … … 331 325 <sm:when xpath="/*/*/op:odRootM/sp:annsettings/sp:ref='yes'"> 332 326 <sm:showDataBlocks refCategory="ref" hideIfNoBlocks="yes"> 333 <sm:WParagraph style="breakNewSection" display="always"/> 334 <sm:WSection style="pageTitleSct"> 335 <sm:WParagraph style="pageTitle"> 336 <sm:fixedString value="Références"/> 337 </sm:WParagraph> 338 <sm:WParagraph style="pageId" display="always"/> 339 </sm:WSection> 327 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 328 <sm:odContentZone key="addInTdm"> 329 <sm:fixedString value="true"/> 330 </sm:odContentZone> 331 <sm:odContentZone key="zTitle"> 332 <sm:fixedString value=";Références"/> 333 </sm:odContentZone> 334 </sm:Widget> 340 335 <sm:WSection style="refContent"> 341 336 <sm:forEachBlock> … … 362 357 <sm:when xpath="/*/*/op:odRootM/sp:annsettings/sp:bib='yes'"> 363 358 <sm:showDataBlocks refCategory="bib" hideIfNoBlocks="yes"> 364 <sm:WParagraph style="breakNewSection" display="always"/> 365 <sm:WSection style="pageTitleSct"> 366 <sm:WParagraph style="pageTitle"> 359 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 360 <sm:odContentZone key="addInTdm"> 361 <sm:fixedString value="true"/> 362 </sm:odContentZone> 363 <sm:odContentZone key="zTitle"> 367 364 <sm:fixedString value=";Bibliographie"/> 368 </sm:WParagraph> 369 <sm:WParagraph style="pageId" display="always"/> 370 </sm:WSection> 365 </sm:odContentZone> 366 </sm:Widget> 371 367 <sm:WSection style="bibContent"> 372 368 <sm:forEachBlock> … … 391 387 <sm:when xpath="/*/*/op:odRootM/sp:annsettings/sp:index='yes'"> 392 388 <sm:showDataBlocks refCategory="keywd" hideIfNoBlocks="yes"> 393 <sm:WParagraph style="breakNewSection" display="always"/> 394 <sm:WSection style="pageTitleSct"> 395 <sm:WParagraph style="pageTitle"> 396 <sm:fixedString value="Index"/> 397 </sm:WParagraph> 398 <sm:WParagraph style="pageId" display="always"/> 399 </sm:WSection> 389 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 390 <sm:odContentZone key="addInTdm"> 391 <sm:fixedString value="true"/> 392 </sm:odContentZone> 393 <sm:odContentZone key="zTitle"> 394 <sm:fixedString value=";Index"/> 395 </sm:odContentZone> 396 </sm:Widget> 400 397 <sm:WSection style="indexContent"> 401 398 <sm:forEachBlock> … … 423 420 <sm:when xpath="/*/*/op:odRootM/sp:annsettings/sp:resource='yes'"> 424 421 <sm:showDataBlocks refCategory="cprRes" hideIfNoBlocks="yes"> 425 <sm:WParagraph style="breakNewSection" display="always"/> 426 <sm:WSection style="pageTitleSct"> 427 <sm:WParagraph style="pageTitle"> 422 <sm:Widget sc:refUri="/academic/gen/_od/widgets/headerSection.odwidget"> 423 <sm:odContentZone key="addInTdm"> 424 <sm:fixedString value="true"/> 425 </sm:odContentZone> 426 <sm:odContentZone key="zTitle"> 428 427 <sm:fixedString value=";Crédit des ressources"/> 429 </sm:WParagraph> 430 <sm:WParagraph style="pageId" display="always"/> 431 </sm:WSection> 428 </sm:odContentZone> 429 </sm:Widget> 432 430 <sm:WSection style="ressContent"> 433 431 <sm:forEachBlock>