diff --git a/.github/workflows/create-snapshot.yml b/.github/workflows/create-snapshot.yml index edf33ea98..152672e86 100644 --- a/.github/workflows/create-snapshot.yml +++ b/.github/workflows/create-snapshot.yml @@ -52,30 +52,8 @@ jobs: exit 1 fi - deploy-maven-repo: - needs: check-version - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up Maven Central Repository - uses: actions/setup-java@v4 - with: - java-version: ${{ env.JAVA_VERSION }} - distribution: 'temurin' - server-id: ossrh - server-username: MAVEN_USERNAME - server-password: MAVEN_PASSWORD - gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} - gpg-passphrase: MAVEN_GPG_PASSPHRASE - - name: Build and deploy with Maven - run: mvn --batch-mode clean process-classes deploy -Prelease -DskipTests=true --no-transfer-progress - env: - MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} - MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} - MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} - create-tag: - needs: [ check-version, deploy-maven-repo ] + needs: check-version runs-on: ubuntu-latest steps: - name: Create tag @@ -89,16 +67,38 @@ jobs: sha: context.sha }) - deploy-comment: - needs: [ check-version, deploy-maven-repo ] - runs-on: ubuntu-latest - steps: - - uses: actions/github-script@v7 - with: - script: | - github.rest.issues.createComment({ - issue_number: context.issue.number, - owner: context.repo.owner, - repo: context.repo.repo, - body: '👋 Version ${{ needs.check-version.outputs.snapshot-version }} deployed on maven central repository' - }) +# deploy-maven-repo: +# needs: check-version +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# - name: Set up Maven Central Repository +# uses: actions/setup-java@v4 +# with: +# java-version: ${{ env.JAVA_VERSION }} +# distribution: 'temurin' +# server-id: ossrh +# server-username: MAVEN_USERNAME +# server-password: MAVEN_PASSWORD +# gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} +# gpg-passphrase: MAVEN_GPG_PASSPHRASE +# - name: Build and deploy with Maven +# run: mvn --batch-mode clean process-classes deploy -Prelease -DskipTests=true --no-transfer-progress +# env: +# MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }} +# MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }} +# MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + +# deploy-comment: +# needs: [ check-version, deploy-maven-repo ] +# runs-on: ubuntu-latest +# steps: +# - uses: actions/github-script@v7 +# with: +# script: | +# github.rest.issues.createComment({ +# issue_number: context.issue.number, +# owner: context.repo.owner, +# repo: context.repo.repo, +# body: '👋 Version ${{ needs.check-version.outputs.snapshot-version }} deployed on maven central repository' +# }) diff --git a/pom.xml b/pom.xml index cef492243..f3d86d68d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ fr.insee.eno eno-core - 2.18.3 + 2.19.0 jar Eno – Questionnaire generator @@ -119,7 +119,7 @@ 2.25.1 3.3.1 - 3.11.3 + 3.11.2 0.8.13 jacoco diff --git a/src/main/resources/xslt/outputs/fo/models.xsl b/src/main/resources/xslt/outputs/fo/models.xsl index a1dad8e78..67abc3b39 100644 --- a/src/main/resources/xslt/outputs/fo/models.xsl +++ b/src/main/resources/xslt/outputs/fo/models.xsl @@ -99,21 +99,11 @@ - ' #if ( - + @@ -1081,7 +1071,9 @@ - + + + @@ -1095,7 +1087,9 @@ - + + + @@ -1215,7 +1209,6 @@ - @@ -1554,15 +1547,16 @@ - + ' - + @@ -1583,7 +1577,14 @@ - + diff --git a/src/main/resources/xslt/transformations/ddi2fo/ddi2fo-fixed.xsl b/src/main/resources/xslt/transformations/ddi2fo/ddi2fo-fixed.xsl index dc51fc41f..c2a1ac79c 100644 --- a/src/main/resources/xslt/transformations/ddi2fo/ddi2fo-fixed.xsl +++ b/src/main/resources/xslt/transformations/ddi2fo/ddi2fo-fixed.xsl @@ -380,10 +380,21 @@ + + " - + + + + + + + + + + @@ -421,14 +432,27 @@ + + + + + + + + + + + - + - + + diff --git a/src/test/resources/ddi-to-fo/out.fo b/src/test/resources/ddi-to-fo/out.fo index e57d19067..b41eb0cf9 100644 --- a/src/test/resources/ddi-to-fo/out.fo +++ b/src/test/resources/ddi-to-fo/out.fo @@ -348,9 +348,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{SEASON_NUMBER})$!{SEASON_NUMBER}#{else} + text-align="justify">#{if}($!{SEASON_NUMBER})$!{SEASON_NUMBER}#{else} + +   - #{end} + + + #{end} @@ -396,9 +403,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{AUDIENCE_SHARE})$!{AUDIENCE_SHARE}#{else} + text-align="justify">#{if}($!{AUDIENCE_SHARE})$!{AUDIENCE_SHARE}#{else} + +   - #{end} + + + #{end} @@ -1447,9 +1461,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{PERCENTAGE_EXPENSES11})$!{PERCENTAGE_EXPENSES11}#{else} + padding="1mm">#{if}($!{PERCENTAGE_EXPENSES11})$!{PERCENTAGE_EXPENSES11}#{else} + +   - #{end}% + + + #{end}% @@ -1480,9 +1498,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{PERCENTAGE_EXPENSES21})$!{PERCENTAGE_EXPENSES21}#{else} + padding="1mm">#{if}($!{PERCENTAGE_EXPENSES21})$!{PERCENTAGE_EXPENSES21}#{else} + +   - #{end}% + + + #{end}% @@ -1526,9 +1548,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{PERCENTAGE_EXPENSES31})$!{PERCENTAGE_EXPENSES31}#{else} + padding="1mm">#{if}($!{PERCENTAGE_EXPENSES31})$!{PERCENTAGE_EXPENSES31}#{else} + +   - #{end}% + + + #{end}% @@ -1559,9 +1585,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{PERCENTAGE_EXPENSES41})$!{PERCENTAGE_EXPENSES41}#{else} + padding="1mm">#{if}($!{PERCENTAGE_EXPENSES41})$!{PERCENTAGE_EXPENSES41}#{else} + +   - #{end}% + + + #{end}% @@ -1592,9 +1622,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{PERCENTAGE_EXPENSES51})$!{PERCENTAGE_EXPENSES51}#{else} + padding="1mm">#{if}($!{PERCENTAGE_EXPENSES51})$!{PERCENTAGE_EXPENSES51}#{else} + +   - #{end}% + + + #{end}% @@ -1638,9 +1672,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{PERCENTAGE_EXPENSES61})$!{PERCENTAGE_EXPENSES61}#{else} + padding="1mm">#{if}($!{PERCENTAGE_EXPENSES61})$!{PERCENTAGE_EXPENSES61}#{else} + +   - #{end}% + + + #{end}% @@ -1671,9 +1709,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{PERCENTAGE_EXPENSES71})$!{PERCENTAGE_EXPENSES71}#{else} + padding="1mm">#{if}($!{PERCENTAGE_EXPENSES71})$!{PERCENTAGE_EXPENSES71}#{else} + +   - #{end}% + + + #{end}% @@ -2699,9 +2741,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -2729,9 +2775,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -2759,9 +2809,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -2789,9 +2843,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -2819,9 +2877,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -2849,9 +2911,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -2879,9 +2945,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -2909,9 +2979,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -2939,9 +3013,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -2969,9 +3047,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} @@ -2999,9 +3081,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -3029,9 +3115,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -3059,9 +3149,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -3089,9 +3183,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -3119,9 +3217,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -3149,9 +3251,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -3179,9 +3285,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -3209,9 +3319,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -3239,9 +3353,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -3269,9 +3387,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} @@ -3299,9 +3421,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -3329,9 +3455,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -3359,9 +3489,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -3389,9 +3523,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -3419,9 +3557,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -3449,9 +3591,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -3479,9 +3625,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -3509,9 +3659,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -3539,9 +3693,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -3569,9 +3727,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} @@ -3599,9 +3761,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -3629,9 +3795,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -3659,9 +3829,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -3689,9 +3863,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -3719,9 +3897,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -3749,9 +3931,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -3779,9 +3965,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -3809,9 +3999,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -3839,9 +4033,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -3869,9 +4067,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} @@ -3899,9 +4101,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -3929,9 +4135,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -3959,9 +4169,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -3989,9 +4203,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -4019,9 +4237,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -4049,9 +4271,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -4079,9 +4305,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -4109,9 +4339,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -4139,9 +4373,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -4169,9 +4407,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} @@ -4199,9 +4441,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -4229,9 +4475,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -4259,9 +4509,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -4289,9 +4543,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -4319,9 +4577,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -4349,9 +4611,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -4379,9 +4645,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -4409,9 +4679,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -4439,9 +4713,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -4469,9 +4747,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} @@ -4499,9 +4781,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -4529,9 +4815,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -4559,9 +4849,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -4589,9 +4883,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -4619,9 +4917,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -4649,9 +4951,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -4679,9 +4985,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -4709,9 +5019,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -4739,9 +5053,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -4769,9 +5087,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} @@ -4799,9 +5121,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -4829,9 +5155,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -4859,9 +5189,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -4889,9 +5223,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -4919,9 +5257,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -4949,9 +5291,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -4979,9 +5325,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -5009,9 +5359,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -5039,9 +5393,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -5069,9 +5427,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} @@ -5099,9 +5461,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -5129,9 +5495,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -5159,9 +5529,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -5189,9 +5563,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -5219,9 +5597,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -5249,9 +5631,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -5279,9 +5665,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -5309,9 +5699,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -5339,9 +5733,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -5369,9 +5767,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} @@ -5399,9 +5801,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS12}#{else} + +   - #{end} + + + #{end} @@ -5429,9 +5835,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS22}#{else} + +   - #{end} + + + #{end} @@ -5459,9 +5869,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS32}#{else} + +   - #{end} + + + #{end} @@ -5489,9 +5903,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS42}#{else} + +   - #{end} + + + #{end} @@ -5519,9 +5937,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS52}#{else} + +   - #{end} + + + #{end} @@ -5549,9 +5971,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS62}#{else} + +   - #{end} + + + #{end} @@ -5579,9 +6005,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS72}#{else} + +   - #{end} + + + #{end} @@ -5609,9 +6039,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS82}#{else} + +   - #{end} + + + #{end} @@ -5639,9 +6073,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS92}#{else} + +   - #{end} + + + #{end} @@ -5669,9 +6107,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + padding="1mm">#{if}($!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102})$!{FAVOURITE_CHARACTERS-0-FAVOURITE_CHARACTERS102}#{else} + +   - #{end} + + + #{end} diff --git a/src/test/resources/params/in-to-out/business/form.fo b/src/test/resources/params/in-to-out/business/form.fo index d00debc52..0765b38f1 100644 --- a/src/test/resources/params/in-to-out/business/form.fo +++ b/src/test/resources/params/in-to-out/business/form.fo @@ -1107,9 +1107,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{EFF3112})$!{EFF3112}#{else} + text-align="justify">#{if}($!{EFF3112})$!{EFF3112}#{else} + +   - #{end} + + + #{end} @@ -1139,9 +1146,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{EFF_ETP})$!{EFF_ETP}#{else} + text-align="justify">#{if}($!{EFF_ETP})$!{EFF_ETP}#{else} + +   - #{end} + + + #{end} @@ -1200,9 +1214,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{DUREE_EXERCICE})$!{DUREE_EXERCICE}#{else} + text-align="justify">#{if}($!{DUREE_EXERCICE})$!{DUREE_EXERCICE}#{else} + +   - #{end} + + + #{end} @@ -1254,9 +1275,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{CA})$!{CA}#{else} + text-align="justify">#{if}($!{CA})$!{CA}#{else} + +   - #{end}€ + + + #{end}€ @@ -1277,9 +1305,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{CA_MARCHANDISES})$!{CA_MARCHANDISES}#{else} + text-align="justify">#{if}($!{CA_MARCHANDISES})$!{CA_MARCHANDISES}#{else} + +   - #{end}€ + + + #{end}€ @@ -1309,9 +1344,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{PROD_STOCKEE_ET_EN_COURS})$!{PROD_STOCKEE_ET_EN_COURS}#{else} + text-align="justify">#{if}($!{PROD_STOCKEE_ET_EN_COURS})$!{PROD_STOCKEE_ET_EN_COURS}#{else} + +   - #{end}€ + + + #{end}€ @@ -1341,9 +1383,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{PRODUCTION_IMMOBILISEE})$!{PRODUCTION_IMMOBILISEE}#{else} + text-align="justify">#{if}($!{PRODUCTION_IMMOBILISEE})$!{PRODUCTION_IMMOBILISEE}#{else} + +   - #{end}€ + + + #{end}€ @@ -1373,9 +1422,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{SUBVENTIONS_EXPLOITATION})$!{SUBVENTIONS_EXPLOITATION}#{else} + text-align="justify">#{if}($!{SUBVENTIONS_EXPLOITATION})$!{SUBVENTIONS_EXPLOITATION}#{else} + +   - #{end}€ + + + #{end}€ @@ -1405,9 +1461,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{AUTRES_PRODUITS})$!{AUTRES_PRODUITS}#{else} + text-align="justify">#{if}($!{AUTRES_PRODUITS})$!{AUTRES_PRODUITS}#{else} + +   - #{end}€ + + + #{end}€ @@ -1634,9 +1697,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -1738,9 +1805,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -1842,9 +1913,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -1946,9 +2021,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2050,9 +2129,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2154,9 +2237,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2258,9 +2345,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2362,9 +2453,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2466,9 +2561,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2570,9 +2669,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2674,9 +2777,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2778,9 +2885,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2882,9 +2993,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -2986,9 +3101,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -3090,9 +3209,13 @@ color="black" font-weight="normal" font-size="10pt" - padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + padding="1mm">#{if}($!{REPARTITION_CA-0-REPARTITION_CA3})$!{REPARTITION_CA-0-REPARTITION_CA3}#{else} + +   - #{end} + + + #{end} @@ -3140,9 +3263,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{SALAIRES_TRAITEMENTS})$!{SALAIRES_TRAITEMENTS}#{else} + text-align="justify">#{if}($!{SALAIRES_TRAITEMENTS})$!{SALAIRES_TRAITEMENTS}#{else} + +   - #{end}€ + + + #{end}€ @@ -3172,9 +3302,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{CHARGES_SOCIALES})$!{CHARGES_SOCIALES}#{else} + text-align="justify">#{if}($!{CHARGES_SOCIALES})$!{CHARGES_SOCIALES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3204,9 +3341,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{COTISATIONS_SOCIALES_EXPLOITANT})$!{COTISATIONS_SOCIALES_EXPLOITANT}#{else} + text-align="justify">#{if}($!{COTISATIONS_SOCIALES_EXPLOITANT})$!{COTISATIONS_SOCIALES_EXPLOITANT}#{else} + +   - #{end}€ + + + #{end}€ @@ -3251,9 +3395,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{ACQUSITIONS_CORPORELLES})$!{ACQUSITIONS_CORPORELLES}#{else} + text-align="justify">#{if}($!{ACQUSITIONS_CORPORELLES})$!{ACQUSITIONS_CORPORELLES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3274,9 +3425,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{ACQUSITIONS_TERRAINS})$!{ACQUSITIONS_TERRAINS}#{else} + text-align="justify">#{if}($!{ACQUSITIONS_TERRAINS})$!{ACQUSITIONS_TERRAINS}#{else} + +   - #{end}€ + + + #{end}€ @@ -3297,9 +3455,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{ACQUISITIONS_INCORP_BDD})$!{ACQUISITIONS_INCORP_BDD}#{else} + text-align="justify">#{if}($!{ACQUISITIONS_INCORP_BDD})$!{ACQUISITIONS_INCORP_BDD}#{else} + +   - #{end}€ + + + #{end}€ @@ -3342,9 +3507,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{CESSIONS_CORPORELLES})$!{CESSIONS_CORPORELLES}#{else} + text-align="justify">#{if}($!{CESSIONS_CORPORELLES})$!{CESSIONS_CORPORELLES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3365,9 +3537,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{CESSIONS_TERRAINS})$!{CESSIONS_TERRAINS}#{else} + text-align="justify">#{if}($!{CESSIONS_TERRAINS})$!{CESSIONS_TERRAINS}#{else} + +   - #{end}€ + + + #{end}€ @@ -3388,9 +3567,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{CESSIONS_INCORPORELLES_BDD})$!{CESSIONS_INCORPORELLES_BDD}#{else} + text-align="justify">#{if}($!{CESSIONS_INCORPORELLES_BDD})$!{CESSIONS_INCORPORELLES_BDD}#{else} + +   - #{end}€ + + + #{end}€ @@ -3435,9 +3621,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{ACHAT_MARCHANDISES})$!{ACHAT_MARCHANDISES}#{else} + text-align="justify">#{if}($!{ACHAT_MARCHANDISES})$!{ACHAT_MARCHANDISES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3458,9 +3651,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{ACHATS_MATIERES_PREMIERES})$!{ACHATS_MATIERES_PREMIERES}#{else} + text-align="justify">#{if}($!{ACHATS_MATIERES_PREMIERES})$!{ACHATS_MATIERES_PREMIERES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3490,9 +3690,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{CHARGES_EXTERNES})$!{CHARGES_EXTERNES}#{else} + text-align="justify">#{if}($!{CHARGES_EXTERNES})$!{CHARGES_EXTERNES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3522,9 +3729,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{IMPOTS})$!{IMPOTS}#{else} + text-align="justify">#{if}($!{IMPOTS})$!{IMPOTS}#{else} + +   - #{end}€ + + + #{end}€ @@ -3554,9 +3768,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{AUTRES_CHARGES})$!{AUTRES_CHARGES}#{else} + text-align="justify">#{if}($!{AUTRES_CHARGES})$!{AUTRES_CHARGES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3607,9 +3828,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{VARIATION_STOCK_MARCHANDISES})$!{VARIATION_STOCK_MARCHANDISES}#{else} + text-align="justify">#{if}($!{VARIATION_STOCK_MARCHANDISES})$!{VARIATION_STOCK_MARCHANDISES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3630,9 +3858,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{VARIATION_STOCK_MATIERES_PREMIERES})$!{VARIATION_STOCK_MATIERES_PREMIERES}#{else} + text-align="justify">#{if}($!{VARIATION_STOCK_MATIERES_PREMIERES})$!{VARIATION_STOCK_MATIERES_PREMIERES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3675,9 +3910,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{EXPORTATIONS})$!{EXPORTATIONS}#{else} + text-align="justify">#{if}($!{EXPORTATIONS})$!{EXPORTATIONS}#{else} + +   - #{end}€ + + + #{end}€ @@ -3707,9 +3949,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{IMPORTATIONS})$!{IMPORTATIONS}#{else} + text-align="justify">#{if}($!{IMPORTATIONS})$!{IMPORTATIONS}#{else} + +   - #{end}€ + + + #{end}€ @@ -3743,9 +3992,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{INTERETS_VERSES})$!{INTERETS_VERSES}#{else} + text-align="justify">#{if}($!{INTERETS_VERSES})$!{INTERETS_VERSES}#{else} + +   - #{end}€ + + + #{end}€ @@ -3766,9 +4022,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{INTERETS_PERCUS})$!{INTERETS_PERCUS}#{else} + text-align="justify">#{if}($!{INTERETS_PERCUS})$!{INTERETS_PERCUS}#{else} + +   - #{end}€ + + + #{end}€ @@ -3789,9 +4052,16 @@ font-weight="normal" font-size="10pt" padding="1mm" - text-align="justify">#{if}($!{DIVIDENDES})$!{DIVIDENDES}#{else} + text-align="justify">#{if}($!{DIVIDENDES})$!{DIVIDENDES}#{else} + +   - #{end}€ + + + #{end}€ diff --git a/src/test/resources/params/in-to-out/household/form.fo b/src/test/resources/params/in-to-out/household/form.fo index a654e0d7f..99fda9b50 100644 --- a/src/test/resources/params/in-to-out/household/form.fo +++ b/src/test/resources/params/in-to-out/household/form.fo @@ -4690,7 +4690,7 @@ margin-bottom="3pt" margin-left="3pt" text-align="justify"> - Une seule réponse possible. En cas de double nationalité, cochez en priorité "né français" ou "devenu français". + Une seule réponse possible. En cas de double nationalité, cochez en priorité né français ou devenu français.