Changeset 6486

Timestamp:

09/08/06 16:32:19 (5 years ago)

Author:

anp

Message:

gestion des styles commune à tous les éléments inline

Location:

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/textOdTransf/styles

Files:

• bs.append.xml (modified) (1 diff)
• widgets/block_inlineStyleTag.xml (deleted)
• widgets/block_inlineTags.xml (moved) (moved from trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/textOdTransf/styles/widgets/block_textLeafTag.xml) (2 diffs)
• widgets/block_phraseTag.xml (deleted)

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/textOdTransf/styles/bs.append.xml

@@ -91 +91 @@
         <import href="bsco:sm/textOdTransf/styles/widgets/block_uLinkTag.xml"/>
         <!-- <import href="bsco:sm/textOdTransf/styles/widgets/block_noteTag.xml"/> configuration uniquement au niveau global -->
-        <import href="bsco:sm/textOdTransf/styles/widgets/block_phraseTag.xml"/>
-        <import href="bsco:sm/textOdTransf/styles/widgets/block_inlineStyleTag.xml"/>
-        <import href="bsco:sm/textOdTransf/styles/widgets/block_textLeafTag.xml"/>
+        <import href="bsco:sm/textOdTransf/styles/widgets/block_inlineTags.xml"/><!-- inlineStyleTag, phraseTag, textLeafTag  -->
         <!-- <import href="bsco:sm/textOdTransf/styles/widgets/block_inlineImgTag.xml"/> configuration dans le transformer des images. Rien à ce niveau -->
         <import href="bsco:sm/textOdTransf/styles/widgets/block_inlineMathTexTag.xml"/>

trunk/Wsp_Modeling/spaces/gen/modelBuilder/bs.doss/_common/sm/textOdTransf/styles/widgets/block_inlineTags.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
         <!-- modélisation/résolution des différentes valeurs pour les différents blocks -->
-        <structure code="textLeafTag" 
-                                        racine="//*[starts-with(name(), 'sm:textLeafTag')]" 
+        <structure code="inlineTags" 
+                                        racine="//*[starts-with(name(), 'sm:textLeafTag') or name()='sm:inlineStyleTag' or name()='sm:phraseTag']" 
                                         codecomposant="concat(local-name(), '_', @role)"
                                         xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
@@ -159 +159 @@
                                                                                                 </xsl:when>
                                                                                                 <xsl:otherwise>
-                                                                                                        <draw:frame draw:style-name="{resultat?agent=../../stResolver/img.prefix/name}" 
-                                                                                                                                draw:name="{resultat?agent=../../stResolver/img.prefix/name}"
+                                                                                                        <draw:frame draw:style-name="{resultatAgent('../../stResolver/img.prefix/name')}" 
+                                                                                                                                draw:name="{resultatAgent('../../stResolver/img.prefix/name')}"
                                                                                                                                 text:anchor-type="as-char" 
                                                                                                                                 svg:width="0.8cm"