Skip to content

Commit 21fd479

Browse files
ToshihikoMakitaToshihikoMakita
authored
Merge pull request #42 from AntennaHouse/develop
Develop
2 parents 4dc3e14 + 0f52aae commit 21fd479

30 files changed

Lines changed: 4105 additions & 887 deletions

‎com.antennahouse.pdf5.ml/build_transform_template.xml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@
106106
style="${prmStylesheetFile}" classpathref="project.class.path" force="true">
107107
<factory name="net.sf.saxon.TransformerFactoryImpl">
108108
<attribute name="http://saxon.sf.net/feature/timing" value="true"/>
109+
<!-- Suppress namespace warning -->
110+
<attribute name="http://saxon.sf.net/feature/suppressXsltNamespaceCheck" value="true"/>
111+
<!--Assert-->
112+
<!--attribute name="http://saxon.sf.net/feature/enableAssertions" value="true"/-->
113+
<!-- Trace -->
114+
<!--attribute name="http://saxon.sf.net/feature/traceListenerClass" value="net.sf.saxon.trace.XSLTTraceListener"/-->
109115
</factory>
110116
<param name="PRM_STYLE_DEF_FILE" expression="${style.def.file}" if="style.def.file"/>
111117
<param name="PRM_INCLUDE_FRONTMATTER_TO_TOC" expression="${include.frontmatter.to.toc}"
@@ -132,7 +138,7 @@
132138
<!--param name="PRM_APPLY_TOC_ATTR" expression="${apply.toc.attr}" if="apply.toc.attr"/-->
133139
<!--param name="PRM_ONLINE_PDF" expression="${online.pdf}" if="online.pdf"/-->
134140
<param name="PRM_SORT_GLOSSENTRY" expression="${sort.glossentry}"
135-
if="output.start.message"/>
141+
if="sort.glossentry"/>
136142
<param name="PRM_OUTPUT_START_MESSAGE" expression="${output.start.message}"
137143
if="output.start.message"/>
138144
<param name="PRM_AUTO_SCALE_DOWN_TO_FIT" expression="${auto.scale.down.to.fit}"

‎com.antennahouse.pdf5.ml/config/default_style.xml‎

Lines changed: 96 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DITA to XSL-FO Style Definition
55
************************************************************
66
File Name : default_style.xml
77
************************************************************
8-
Copyright © 2009-2016 Antenna House, Inc.
8+
Copyright © 2009-2019 Antenna House, Inc.
99
Antenna House is a trademark of Antenna House, Inc.
1010
URL : http://www.antennahouse.com/
1111
************************************************************
@@ -201,7 +201,9 @@ URL : http://www.antennahouse.com/
201201
<variable name="Gloss_Entry_Space_Before">5mm</variable>
202202

203203
<!-- Bullets -->
204-
<variable name="Ul_Label_Char">&#x2022;</variable>
204+
<!--variable name="Ul_Label_Char">&#x2022;</variable-->
205+
<variable name="Ul_Label_Chars" delim="[,\s]+">&#x2022; &#x2022; &#x2022;</variable>
206+
205207
<!-- Bullet -->
206208
<variable name="Level4_Label_Char">&#x25A0;</variable>
207209
<!-- Should be &#x25A0; 6E-->
@@ -240,6 +242,24 @@ URL : http://www.antennahouse.com/
240242
<variable name="Table_Title">Table </variable>
241243
<variable name="Figure_Title">Figure </variable>
242244

245+
<!-- Table header (caption) cotinuation word -->
246+
<variable name="TableHeaderContinuationWord"> (Table continued)</variable>
247+
248+
<!-- Table footer cotinuation word -->
249+
<variable name="TableFooterContinuationWord">Continues on the next page</variable>
250+
251+
<!-- @outputclass value to insert or not to insert continuation word in table header -->
252+
<variable name="OcTableTitleContinued">output-continued-in-table-title</variable>
253+
<variable name="OcNoTableTitleContinued">output-no-continued-in-table-title</variable>
254+
255+
<!-- @outputclass value to insert or not to insert continuation word in table footer -->
256+
<variable name="OcTableFooterContinued">output-continued-in-table-footer</variable>
257+
<variable name="OcNoTableFooterContinued">output-no-continued-in-table-footer</variable>
258+
259+
<!-- @outputclass regx value for table alignment -->
260+
<variable name="OcTableAlignRegx">(align-)(.+)</variable>
261+
<variable name="OcTableAlignReplaceGroup">2</variable>
262+
243263
<!-- Literals for thumbnail -->
244264
<variable name="Toc_Thumbnail_Label">TOC</variable>
245265
<variable name="Appendix_Thumbnail_Label">App.</variable>
@@ -473,6 +493,7 @@ URL : http://www.antennahouse.com/
473493
<attribute-set name="atsRoot" use-attribute-sets="atsBaseFontSize atsBaseLineHeight">
474494
<!--attribute name="xml:lang">en</attribute-->
475495
<attribute name="font-family">$General_Text_Font</attribute>
496+
<attribute name="font-weight">normal</attribute>
476497
<attribute name="line-stacking-strategy">line-height</attribute>
477498
<attribute name="text-align">start</attribute>
478499
<attribute name="axf:line-break">normal</attribute>
@@ -1642,6 +1663,9 @@ URL : http://www.antennahouse.com/
16421663
<attribute name="hyphenate">false</attribute>
16431664
</attribute-set>
16441665

1666+
<attribute-set name="atsNormal">
1667+
<attribute name="font-weight">normal</attribute>
1668+
</attribute-set>
16451669

16461670
<!-- Notes Icon: CSS style -->
16471671

@@ -1692,7 +1716,7 @@ URL : http://www.antennahouse.com/
16921716
<attribute name="clear">both</attribute>
16931717
</attribute-set>
16941718
<attribute-set name="atsOlLabel">
1695-
<attribute name="text-align">end</attribute>
1719+
<attribute name="text-align">center</attribute>
16961720
</attribute-set>
16971721
<attribute-set name="atsOlBody"> </attribute-set>
16981722

@@ -1984,47 +2008,59 @@ URL : http://www.antennahouse.com/
19842008
</attribute-set>
19852009

19862010
<!-- table -->
2011+
2012+
<!-- table caption
2013+
space-before is needed because fo:table-caption/fo:block/@space-before does not work for reference area fo:table-caption
2014+
-->
2015+
<attribute-set name="atsTableAndCaption">
2016+
<attribute name="space-before">$Table_Before_Spacing</attribute>
2017+
</attribute-set>
2018+
19872019
<attribute-set name="atsTable">
19882020
<attribute name="font-size">$Table_Font_Size</attribute>
2021+
<attribute name="space-before">$Table_Before_Spacing</attribute>
19892022
<attribute name="space-after">2mm</attribute>
19902023
<attribute name="text-align">start</attribute>
19912024
<attribute name="relative-align">before</attribute>
19922025
</attribute-set>
1993-
1994-
<attribute-set name="atsTableWithTitleAfter" use-attribute-sets="atsTable">
1995-
<attribute name="space-before">$Table_Before_Spacing</attribute>
1996-
</attribute-set>
19972026

1998-
<attribute-set name="atsTableWithTitleBefore" use-attribute-sets="atsTable">
1999-
</attribute-set>
2000-
2001-
<attribute-set name="atsTableWithTitleBeforeWoTitleAndDesc">
2002-
<attribute name="space-before">$Table_Before_Spacing</attribute>
2003-
</attribute-set>
2004-
2005-
<attribute-set name="atsTableTitleAfter">
2006-
<attribute name="font-size">$Little_Title_Font_Size</attribute>
2007-
<attribute name="space-before">1.5mm</attribute>
2008-
<attribute name="keep-with-previous.within-column">always</attribute>
2027+
<!-- table caption
2028+
reset start-indent otherwise it is inherited.
2029+
-->
2030+
<attribute-set name="atsTableCaption">
2031+
<attribute name="start-indent">0mm</attribute>
20092032
</attribute-set>
2010-
2011-
<attribute-set name="atsTableTitleBefore">
2033+
2034+
<attribute-set name="atsTableTitle">
20122035
<attribute name="font-size">$Little_Title_Font_Size</attribute>
2013-
<attribute name="space-before">3mm</attribute>
2036+
<attribute name="space-before">$Para_Space_Before</attribute>
20142037
<attribute name="space-after">1.5mm</attribute>
20152038
<attribute name="keep-with-next.within-column">always</attribute>
20162039
</attribute-set>
2017-
2040+
20182041
<attribute-set name="atsTableColumn">
20192042
<attribute name="border">$General_Table_Border_Width none $General_Table_Border_Color</attribute>
20202043
</attribute-set>
20212044

2022-
<attribute-set name="atsThead" use-attribute-sets="atsB">
2045+
<attribute-set name="atsThead" use-attribute-sets="atsB atsBgThead">
20232046
<attribute name="start-indent">0mm</attribute>
20242047
<attribute name="end-indent">0mm</attribute>
2048+
</attribute-set>
2049+
2050+
<attribute-set name="atsBgThead">
20252051
<attribute name="background-color">$General_Table_Header_Background_Color</attribute>
20262052
</attribute-set>
2053+
2054+
<attribute-set name="atsBgTransparent">
2055+
<attribute name="background-color">transparent</attribute>
2056+
</attribute-set>
20272057

2058+
<attribute-set name="atsTfooter">
2059+
<attribute name="start-indent">0mm</attribute>
2060+
<attribute name="end-indent">0mm</attribute>
2061+
<attribute name="font-size">$Table_Font_Size</attribute>
2062+
</attribute-set>
2063+
20282064
<attribute-set name="atsTbody">
20292065
<attribute name="start-indent">0mm</attribute>
20302066
<attribute name="end-indent">0mm</attribute>
@@ -2038,15 +2074,49 @@ URL : http://www.antennahouse.com/
20382074
<attribute-set name="atsHeaderRow" use-attribute-sets="atsB">
20392075
<attribute name="background-color">$General_Table_Header_Background_Color</attribute>
20402076
</attribute-set>
2041-
2077+
2078+
<attribute-set name="atsTableRowCaption">
2079+
<attribute name="start-indent">0mm</attribute>
2080+
<attribute name="end-indent">0mm</attribute>
2081+
<attribute name="border-style">hidden</attribute>
2082+
<attribute name="border-after-color">$General_Table_Border_Color</attribute>
2083+
<attribute name="border-after-style">solid</attribute>
2084+
<attribute name="border-after-width">$General_Table_Border_Width</attribute>
2085+
</attribute-set>
2086+
20422087
<attribute-set name="atsTableHeaderCell">
20432088
<attribute name="border">$General_Table_Border_Width none $General_Table_Border_Color</attribute>
20442089
<attribute name="padding">$General_Table_Cell_Padding</attribute>
20452090
<attribute name="border-after-width">$Table_Header_Border_After_Width</attribute>
20462091
</attribute-set>
2092+
2093+
<attribute-set name="atsTableHeaderCaptionCell">
2094+
<attribute name="text-align">start</attribute>
2095+
<attribute name="padding-after">3mm</attribute>
2096+
</attribute-set>
2097+
2098+
<attribute-set name="atsTableRowFooter">
2099+
<attribute name="start-indent">0mm</attribute>
2100+
<attribute name="end-indent">0mm</attribute>
2101+
</attribute-set>
2102+
2103+
<attribute-set name="atsTableFooterCell">
2104+
<attribute name="border-before-color">$General_Table_Border_Color</attribute>
2105+
<attribute name="border-before-style">solid</attribute>
2106+
<attribute name="border-before-width">$General_Table_Border_Width</attribute>
2107+
<attribute name="border-after-style">hidden</attribute>
2108+
<attribute name="border-start-style">hidden</attribute>
2109+
<attribute name="border-end-style">hidden</attribute>
2110+
</attribute-set>
20472111

2112+
<attribute-set name="atsTableFooterCellBlock">
2113+
<attribute name="text-align">end</attribute>
2114+
<attribute name="text-align-last">end</attribute>
2115+
<attribute name="padding-before">0.5mm</attribute>
2116+
</attribute-set>
2117+
20482118
<!-- Added border-after-width.conditionality="retain"
2049-
2011-07-14 t.makita
2119+
2011-07-14 t.makita
20502120
-->
20512121
<attribute-set name="atsTableBodyCell">
20522122
<attribute name="border">$General_Table_Border_Width none $General_Table_Border_Color</attribute>
@@ -2060,10 +2130,8 @@ URL : http://www.antennahouse.com/
20602130
<attribute-set name="atsRotatedEntry">
20612131
<attribute name="reference-orientation">90</attribute>
20622132
<attribute name="overflow">error-if-overflow</attribute>
2063-
<!--attribute name="overflow">condense</attribute>
2064-
<attribute name="axf:overflow-condense">font-size</attribute-->
20652133
</attribute-set>
2066-
2134+
20672135
<!-- simpletable -->
20682136
<attribute-set name="atsSimpleTable">
20692137
<attribute name="space-before">3mm</attribute>

‎com.antennahouse.pdf5.ml/config/ja_style.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ DITA to XSL-FO Style Definition
55
************************************************************
66
File Name : ja_style.xml
77
************************************************************
8-
Copyright © 2009 2009 Antenna House, Inc.
8+
Copyright © 2009-2019 Antenna House, Inc.
99
Antenna House is a trademark of Antenna House, Inc.
1010
URL : http://www.antennahouse.com/
1111
************************************************************
@@ -53,6 +53,11 @@ URL : http://www.antennahouse.com/
5353
<variable name="Table_Title">表 </variable>
5454
<variable name="Figure_Title">図 </variable>
5555

56+
<!-- Table caption cotinuation word -->
57+
<variable name="TableHeaderContinuationWord">（前から続く）</variable>
58+
59+
<!-- Table footer cotinuation word -->
60+
<variable name="TableFooterContinuationWord">次に続く</variable>
5661

5762
<!-- Literals for thumbnail -->
5863
<variable name="Toc_Thumbnail_Label">目次</variable>

‎com.antennahouse.pdf5.ml/xsl/dita2fo_backmatter.xsl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,9 @@ E-mail : [email protected]
317317
<xsl:variable name="level"
318318
as="xs:integer"
319319
select="count($topicRef/ancestor-or-self::*[contains(@class, ' map/topicref ')]
320-
[not(contains(@class, ' bookmap/backmatter '))])"/>
320+
[not(contains(@class, ' bookmap/backmatter '))]
321+
[not(contains(@class, ' bookmap/booklists '))]
322+
)"/>
321323
<xsl:variable name="titleMode" select="ahf:getTitleMode($topicRef,())" as="xs:integer"/>
322324

323325
<fo:block>

0 commit comments

Comments
 (0)