Arkadiusz Binder 3 vuotta sitten
vanhempi
commit
dcf06db964

+ 55 - 2
templates/kzp.dita

@@ -17,8 +17,9 @@
                     <colspec colname="c4" colnum="4" colwidth="1*"/>
                     <thead>
                         <row>
-                            <entry namest="c1" nameend="c3"><b>Nazwa produktu: </b>Baza Doll
-                                Highlighting primer</entry>
+                            <entry namest="c1" nameend="c3"><b>Nazwa produktu: </b>
+                                <ph keyref="Nazwa_produktu"
+                                /></entry>
                             <entry>Indeks nr:</entry>
                         </row>
                     </thead>
@@ -69,5 +70,57 @@
                 </tgroup>
             </table>
         </p>
+        <table frame="all" rowsep="1" colsep="1" id="table_nh3_f4p_b4b">
+            <title>Akceptacja Prezesa Firmy bądź Dyrektora Kreacji i Marketingu</title>
+            <tgroup cols="3">
+                <colspec colname="c1" colnum="1" colwidth="1*"/>
+                <colspec colname="c2" colnum="2" colwidth="1*"/>
+                <colspec colname="c3" colnum="3" colwidth="1*"/>
+                <thead>
+                    <row>
+                        <entry>Sprawdzone dane</entry>
+                        <entry>Stanowisko</entry>
+                        <entry>Podpis</entry>
+                    </row>
+                </thead>
+                <tbody>
+                    <row>
+                        <entry>–––––</entry>
+                        <entry>Prezesa Firmy bądź Dyrektor Kreacji i Marketingu</entry>
+                        <entry/>
+                    </row>
+                    <row>
+                        <entry>Dane na etykiecie</entry>
+                        <entry>Lorem ipsum</entry>
+                        <entry/>
+                    </row>
+                    <row>
+                        <entry>Lorem ipsum</entry>
+                        <entry>Lorem ipsum</entry>
+                        <entry/>
+                    </row>
+                    <row>
+                        <entry>Lorem ipsum</entry>
+                        <entry>Lorem ipsum</entry>
+                        <entry/>
+                    </row>
+                    <row>
+                        <entry>Lorem ipsum</entry>
+                        <entry>Lorem ipsum</entry>
+                        <entry/>
+                    </row>
+                    <row>
+                        <entry>Lorem ipsum</entry>
+                        <entry>Lorem ipsum</entry>
+                        <entry/>
+                    </row>
+                    <row>
+                        <entry/>
+                        <entry/>
+                        <entry/>
+                    </row>
+                </tbody>
+            </tgroup>
+        </table>
     </body>
 </topic>

Tiedoston diff-näkymää rajattu, sillä se on liian suuri
+ 0 - 0
templates/out/pdf-css-html5/kzp.fo


+ 19 - 19
templates/out/pdf-css-html5/kzp.merged.html

@@ -3,7 +3,7 @@
 <link rel='stylesheet' type='text/css' href='file:/Applications/Oxygen XML Editor/frameworks/dita/css/print/p-dita.css' />
 <link rel='stylesheet' type='text/css' href='file:/Applications/Oxygen XML Editor/frameworks/dita/DITA-OT3.x/plugins/com.oxygenxml.editlink/pdf-css.css' />
 <link rel='stylesheet' type='text/css' href='file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/oxygen-wibo/oxygen-wibo.css' />
-<meta name="DC.type" content="topic"></meta><meta name="description" content="dokument zawierający graficzne elementy oraz podpisy dedykowanych stanowisk odpowiedzialnych za dany element."></meta><meta name="DC.format" content="HTML5"></meta><meta name="DC.identifier" content="kzp"></meta><meta name="DC.language" content="en"></meta><title>kzp</title></head><body class="wh_topic_page"><div class="wh_content_area"><div class="wh_topic_body"><div class="wh_topic_content"><div xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/" id="kzp" ditaarch:DITAArchVersion="1.3" domains="(topic abbrev-d) a(props deliveryTarget) (topic equation-d) (topic hazard-d) (topic hi-d) (topic indexing-d) (topic markup-d) (topic mathml-d) (topic pr-d) (topic relmgmt-d) (topic sw-d) (topic svg-d) (topic ui-d) (topic ut-d) (topic markup-d xml-d)" class="- topic/topic topic" xml:lang="en" lang="en">
+<meta name="DC.type" content="topic"></meta><meta name="description" content="dokument zawierający graficzne elementy oraz podpisy dedykowanych stanowisk odpowiedzialnych za dany element."></meta><meta name="DC.format" content="HTML5"></meta><meta name="DC.identifier" content="kzp"></meta><meta name="DC.language" content="en"></meta><title>kzp</title></head><body class="wh_topic_page"><div class="wh_content_area"><div class="wh_topic_body"><div class="wh_topic_content"><div xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/" class="- topic/topic topic" ditaarch:DITAArchVersion="1.3" domains="(topic abbrev-d) a(props deliveryTarget) (topic equation-d) (topic hazard-d) (topic hi-d) (topic indexing-d) (topic markup-d) (topic mathml-d) (topic pr-d) (topic relmgmt-d) (topic sw-d) (topic svg-d) (topic ui-d) (topic ut-d) (topic markup-d xml-d)" id="kzp" xml:lang="en" lang="en">
     <h1 class="- topic/title title topictitle1" id="ariaid-title1"><span class="- topic/ph topic/title-wrapper ph title-wrapper">kzp</span></h1>
     
     <div class="- topic/body body"><p class="- topic/shortdesc shortdesc">dokument zawierający graficzne elementy oraz podpisy dedykowanych stanowisk
@@ -11,44 +11,44 @@
         <div class="- topic/example example">KZP Baza Doll Highlighter WIBO.PDF zawiera przykładowe elementy
             przekazane</div>
         <div class="- topic/p p">
-            <table frame="all" rowsep="1" colsep="1" id="table_hyv_3kp_b4b" class="- topic/table table frame-all"><caption class="- topic/title title tablecap" caption-side="top" is-repeated="true"><span class="table--title-label">Table<span class="table--title-label-number"> 1</span><span class="table--title-label-punctuation">. </span></span><span class="table--title"><span class="- topic/ph topic/title-wrapper ph title-wrapper">KARTA ZGODNOSCI PRODUKTU</span></span></caption><colgroup><col style="width:25%"></col><col style="width:25%"></col><col style="width:25%"></col><col style="width:25%"></col></colgroup><thead class="- topic/thead thead">
+            <table class="- topic/table table frame-all" colsep="1" frame="all" id="table_hyv_3kp_b4b" rowsep="1"><caption class="- topic/title title tablecap" caption-side="top" is-repeated="true"><span class="table--title-label">Table<span class="table--title-label-number"> 1</span><span class="table--title-label-punctuation">. </span></span><span class="table--title"><span class="- topic/ph topic/title-wrapper ph title-wrapper">KARTA ZGODNOSCI PRODUKTU</span></span></caption><colgroup><col style="width:25%"></col><col style="width:25%"></col><col style="width:25%"></col><col style="width:25%"></col></colgroup><thead class="- topic/thead thead">
                         <tr class="- topic/row row">
-                            <th namest="c1" nameend="c3" class="- topic/entry entry colsep-1 rowsep-1" colspan="3" id="kzp__table_hyv_3kp_b4b__entry__1"><strong class="+ topic/ph hi-d/b ph b">Nazwa produktu: </strong>Baza Doll
+                            <th xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" dita-ot:morecols="2" dita-ot:x="1" dita-ot:y="1" nameend="col3" namest="col1" colspan="3" id="kzp__table_hyv_3kp_b4b__entry__1"><strong class="+ topic/ph hi-d/b ph b">Nazwa produktu: </strong>Baza Doll
                                 Highlighting primer</th>
-                            <th class="- topic/entry entry colsep-1 rowsep-1" id="kzp__table_hyv_3kp_b4b__entry__2">Indeks nr:</th>
+                            <th xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col4" dita-ot:x="4" dita-ot:y="1" id="kzp__table_hyv_3kp_b4b__entry__2">Indeks nr:</th>
                         </tr>
                     </thead><tbody class="- topic/tbody tbody">
                         <tr class="- topic/row row">
-                            <td namest="c1" nameend="c3" class="- topic/entry entry colsep-1 rowsep-1" colspan="3" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2">
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" dita-ot:morecols="2" dita-ot:x="1" dita-ot:y="2" nameend="col3" namest="col1" colspan="3" headers="kzp__table_hyv_3kp_b4b__entry__1">
                                 <strong class="+ topic/ph hi-d/b ph b">Nazwa angielska:</strong>Doll Highlighting primer</td>
-                            <td class="- topic/entry entry colsep-1 rowsep-1" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2">CE306</td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col4" dita-ot:x="4" dita-ot:y="2" headers="kzp__table_hyv_3kp_b4b__entry__2">CE306</td>
                         </tr>
                         <tr class="- topic/row row">
-                            <td class="- topic/entry entry colsep-1 rowsep-1" headers="kzp__table_hyv_3kp_b4b__entry__1"><strong class="+ topic/ph hi-d/b ph b">Marka:</strong> Wibo</td>
-                            <td class="- topic/entry entry colsep-1 rowsep-1" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2"><strong class="+ topic/ph hi-d/b ph b">Ważna od:</strong>15.05.2020</td>
-                            <td namest="c3" nameend="c4" class="- topic/entry entry colsep-1 rowsep-1" colspan="2" headers="kzp__table_hyv_3kp_b4b__entry__1"></td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" dita-ot:x="1" dita-ot:y="3" headers="kzp__table_hyv_3kp_b4b__entry__1"><strong class="+ topic/ph hi-d/b ph b">Marka:</strong> Wibo</td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col2" dita-ot:x="2" dita-ot:y="3" headers="kzp__table_hyv_3kp_b4b__entry__1"><strong class="+ topic/ph hi-d/b ph b">Ważna od:</strong>15.05.2020</td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col3" dita-ot:morecols="1" dita-ot:x="3" dita-ot:y="3" nameend="col4" namest="col3" colspan="2" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2"></td>
                         </tr>
                         <tr class="- topic/row row">
-                            <td namest="c1" nameend="c2" class="- topic/entry entry colsep-1 rowsep-1" colspan="2" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2">Towary handlowe (gotowe): [   ]</td>
-                            <td namest="c3" nameend="c4" class="- topic/entry entry colsep-1 rowsep-1" colspan="2" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2"><strong class="+ topic/ph hi-d/b ph b">Produkcja:</strong> Własna [   ]</td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" dita-ot:morecols="1" dita-ot:x="1" dita-ot:y="4" nameend="col2" namest="col1" colspan="2" headers="kzp__table_hyv_3kp_b4b__entry__1">Towary handlowe (gotowe): [   ]</td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col3" dita-ot:morecols="1" dita-ot:x="3" dita-ot:y="4" nameend="col4" namest="col3" colspan="2" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2"><strong class="+ topic/ph hi-d/b ph b">Produkcja:</strong> Własna [   ]</td>
                         </tr>
                         <tr class="- topic/row row">
-                            <td class="- topic/entry entry colsep-1 rowsep-1" headers="kzp__table_hyv_3kp_b4b__entry__1"><strong class="+ topic/ph hi-d/b ph b">Nr edycji:</strong> 1</td>
-                            <td namest="c2" nameend="c4" class="- topic/entry entry colsep-1 rowsep-1" colspan="3" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2"></td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" dita-ot:x="1" dita-ot:y="5" headers="kzp__table_hyv_3kp_b4b__entry__1"><strong class="+ topic/ph hi-d/b ph b">Nr edycji:</strong> 1</td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col2" dita-ot:morecols="2" dita-ot:x="2" dita-ot:y="5" nameend="col4" namest="col2" colspan="3" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2"></td>
                         </tr>
                     </tbody></table>
-            <table frame="all" rowsep="1" colsep="1" id="table_x11_blp_b4b" class="- topic/table table frame-all"><caption class="- topic/title title tablecap" caption-side="top" is-repeated="true"><span class="table--title-label">Table<span class="table--title-label-number"> 2</span><span class="table--title-label-punctuation">. </span></span><span class="table--title"><span class="- topic/ph topic/title-wrapper ph title-wrapper">Etykieta czolowa</span></span></caption><colgroup><col style="width:73.47480106100795%"></col><col style="width:26.525198938992045%"></col></colgroup><thead class="- topic/thead thead">
+            <table class="- topic/table table frame-all" colsep="1" frame="all" id="table_x11_blp_b4b" rowsep="1"><caption class="- topic/title title tablecap" caption-side="top" is-repeated="true"><span class="table--title-label">Table<span class="table--title-label-number"> 2</span><span class="table--title-label-punctuation">. </span></span><span class="table--title"><span class="- topic/ph topic/title-wrapper ph title-wrapper">Etykieta czolowa</span></span></caption><colgroup><col style="width:73.47480106100795%"></col><col style="width:26.525198938992045%"></col></colgroup><thead class="- topic/thead thead">
                         <tr class="- topic/row row">
-                            <th class="- topic/entry entry colsep-1 rowsep-1" id="kzp__table_x11_blp_b4b__entry__1">I Etykieta czołowa - Projekt graficzny</th>
-                            <th class="- topic/entry entry colsep-1 rowsep-1" id="kzp__table_x11_blp_b4b__entry__2">Artwork ważny od</th>
+                            <th xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" dita-ot:x="1" dita-ot:y="1" id="kzp__table_x11_blp_b4b__entry__1">I Etykieta czołowa - Projekt graficzny</th>
+                            <th xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col2" dita-ot:x="2" dita-ot:y="1" id="kzp__table_x11_blp_b4b__entry__2">Artwork ważny od</th>
                         </tr>
                     </thead><tbody class="- topic/tbody tbody">
                         <tr class="- topic/row row">
-                            <td class="- topic/entry entry colsep-1 rowsep-1" headers="kzp__table_x11_blp_b4b__entry__1"></td>
-                            <td class="- topic/entry entry colsep-1 rowsep-1" headers="kzp__table_x11_blp_b4b__entry__2">2020-03-31</td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" dita-ot:x="1" dita-ot:y="2" headers="kzp__table_x11_blp_b4b__entry__1"></td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col2" dita-ot:x="2" dita-ot:y="2" headers="kzp__table_x11_blp_b4b__entry__2">2020-03-31</td>
                         </tr>
                         <tr class="- topic/row row">
-                            <td namest="c1" nameend="c4" class="- topic/entry entry colsep-1 rowsep-1" colspan="2" headers="kzp__table_x11_blp_b4b__entry__1 kzp__table_x11_blp_b4b__entry__2"><img href="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png" width="550" id="image_e3g_rlp_b4b" placement="inline" class="- topic/image image" src="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png"></img></td>
+                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" dita-ot:morecols="1" dita-ot:x="1" dita-ot:y="3" nameend="col2" namest="col1" colspan="2" headers="kzp__table_x11_blp_b4b__entry__1 kzp__table_x11_blp_b4b__entry__2"><img class="- topic/image image" href="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png" id="image_e3g_rlp_b4b" placement="inline" width="550" src="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png"></img></td>
                         </tr>
                     </tbody></table>
         </div>

+ 27 - 27
templates/out/pdf-css-html5/kzp.merged.xml

@@ -3,7 +3,7 @@
 <?xml-stylesheet type='text/css' href='file:/Applications/Oxygen XML Editor/frameworks/dita/css/print/p-dita.css'?>
 <?xml-stylesheet type='text/css' href='file:/Applications/Oxygen XML Editor/frameworks/dita/DITA-OT3.x/plugins/com.oxygenxml.editlink/pdf-css.css'?>
 <?xml-stylesheet type='text/css' href='file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/oxygen-wibo/oxygen-wibo.css'?>
-<?workdir /Users/arkadiuszbinder/se/SE/projects/wibo/templates/temp/pdf-css-html5?><?workdir-uri file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/temp/pdf-css-html5/?><?path2project?><?path2project-uri ./?><?path2rootmap-uri ./?><?doctype-public -//OASIS//DTD DITA Topic//EN?><?doctype-system topic.dtd?><topic xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/" xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:oxy="http://www.oxygenxml.com/extensions/author" xmlns:nd="http://www.oxygenxml.com/css2fo/named-destinations" xmlns:opentopic-index="http://www.idiominc.com/opentopic/index" xmlns:opentopic="http://www.idiominc.com/opentopic" xmlns:css2fo="http://www.oxygenxml.com/css2fo" id="kzp" ditaarch:DITAArchVersion="1.3" domains="(topic abbrev-d) a(props deliveryTarget) (topic equation-d) (topic hazard-d) (topic hi-d) (topic indexing-d) (topic markup-d) (topic mathml-d) (topic pr-d) (topic relmgmt-d) (topic sw-d) (topic svg-d) (topic ui-d) (topic ut-d) (topic markup-d xml-d)" class="- topic/topic " xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" xtrc="topic:1;3:17" xml:lang="en">
+<?workdir /Users/arkadiuszbinder/se/SE/projects/wibo/templates/temp/pdf-css-html5?><?workdir-uri file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/temp/pdf-css-html5/?><?path2project?><?path2project-uri ./?><?path2rootmap-uri ./?><?doctype-public -//OASIS//DTD DITA Topic//EN?><?doctype-system topic.dtd?><topic xmlns:ditaarch="http://dita.oasis-open.org/architecture/2005/" xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:oxy="http://www.oxygenxml.com/extensions/author" xmlns:nd="http://www.oxygenxml.com/css2fo/named-destinations" xmlns:opentopic-index="http://www.idiominc.com/opentopic/index" xmlns:opentopic="http://www.idiominc.com/opentopic" xmlns:css2fo="http://www.oxygenxml.com/css2fo" class="- topic/topic " ditaarch:DITAArchVersion="1.3" domains="(topic abbrev-d) a(props deliveryTarget) (topic equation-d) (topic hazard-d) (topic hi-d) (topic indexing-d) (topic markup-d) (topic mathml-d) (topic pr-d) (topic relmgmt-d) (topic sw-d) (topic svg-d) (topic ui-d) (topic ut-d) (topic markup-d xml-d)" id="kzp" xtrc="topic:1;3:17" xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" xml:lang="en">
     <title class="- topic/title "><ph class="- topic/ph topic/title-wrapper ">kzp</ph></title>
     <shortdesc class="- topic/shortdesc ">dokument zawierający graficzne elementy oraz podpisy dedykowanych stanowisk
         odpowiedzialnych za dany element. </shortdesc>
@@ -11,60 +11,60 @@
         <example class="- topic/example ">KZP Baza Doll Highlighter WIBO.PDF zawiera przykładowe elementy
             przekazane</example>
         <p class="- topic/p ">
-            <table frame="all" rowsep="1" colsep="1" id="table_hyv_3kp_b4b" class="- topic/table ">
+            <table class="- topic/table " colsep="1" frame="all" id="table_hyv_3kp_b4b" rowsep="1">
                 <title class="- topic/title "><ph class="- topic/ph topic/title-wrapper ">KARTA ZGODNOSCI PRODUKTU</ph></title>
-                <tgroup cols="4" class="- topic/tgroup ">
-                    <colspec colname="c1" colnum="1" colwidth="1*" class="- topic/colspec " xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" xtrc="colspec:1;14:69" style="width:25%;"/>
-                    <colspec colname="c2" colnum="2" colwidth="1*" class="- topic/colspec " xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" xtrc="colspec:2;15:69" style="width:25%;"/>
-                    <colspec colname="c3" colnum="3" colwidth="1*" class="- topic/colspec " xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" xtrc="colspec:3;16:69" style="width:25%;"/>
-                    <colspec colname="c4" colnum="4" colwidth="1*" class="- topic/colspec " xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" xtrc="colspec:4;17:69" style="width:25%;"/>
+                <tgroup class="- topic/tgroup " cols="4">
+                    <colspec class="- topic/colspec " colname="col1" colnum="1" colwidth="1*" xtrc="colspec:1;14:69" xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" style="width:25%;"/>
+                    <colspec class="- topic/colspec " colname="col2" colnum="2" colwidth="1*" xtrc="colspec:2;15:69" xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" style="width:25%;"/>
+                    <colspec class="- topic/colspec " colname="col3" colnum="3" colwidth="1*" xtrc="colspec:3;16:69" xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" style="width:25%;"/>
+                    <colspec class="- topic/colspec " colname="col4" colnum="4" colwidth="1*" xtrc="colspec:4;17:69" xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" style="width:25%;"/>
                     <thead class="- topic/thead ">
                         <row class="- topic/row ">
-                            <entry namest="c1" nameend="c3" class="- topic/entry " colspan="3"><b class="+ topic/ph hi-d/b ">Nazwa produktu: </b>Baza Doll
+                            <entry class="- topic/entry " colname="col1" dita-ot:morecols="2" dita-ot:x="1" dita-ot:y="1" nameend="col3" namest="col1" colspan="3"><b class="+ topic/ph hi-d/b ">Nazwa produktu: </b>Baza Doll
                                 Highlighting primer</entry>
-                            <entry class="- topic/entry ">Indeks nr:</entry>
+                            <entry class="- topic/entry " colname="col4" dita-ot:x="4" dita-ot:y="1">Indeks nr:</entry>
                         </row>
                     </thead>
                     <tbody class="- topic/tbody ">
                         <row class="- topic/row ">
-                            <entry namest="c1" nameend="c3" class="- topic/entry " colspan="3">
+                            <entry class="- topic/entry " colname="col1" dita-ot:morecols="2" dita-ot:x="1" dita-ot:y="2" nameend="col3" namest="col1" colspan="3">
                                 <b class="+ topic/ph hi-d/b ">Nazwa angielska:</b>Doll Highlighting primer</entry>
-                            <entry class="- topic/entry ">CE306</entry>
+                            <entry class="- topic/entry " colname="col4" dita-ot:x="4" dita-ot:y="2">CE306</entry>
                         </row>
                         <row class="- topic/row ">
-                            <entry class="- topic/entry "><b class="+ topic/ph hi-d/b ">Marka:</b> Wibo</entry>
-                            <entry class="- topic/entry "><b class="+ topic/ph hi-d/b ">Ważna od:</b>15.05.2020</entry>
-                            <entry namest="c3" nameend="c4" class="- topic/entry " colspan="2"/>
+                            <entry class="- topic/entry " colname="col1" dita-ot:x="1" dita-ot:y="3"><b class="+ topic/ph hi-d/b ">Marka:</b> Wibo</entry>
+                            <entry class="- topic/entry " colname="col2" dita-ot:x="2" dita-ot:y="3"><b class="+ topic/ph hi-d/b ">Ważna od:</b>15.05.2020</entry>
+                            <entry class="- topic/entry " colname="col3" dita-ot:morecols="1" dita-ot:x="3" dita-ot:y="3" nameend="col4" namest="col3" colspan="2"/>
                         </row>
                         <row class="- topic/row ">
-                            <entry namest="c1" nameend="c2" class="- topic/entry " colspan="2">Towary handlowe (gotowe): [   ]</entry>
-                            <entry namest="c3" nameend="c4" class="- topic/entry " colspan="2"><b class="+ topic/ph hi-d/b ">Produkcja:</b> Własna [   ]</entry>
+                            <entry class="- topic/entry " colname="col1" dita-ot:morecols="1" dita-ot:x="1" dita-ot:y="4" nameend="col2" namest="col1" colspan="2">Towary handlowe (gotowe): [   ]</entry>
+                            <entry class="- topic/entry " colname="col3" dita-ot:morecols="1" dita-ot:x="3" dita-ot:y="4" nameend="col4" namest="col3" colspan="2"><b class="+ topic/ph hi-d/b ">Produkcja:</b> Własna [   ]</entry>
                         </row>
                         <row class="- topic/row ">
-                            <entry class="- topic/entry "><b class="+ topic/ph hi-d/b ">Nr edycji:</b> 1</entry>
-                            <entry namest="c2" nameend="c4" class="- topic/entry " colspan="3"/>
+                            <entry class="- topic/entry " colname="col1" dita-ot:x="1" dita-ot:y="5"><b class="+ topic/ph hi-d/b ">Nr edycji:</b> 1</entry>
+                            <entry class="- topic/entry " colname="col2" dita-ot:morecols="2" dita-ot:x="2" dita-ot:y="5" nameend="col4" namest="col2" colspan="3"/>
                         </row>
                     </tbody>
                 </tgroup>
             </table>
-            <table frame="all" rowsep="1" colsep="1" id="table_x11_blp_b4b" class="- topic/table ">
+            <table class="- topic/table " colsep="1" frame="all" id="table_x11_blp_b4b" rowsep="1">
                 <title class="- topic/title "><ph class="- topic/ph topic/title-wrapper ">Etykieta czolowa</ph></title>
-                <tgroup cols="2" class="- topic/tgroup ">
-                    <colspec colname="c1" colnum="1" colwidth="2.77*" class="- topic/colspec " xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" xtrc="colspec:5;50:72" style="width:73.4748%;"/>
-                    <colspec colname="c4" colnum="2" colwidth="1*" class="- topic/colspec " xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" xtrc="colspec:6;51:69" style="width:26.5252%;"/>
+                <tgroup class="- topic/tgroup " cols="2">
+                    <colspec class="- topic/colspec " colname="col1" colnum="1" colwidth="2.77*" xtrc="colspec:5;50:72" xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" style="width:73.4748%;"/>
+                    <colspec class="- topic/colspec " colname="col2" colnum="2" colwidth="1*" xtrc="colspec:6;51:69" xtrf="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/kzp.dita" style="width:26.5252%;"/>
                     <thead class="- topic/thead ">
                         <row class="- topic/row ">
-                            <entry class="- topic/entry ">I Etykieta czołowa - Projekt graficzny</entry>
-                            <entry class="- topic/entry ">Artwork ważny od</entry>
+                            <entry class="- topic/entry " colname="col1" dita-ot:x="1" dita-ot:y="1">I Etykieta czołowa - Projekt graficzny</entry>
+                            <entry class="- topic/entry " colname="col2" dita-ot:x="2" dita-ot:y="1">Artwork ważny od</entry>
                         </row>
                     </thead>
                     <tbody class="- topic/tbody ">
                         <row class="- topic/row ">
-                            <entry class="- topic/entry "/>
-                            <entry class="- topic/entry ">2020-03-31</entry>
+                            <entry class="- topic/entry " colname="col1" dita-ot:x="1" dita-ot:y="2"/>
+                            <entry class="- topic/entry " colname="col2" dita-ot:x="2" dita-ot:y="2">2020-03-31</entry>
                         </row>
                         <row class="- topic/row ">
-                            <entry namest="c1" nameend="c4" class="- topic/entry " colspan="2"><image href="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png" width="550" id="image_e3g_rlp_b4b" placement="inline" class="- topic/image "/></entry>
+                            <entry class="- topic/entry " colname="col1" dita-ot:morecols="1" dita-ot:x="1" dita-ot:y="3" nameend="col2" namest="col1" colspan="2"><image class="- topic/image " href="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png" id="image_e3g_rlp_b4b" placement="inline" width="550"/></entry>
                         </row>
                     </tbody>
                 </tgroup>

BIN
templates/out/pdf-css-html5/kzp.pdf


+ 11 - 5
templates/out/pdf-css-html5/kzp.style.xml

@@ -27,7 +27,8 @@
                                 podpisy dedykowanych stanowisk odpowiedzialnych za dany element. </p>
                             <div class="- topic/example example" css:display="block" css:margin-bottom="1em" css:margin-top="1em">KZP Baza Doll
                                 Highlighter WIBO.PDF zawiera przykładowe elementy przekazane</div>
-                            <div class="- topic/p p" css:display="block"><table class="- topic/table table frame-all" colsep="1" css:border-bottom-color="black" css:border-bottom-style="solid" css:border-bottom-width="1px" css:border-collapse="collapse" css:border-left-color="black" css:border-left-style="solid" css:border-left-width="1px" css:border-right-color="black" css:border-right-style="solid" css:border-right-width="1px" css:border-top-color="black" css:border-top-style="solid" css:border-top-width="1px" css:display="table" css:hyphens="auto" css:margin-bottom="1em" css:margin-left="1em" css:margin-right="1em" css:margin-top="1em" css:table-layout="auto" frame="all" id="table_hyv_3kp_b4b" rowsep="1">
+                            <div class="- topic/p p" css:display="block">
+                                <table class="- topic/table table frame-all" colsep="1" css:border-bottom-color="black" css:border-bottom-style="solid" css:border-bottom-width="1px" css:border-collapse="collapse" css:border-left-color="black" css:border-left-style="solid" css:border-left-width="1px" css:border-right-color="black" css:border-right-style="solid" css:border-right-width="1px" css:border-top-color="black" css:border-top-style="solid" css:border-top-width="1px" css:display="table" css:hyphens="auto" css:margin-bottom="1em" css:margin-left="1em" css:margin-right="1em" css:margin-top="1em" css:table-layout="auto" frame="all" id="table_hyv_3kp_b4b" rowsep="1">
                                     <caption caption-side="top" class="- topic/title title tablecap" css:caption-side="top" css:display="table-caption" css:font-weight="bold" css:margin-top="0.5em" css:oxy-caption-repeat-on-next-pages="yes" css:page-break-after="avoid" css:text-align="left" is-repeated="true"><span class="table--title-label" css:display="inline">Table<span class="table--title-label-number" css:display="inline"> 1</span><span class="table--title-label-punctuation" css:display="inline">. </span></span><span class="table--title" css:display="inline"><span class="- topic/ph topic/title-wrapper ph title-wrapper" css:display="inline">KARTA ZGODNOSCI
                                             PRODUKTU</span></span><css:after css:display="inline" css:oxy-show-only-when-caption-repeated-on-next-pages="yes"><css:text> </css:text><css:text>(continued)</css:text></css:after></caption>
                                     <colgroup css:display="table-column-group">
@@ -66,7 +67,8 @@
                                             <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col2" colspan="3" css:border-bottom-style="solid" css:border-bottom-width="0" css:border-right-style="solid" css:border-right-width="0" css:display="table-cell" css:padding-bottom="0.3em" css:padding-left="0.3em" css:padding-right="0.3em" css:padding-top="0.3em" css:table-column="1" css:table-column-span="3" css:table-row="4" css:vertical-align="top" dita-ot:morecols="2" dita-ot:x="2" dita-ot:y="5" headers="kzp__table_hyv_3kp_b4b__entry__1 kzp__table_hyv_3kp_b4b__entry__2" nameend="col4" namest="col2"/>
                                         </tr>
                                     </tbody>
-                                </table><table class="- topic/table table frame-all" colsep="1" css:border-bottom-color="black" css:border-bottom-style="solid" css:border-bottom-width="1px" css:border-collapse="collapse" css:border-left-color="black" css:border-left-style="solid" css:border-left-width="1px" css:border-right-color="black" css:border-right-style="solid" css:border-right-width="1px" css:border-top-color="black" css:border-top-style="solid" css:border-top-width="1px" css:display="table" css:hyphens="auto" css:margin-bottom="1em" css:margin-left="1em" css:margin-right="1em" css:margin-top="1em" css:table-layout="auto" frame="all" id="table_x11_blp_b4b" rowsep="1">
+                                </table>
+                                <table class="- topic/table table frame-all" colsep="1" css:border-bottom-color="black" css:border-bottom-style="solid" css:border-bottom-width="1px" css:border-collapse="collapse" css:border-left-color="black" css:border-left-style="solid" css:border-left-width="1px" css:border-right-color="black" css:border-right-style="solid" css:border-right-width="1px" css:border-top-color="black" css:border-top-style="solid" css:border-top-width="1px" css:display="table" css:hyphens="auto" css:margin-bottom="1em" css:margin-left="1em" css:margin-right="1em" css:margin-top="1em" css:table-layout="auto" frame="all" id="table_x11_blp_b4b" rowsep="1">
                                     <caption caption-side="top" class="- topic/title title tablecap" css:caption-side="top" css:display="table-caption" css:font-weight="bold" css:margin-top="0.5em" css:oxy-caption-repeat-on-next-pages="yes" css:page-break-after="avoid" css:text-align="left" is-repeated="true"><span class="table--title-label" css:display="inline">Table<span class="table--title-label-number" css:display="inline"> 2</span><span class="table--title-label-punctuation" css:display="inline">. </span></span><span class="table--title" css:display="inline"><span class="- topic/ph topic/title-wrapper ph title-wrapper" css:display="inline">Etykieta
                                         czolowa</span></span><css:after css:display="inline" css:oxy-show-only-when-caption-repeated-on-next-pages="yes"><css:text> </css:text><css:text>(continued)</css:text></css:after></caption>
                                     <colgroup css:display="table-column-group">
@@ -82,11 +84,15 @@
                                     </thead>
                                     <tbody class="- topic/tbody tbody" css:display="table-row-group" css:vertical-align="middle">
                                         <tr class="- topic/row row" css:display="table-row" css:vertical-align="middle">
-                                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" css:border-bottom-style="solid" css:border-bottom-width="0" css:border-right-style="solid" css:border-right-width="1px" css:display="table-cell" css:padding-bottom="0.3em" css:padding-left="0.3em" css:padding-right="0.3em" css:padding-top="0.3em" css:table-column="0" css:table-row="1" css:vertical-align="top" dita-ot:x="1" dita-ot:y="2" headers="kzp__table_x11_blp_b4b__entry__1"/>
-                                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col2" css:border-bottom-style="solid" css:border-bottom-width="0" css:border-right-style="solid" css:border-right-width="0" css:display="table-cell" css:padding-bottom="0.3em" css:padding-left="0.3em" css:padding-right="0.3em" css:padding-top="0.3em" css:table-column="1" css:table-row="1" css:vertical-align="top" dita-ot:x="2" dita-ot:y="2" headers="kzp__table_x11_blp_b4b__entry__2">2020-03-31</td>
+                                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" css:border-bottom-style="solid" css:border-bottom-width="1px" css:border-right-style="solid" css:border-right-width="1px" css:display="table-cell" css:padding-bottom="0.3em" css:padding-left="0.3em" css:padding-right="0.3em" css:padding-top="0.3em" css:table-column="0" css:table-row="1" css:vertical-align="top" dita-ot:x="1" dita-ot:y="2" headers="kzp__table_x11_blp_b4b__entry__1"/>
+                                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col2" css:border-bottom-style="solid" css:border-bottom-width="1px" css:border-right-style="solid" css:border-right-width="0" css:display="table-cell" css:padding-bottom="0.3em" css:padding-left="0.3em" css:padding-right="0.3em" css:padding-top="0.3em" css:table-column="1" css:table-row="1" css:vertical-align="top" dita-ot:x="2" dita-ot:y="2" headers="kzp__table_x11_blp_b4b__entry__2">2020-03-31</td>
+                                        </tr>
+                                        <tr class="- topic/row row" css:display="table-row" css:vertical-align="middle">
+                                            <td xmlns:dita-ot="http://dita-ot.sourceforge.net/ns/201007/dita-ot" class="- topic/entry entry colsep-1 rowsep-1" colname="col1" colspan="2" css:border-bottom-style="solid" css:border-bottom-width="0" css:border-right-style="solid" css:border-right-width="0" css:display="table-cell" css:padding-bottom="0.3em" css:padding-left="0.3em" css:padding-right="0.3em" css:padding-top="0.3em" css:table-column="0" css:table-column-span="2" css:table-row="2" css:vertical-align="top" dita-ot:morecols="1" dita-ot:x="1" dita-ot:y="3" headers="kzp__table_x11_blp_b4b__entry__1 kzp__table_x11_blp_b4b__entry__2" nameend="col2" namest="col1"><img chfox:inch="true" class="- topic/image image" css:display="inline" css:image-resolution="120dpi" css:max-width="100%" css:width="550px" href="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png" id="image_e3g_rlp_b4b" placement="inline" src="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png" width="550"><css:content-on-element><css:uri extracted-image-height="571" extracted-image-width="1024" uri="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png"/></css:content-on-element></img></td>
                                         </tr>
                                     </tbody>
-                                </table><img chfox:inch="true" class="- topic/image image" css:display="inline" css:image-resolution="120dpi" css:max-width="100%" css:width="600px" href="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png" id="image_wtf_fvx_znb" placement="inline" src="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png" width="600"><css:content-on-element><css:uri extracted-image-height="571" extracted-image-width="1024" uri="file:/Users/arkadiuszbinder/se/SE/projects/wibo/templates/src.client/kzp_etyk_rezerw_112x17-kopia.png"/></css:content-on-element></img></div>
+                                </table>
+                            </div>
                         </div>
                     </div>
                 </div>

+ 10 - 0
templates/wibo.ditamap

@@ -2,6 +2,16 @@
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">
 <map>
     <title>wibo (+logo klienta logo1.png @page title)</title>
+    <keydef keys="Nazwa_produktu">
+        <topicmeta>
+            <keywords>
+                <keyword>Baza Doll Highlighting primer</keyword>
+            </keywords>
+        </topicmeta>
+    </keydef>
+    
+    
+    
     <topicref href="kzp.dita"/>
     <topicref href="kwp.dita"/>
 </map>

Kaikkia tiedostoja ei voida näyttää, sillä liian monta tiedostoa muuttui tässä diffissä