Skip to content

erp5
erp5
Commit 061ee021 authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

trade: improve packing list style support of asian fonts 

Previously, it was defining different font sizes for asian characters,
using different sizes for style:font-size-asian and style:font-size
We now use the same font size. This looks good using japanese or chinese
characters mixed with roman characters.

The default font is also changed to IPAPGothic, available in slapos'
cloudooo
parent 99c2df1b
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 20 deletions
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/PackingList_viewAsODTStyles.xml
View file @ 061ee021
...@@ -81,6 +81,7 @@ AAA=</string> </value> ...@@ -81,6 +81,7 @@ AAA=</string> </value>
<style:font-face style:name="Times New Roman" svg:font-family="\'Times New Roman\'" style:font-family-generic="roman" style:font-pitch="variable"/>\n <style:font-face style:name="Times New Roman" svg:font-family="\'Times New Roman\'" style:font-family-generic="roman" style:font-pitch="variable"/>\n
<style:font-face style:name="Arial1" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/>\n <style:font-face style:name="Arial1" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/>\n
<style:font-face style:name="Arial" svg:font-family="Arial" style:font-adornments="Normalny" style:font-family-generic="swiss" style:font-pitch="variable"/>\n <style:font-face style:name="Arial" svg:font-family="Arial" style:font-adornments="Normalny" style:font-family-generic="swiss" style:font-pitch="variable"/>\n
<style:font-face style:name="IPAPGothic" svg:font-family="IPAPGothic" style:font-adornments="Regular" style:font-family-generic="swiss" style:font-pitch="variable" />\n
<style:font-face style:name="DejaVu Sans" svg:font-family="\'DejaVu Sans\'" style:font-family-generic="swiss" style:font-pitch="variable"/>\n <style:font-face style:name="DejaVu Sans" svg:font-family="\'DejaVu Sans\'" style:font-family-generic="swiss" style:font-pitch="variable"/>\n
<style:font-face style:name="DejaVu Sans2" svg:font-family="\'DejaVu Sans\'" style:font-family-generic="system" style:font-pitch="variable"/>\n <style:font-face style:name="DejaVu Sans2" svg:font-family="\'DejaVu Sans\'" style:font-family-generic="system" style:font-pitch="variable"/>\n
</office:font-face-decls>\n </office:font-face-decls>\n
...@@ -90,11 +91,11 @@ AAA=</string> </value> ...@@ -90,11 +91,11 @@ AAA=</string> </value>
<style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">\n <style:paragraph-properties style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">\n
<style:tab-stops/>\n <style:tab-stops/>\n
</style:paragraph-properties>\n </style:paragraph-properties>\n
<style:text-properties style:use-window-font-color="true" fo:font-size="12pt" fo:language="pl" fo:country="PL" style:font-size-asian="12pt" style:language-asian="pl" style:country-asian="PL" style:font-size-complex="12pt" style:language-complex="pl" style:country-complex="PL"/>\n <style:text-properties style:use-window-font-color="true" fo:font-size="12pt" fo:language="en" fo:country="GB" style:font-size-asian="12pt" style:language-asian="ja" style:country-asian="JP" style:font-size-complex="12pt" style:language-complex="en" style:country-complex="GB"/>\n
</style:default-style>\n </style:default-style>\n
<style:default-style style:family="paragraph">\n <style:default-style style:family="paragraph">\n
<style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/>\n <style:paragraph-properties fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/>\n
<style:text-properties style:use-window-font-color="true" style:font-name="Times New Roman" fo:font-size="12pt" fo:language="pl" fo:country="PL" style:font-name-asian="DejaVu Sans1" style:font-size-asian="12pt" style:language-asian="pl" style:country-asian="PL" style:font-name-complex="DejaVu Sans1" style:font-size-complex="12pt" style:language-complex="pl" style:country-complex="PL" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/>\n <style:text-properties style:use-window-font-color="true" style:font-name="Times New Roman" fo:font-size="12pt" fo:language="en" fo:country="GB" style:font-name-asian="IPAPGothic" style:font-size-asian="12pt" style:language-asian="ja" style:country-asian="JP" style:font-name-complex="DejaVu Sans1" style:font-size-complex="12pt" style:language-complex="en" style:country-complex="GB" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/>\n
</style:default-style>\n </style:default-style>\n
<style:default-style style:family="table">\n <style:default-style style:family="table">\n
<style:table-properties table:border-model="collapsing"/>\n <style:table-properties table:border-model="collapsing"/>\n
...@@ -103,25 +104,25 @@ AAA=</string> </value> ...@@ -103,25 +104,25 @@ AAA=</string> </value>
<style:table-row-properties fo:keep-together="always"/>\n <style:table-row-properties fo:keep-together="always"/>\n
</style:default-style>\n </style:default-style>\n
<style:style style:name="Standard" style:family="paragraph" style:class="text">\n <style:style style:name="Standard" style:family="paragraph" style:class="text">\n
<style:text-properties style:font-name="Arial"/>\n <style:text-properties style:font-name="IPAPGothic"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">\n <style:style style:name="Text_20_body" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">\n
<style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"/>\n <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.212cm"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">\n <style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="text">\n
<style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always"/>\n <style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" fo:keep-with-next="always"/>\n
<style:text-properties style:font-name="DejaVu Sans" fo:font-size="14pt" style:font-name-asian="DejaVu Sans2" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans2" style:font-size-complex="14pt"/>\n <style:text-properties style:font-name="IPAPGothic" fo:font-size="14pt" style:font-name-asian="IPAPGothic" style:font-size-asian="14pt" style:font-name-complex="IPAPGothic" style:font-size-complex="14pt"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Header" style:next-style-name="Text_20_body" style:class="text">\n <style:style style:name="Heading_20_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Header" style:next-style-name="Text_20_body" style:class="text">\n
<style:text-properties fo:font-size="115%" fo:font-weight="bold" style:font-size-asian="115%" style:font-weight-asian="bold" style:font-size-complex="115%" style:font-weight-complex="bold"/>\n <style:text-properties fo:font-size="115%" fo:font-weight="normal" style:font-size-asian="115%" style:font-weight-asian="normal" style:font-size-complex="115%" style:font-weight-complex="normal"/>\n
</style:style>\n </style:style>\n
<style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list"/>\n <style:style style:name="List" style:family="paragraph" style:parent-style-name="Text_20_body" style:class="list"/>\n
<style:style style:name="Header" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="extra" style:master-page-name="">\n <style:style style:name="Header" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Text_20_body" style:class="extra" style:master-page-name="">\n
<style:paragraph-properties fo:margin-left="0.049cm" fo:margin-top="0cm" fo:margin-bottom="0cm" fo:text-align="start" style:justify-single-word="false" style:register-true="true" style:page-number="auto" fo:background-color="transparent" style:shadow="none" fo:keep-with-next="always" style:vertical-align="auto">\n <style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0cm" fo:text-align="start" style:justify-single-word="false" style:register-true="true" style:page-number="auto" fo:background-color="transparent" style:shadow="none" fo:keep-with-next="always" style:vertical-align="auto">\n
<style:tab-stops/>\n <style:tab-stops/>\n
<style:background-image/>\n <style:background-image/>\n
</style:paragraph-properties>\n </style:paragraph-properties>\n
<style:text-properties style:font-name="Arial1" fo:font-size="7pt" style:font-name-asian="DejaVu Sans1" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="14pt"/>\n <style:text-properties style:font-name="IPAPGothic" fo:font-size="7pt" style:font-name-asian="IPAPGothic" style:font-size-asian="7pt" style:font-name-complex="IPAPGothic" style:font-size-complex="7pt"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Header_20_left" style:display-name="Header left" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n <style:style style:name="Header_20_left" style:display-name="Header left" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n
<style:paragraph-properties text:number-lines="false" text:line-number="0">\n <style:paragraph-properties text:number-lines="false" text:line-number="0">\n
...@@ -138,7 +139,7 @@ AAA=</string> </value> ...@@ -138,7 +139,7 @@ AAA=</string> </value>
<style:tab-stop style:position="19.001cm" style:type="right"/>\n <style:tab-stop style:position="19.001cm" style:type="right"/>\n
</style:tab-stops>\n </style:tab-stops>\n
</style:paragraph-properties>\n </style:paragraph-properties>\n
<style:text-properties fo:font-size="8pt" fo:font-weight="bold"/>\n <style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" fo:font-weight="normal" style:font-weight-asian="normal"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n <style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n
<style:paragraph-properties text:number-lines="false" text:line-number="0">\n <style:paragraph-properties text:number-lines="false" text:line-number="0">\n
...@@ -147,7 +148,7 @@ AAA=</string> </value> ...@@ -147,7 +148,7 @@ AAA=</string> </value>
<style:tab-stop style:position="19.001cm" style:type="right"/>\n <style:tab-stop style:position="19.001cm" style:type="right"/>\n
</style:tab-stops>\n </style:tab-stops>\n
</style:paragraph-properties>\n </style:paragraph-properties>\n
<style:text-properties fo:font-size="6pt"/>\n <style:text-properties fo:font-size="6pt" style:font-size-asian="6pt"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Footer_20_right" style:display-name="Footer right" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n <style:style style:name="Footer_20_right" style:display-name="Footer right" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n
<style:paragraph-properties text:number-lines="false" text:line-number="0">\n <style:paragraph-properties text:number-lines="false" text:line-number="0">\n
...@@ -159,15 +160,15 @@ AAA=</string> </value> ...@@ -159,15 +160,15 @@ AAA=</string> </value>
</style:style>\n </style:style>\n
<style:style style:name="Table_20_Contents" style:display-name="Table Contents" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n <style:style style:name="Table_20_Contents" style:display-name="Table Contents" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n
<style:paragraph-properties fo:text-align="center" style:justify-single-word="false" text:number-lines="false" text:line-number="0"/>\n <style:paragraph-properties fo:text-align="center" style:justify-single-word="false" text:number-lines="false" text:line-number="0"/>\n
<style:text-properties fo:font-size="7pt"/>\n <style:text-properties fo:font-size="7pt" style:font-size-asian="7pt"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Table_20_Heading" style:display-name="Table Heading" style:family="paragraph" style:parent-style-name="Table_20_Contents" style:class="extra">\n <style:style style:name="Table_20_Heading" style:display-name="Table Heading" style:family="paragraph" style:parent-style-name="Table_20_Contents" style:class="extra">\n
<style:paragraph-properties fo:text-align="end" style:justify-single-word="false" text:number-lines="false" text:line-number="0"/>\n <style:paragraph-properties fo:text-align="end" style:justify-single-word="false" text:number-lines="false" text:line-number="0"/>\n
<style:text-properties fo:font-size="6pt" fo:font-style="normal" fo:font-weight="bold" style:font-style-asian="italic" style:font-weight-asian="normal" style:font-style-complex="italic" style:font-weight-complex="normal"/>\n <style:text-properties fo:font-size="6pt" fo:font-style="normal" fo:font-weight="normal" style:font-size-asian="6pt" style:font-style-asian="IPAPGothic" style:font-weight-asian="normal" style:font-style-complex="IPAPGothic" style:font-weight-complex="normal"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n <style:style style:name="Caption" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">\n
<style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" text:number-lines="false" text:line-number="0"/>\n <style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" text:number-lines="false" text:line-number="0"/>\n
<style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="italic" style:font-size-complex="12pt" style:font-style-complex="italic"/>\n <style:text-properties fo:font-size="12pt" fo:font-style="italic" style:font-size-asian="12pt" style:font-style-asian="IPAPGothic" style:font-size-complex="12pt" style:font-style-complex="IPAPGothic"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Table" style:family="paragraph" style:parent-style-name="Caption" style:class="extra"/>\n <style:style style:name="Table" style:family="paragraph" style:parent-style-name="Caption" style:class="extra"/>\n
<style:style style:name="Text" style:family="paragraph" style:parent-style-name="Caption" style:class="extra"/>\n <style:style style:name="Text" style:family="paragraph" style:parent-style-name="Caption" style:class="extra"/>\n
...@@ -177,17 +178,17 @@ AAA=</string> </value> ...@@ -177,17 +178,17 @@ AAA=</string> </value>
</style:style>\n </style:style>\n
<style:style style:name="Header_20_Title" style:display-name="Header Title" style:family="paragraph" style:parent-style-name="Header_20_right" style:master-page-name="">\n <style:style style:name="Header_20_Title" style:display-name="Header Title" style:family="paragraph" style:parent-style-name="Header_20_right" style:master-page-name="">\n
<style:paragraph-properties style:page-number="auto" style:shadow="none"/>\n <style:paragraph-properties style:page-number="auto" style:shadow="none"/>\n
<style:text-properties fo:text-transform="uppercase" fo:font-size="16pt"/>\n <style:text-properties fo:text-transform="uppercase" fo:font-size="16pt" style:font-size-asian="16pt"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Big_20_Table_20_Content" style:display-name="Big Table Content" style:family="paragraph" style:parent-style-name="Table_20_Contents">\n <style:style style:name="Big_20_Table_20_Content" style:display-name="Big Table Content" style:family="paragraph" style:parent-style-name="Table_20_Contents">\n
<style:text-properties fo:font-size="8pt" fo:font-weight="bold"/>\n <style:text-properties fo:font-size="8pt" fo:font-weight="normal" style:font-size-asian="8pt" style:font-weight-asian="normal"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Big_20_Table_20_Content_20_Left" style:display-name="Big Table Content Left" style:family="paragraph" style:parent-style-name="Big_20_Table_20_Content">\n <style:style style:name="Big_20_Table_20_Content_20_Left" style:display-name="Big Table Content Left" style:family="paragraph" style:parent-style-name="Big_20_Table_20_Content">\n
<style:paragraph-properties fo:margin-left="0.049cm" fo:margin-right="0cm" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>\n <style:paragraph-properties fo:margin-left="0.049cm" fo:margin-right="0cm" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Item_20_Table_20_Title" style:display-name="Item Table Title" style:family="paragraph" style:parent-style-name="Table_20_Heading" style:class="extra">\n <style:style style:name="Item_20_Table_20_Title" style:display-name="Item Table Title" style:family="paragraph" style:parent-style-name="Table_20_Heading" style:class="extra">\n
<style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>\n <style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>\n
<style:text-properties fo:font-size="7pt" style:font-weight-asian="normal" style:font-weight-complex="normal"/>\n <style:text-properties fo:font-size="7pt" style:font-size-asian="7pt" style:font-weight-asian="normal" style:font-weight-complex="normal"/>\n
</style:style>\n </style:style>\n
<style:style style:name="Table_20_Contents_20_Left" style:display-name="Table Contents Left" style:family="paragraph" style:parent-style-name="Table_20_Contents" style:class="extra">\n <style:style style:name="Table_20_Contents_20_Left" style:display-name="Table Contents Left" style:family="paragraph" style:parent-style-name="Table_20_Contents" style:class="extra">\n
<style:paragraph-properties fo:margin-left="0.049cm" fo:margin-right="0cm" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>\n <style:paragraph-properties fo:margin-left="0.049cm" fo:margin-right="0cm" fo:text-align="start" style:justify-single-word="false" fo:text-indent="0cm" style:auto-text-indent="false"/>\n
...@@ -271,10 +272,10 @@ AAA=</string> </value> ...@@ -271,10 +272,10 @@ AAA=</string> </value>
<style:table-cell-properties fo:padding="0.097cm" fo:border="none" style:vertical-align="middle"/>\n <style:table-cell-properties fo:padding="0.097cm" fo:border="none" style:vertical-align="middle"/>\n
</style:style>\n </style:style>\n
<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents">\n <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Table_20_Contents">\n
<style:text-properties style:font-name-asian="DejaVu Sans1" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="14pt"/>\n <style:text-properties style:font-name-asian="IPAPGothic" style:font-size-asian="14pt" style:font-name-complex="IPAPGothic" style:font-size-complex="14pt"/>\n
</style:style>\n </style:style>\n
<style:style style:name="P2" style:family="paragraph" style:parent-style-name="Header_20_right">\n <style:style style:name="P2" style:family="paragraph" style:parent-style-name="Header_20_right">\n
<style:text-properties style:font-name-asian="DejaVu Sans1" style:font-size-asian="14pt" style:font-name-complex="DejaVu Sans1" style:font-size-complex="14pt"/>\n <style:text-properties style:font-name-asian="IPAPGothic" style:font-size-asian="14pt" style:font-name-complex="IPAPGothic" style:font-size-complex="14pt"/>\n
</style:style>\n </style:style>\n
<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Header_20_Image">\n <style:style style:name="fr1" style:family="graphic" style:parent-style-name="Header_20_Image">\n
<style:graphic-properties style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm 0cm 0cm 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>\n <style:graphic-properties style:vertical-pos="top" style:vertical-rel="paragraph" style:horizontal-pos="left" style:horizontal-rel="paragraph" style:mirror="none" fo:clip="rect(0cm 0cm 0cm 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>\n
...@@ -371,8 +372,7 @@ AAA=</string> </value> ...@@ -371,8 +372,7 @@ AAA=</string> </value>
</style:master-page>\n </style:master-page>\n
<style:master-page style:name="Endnote" style:page-layout-name="pm2"/>\n <style:master-page style:name="Endnote" style:page-layout-name="pm2"/>\n
</office:master-styles>\n </office:master-styles>\n
</office:document-styles>\n </office:document-styles>
]]></unicode> </value> ]]></unicode> </value>
</item> </item>
...@@ -402,7 +402,7 @@ AAA=</string> </value> ...@@ -402,7 +402,7 @@ AAA=</string> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <unicode></unicode> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7