Merge pull request #571 from HistoryAtState/fix-sectiontitleital

Fix sectiontitleital

Author: joewiz

app/scss/_tei.scss

@@ -100,6 +100,10 @@
   font-size: inherit;
 }
 
+.section-title {
+    margin-top: 2em;
+}
+
 // list in tei titleStmt for editors,
 // hotfix: override wrong odd transformation
 .hsg-list-editors {

modules/frus-html.xqm

@@ -841,12 +841,6 @@ function fh:mobi-size($node as node(), $model as map(*), $document-id as xs:stri
     fh:mobi-size($document-id)
 };
 
-declare
-    %templates:wrap
-function fh:pdf-size-templating($node as node(), $model as map(*), $document-id as xs:string) {
-    fh:pdf-size($document-id)
-};
-
 declare
     %templates:wrap
 function fh:pdf-size-templating($node as node(), $model as map(*), $document-id as xs:string, $section-id as xs:string?) {
@@ -859,7 +853,7 @@ declare function fh:mobi-url($document-id as xs:string) {
 };
 
 declare function fh:pdf-url($document-id as xs:string, $section-id as xs:string?) {
-    if ($section-id) then
+    if (exists($section-id)) then
         doc($config:FRUS_COL_VOLUMES || "/" || $document-id || ".xml")//tei:relatedItem[@corresp eq "#" || $section-id and @type eq "pdf"]//tei:ref/@target
     else
         doc($config:FRUS_COL_VOLUMES || "/" || $document-id || ".xml")//tei:relatedItem[@corresp eq "#" || $document-id and @type eq "pdf"]//tei:ref/@target

resources/odd/compiled/frus-web-module.xql

@@ -1,15 +1,15 @@
 module namespace pml='http://www.tei-c.org/pm/models/frus/web/module';
 
-import module namespace m='http://www.tei-c.org/pm/models/frus/web/module' at '/db/apps/hsg-shell/resources/odd/compiled/frus-web.xql';
+import module namespace m='http://www.tei-c.org/pm/models/frus/web' at '/db/apps/hsg-shell/transform/frus-web.xql';
 
 (: Generated library module to be directly imported into code which
  : needs to transform TEI nodes using the ODD this module is based on.
  :)
 declare function pml:transform($xml as node()*, $parameters as map(*)?) {
 
    let $options := map {
-       "styles": ["/db/apps/hsg-shell/resources/odd/compiled/frus.css"],
-       "collection": "/db/apps/hsg-shell/resources/odd/compiled",
+       "styles": ["../transform/frus.css"],
+       "collection": "/db/apps/hsg-shell/transform",
        "parameters": if (exists($parameters)) then $parameters else map {}
    }
    return m:transform($options, $xml)

resources/odd/compiled/frus-web.xql

@@ -264,7 +264,10 @@ declare function model:apply($config as map(*), $input as node()*) {
                             if (@rend = 'flushleft') then
                                 html:paragraph($config, ., css:get-rendition(., ("tei-p2", css:map-rend-to-class(.))), .)
                             else
-                                html:paragraph($config, ., css:get-rendition(., ("tei-p3", css:map-rend-to-class(.))), .)
+                                if (@rend = 'sectiontitleital') then
+                                    html:paragraph($config, ., ("tei-p4", "section-title", "font-italic", css:map-rend-to-class(.)), .)
+                                else
+                                    html:paragraph($config, ., css:get-rendition(., ("tei-p3", css:map-rend-to-class(.))), .)
                     case element(list) return
                         if (head) then
                             (
@@ -360,7 +363,7 @@ declare function model:apply($config as map(*), $input as node()*) {
                         if ($parameters?document-list and div[@type='question']) then
                             ext-html:document-list($config, ., ("tei-div1", css:map-rend-to-class(.)))
                         else
-                            if ($parameters?document-list and @type = ('compilation', 'chapter', 'subchapter', 'section', 'part') and exists(div[@type and not(@type = 'online-supplement')])) then
+                            if ($parameters?document-list and @type = ('compilation', 'chapter', 'chapter-pending', 'subchapter', 'section', 'section-pending', 'part') and exists(div[@type and not(@type = 'online-supplement')])) then
                                 ext-html:document-list($config, ., ("tei-div2", css:map-rend-to-class(.)))
                             else
                                 html:block($config, ., ("tei-div3", css:map-rend-to-class(.)), .)
@@ -479,7 +482,10 @@ declare function model:apply($config as map(*), $input as node()*) {
                             (: If it is inside a paragraph then it is inline, otherwise it is block level :)
                             html:block($config, ., css:get-rendition(., ("tei-quote2", css:map-rend-to-class(.))), .)
                     case element(gap) return
-                        html:omit($config, ., ("tei-gap", css:map-rend-to-class(.)), .)
+                        if (exists(@unit) and @quantity castable as xs:integer) then
+                            ext-html:gap($config, ., ("tei-gap1", css:map-rend-to-class(.)), ., @unit, @quantity cast as xs:integer)
+                        else
+                            html:omit($config, ., ("tei-gap2", css:map-rend-to-class(.)), .)
                     case element(addrLine) return
                         html:block($config, ., ("tei-addrLine", css:map-rend-to-class(.)), .)
                     case element(row) return
@@ -495,7 +501,7 @@ declare function model:apply($config as map(*), $input as node()*) {
                         html:block($config, ., ("tei-byline", css:map-rend-to-class(.)), .)
                     case element(titleStmt) return
                         (
-                            html:heading($config, ., ("tei-titleStmt1", css:map-rend-to-class(.)), title[@type="complete"], ()),
+                            html:heading($config, ., ("tei-titleStmt1", css:map-rend-to-class(.)), title[@type="complete"], 1),
                             if (count(editor[@role = 'primary']) gt 1) then
                                 html:block($config, ., ("tei-titleStmt2", css:map-rend-to-class(.)), "Editors:")
                             else

resources/odd/source/frus.odd

@@ -162,6 +162,7 @@
                     <model behaviour="paragraph" useSourceRendition="true">
                         <outputRendition>text-indent: 0em;</outputRendition>
                     </model>
+                    <model predicate="@rend = 'sectiontitleital'" behaviour="paragraph" cssClass="section-title font-italic"/>
                 </elementSpec>
                 <elementSpec mode="change" ident="dateline">
                     <!-- Override any rendition values and make all datelines right-aligned block -->

transform/frus-epub.xql

@@ -264,7 +264,10 @@ declare function model:apply($config as map(*), $input as node()*) {
                             if (@rend = 'flushleft') then
                                 html:paragraph($config, ., css:get-rendition(., ("tei-p2", css:map-rend-to-class(.))), .)
                             else
-                                html:paragraph($config, ., css:get-rendition(., ("tei-p3", css:map-rend-to-class(.))), .)
+                                if (@rend = 'sectiontitleital') then
+                                    html:paragraph($config, ., ("tei-p4", "section-title", "font-italic", css:map-rend-to-class(.)), .)
+                                else
+                                    html:paragraph($config, ., css:get-rendition(., ("tei-p3", css:map-rend-to-class(.))), .)
                     case element(list) return
                         if (head) then
                             (
@@ -361,7 +364,7 @@ declare function model:apply($config as map(*), $input as node()*) {
                             (: No function found for behavior: document-list :)
                             $config?apply($config, ./node())
                         else
-                            if ($parameters?document-list and @type = ('compilation', 'chapter', 'subchapter', 'section', 'part') and exists(div[@type and not(@type = 'online-supplement')])) then
+                            if ($parameters?document-list and @type = ('compilation', 'chapter', 'chapter-pending', 'subchapter', 'section', 'section-pending', 'part') and exists(div[@type and not(@type = 'online-supplement')])) then
                                 (: No function found for behavior: document-list :)
                                 $config?apply($config, ./node())
                             else
@@ -482,7 +485,11 @@ declare function model:apply($config as map(*), $input as node()*) {
                             (: If it is inside a paragraph then it is inline, otherwise it is block level :)
                             epub:block($config, ., css:get-rendition(., ("tei-quote2", css:map-rend-to-class(.))), .)
                     case element(gap) return
-                        html:omit($config, ., ("tei-gap", css:map-rend-to-class(.)), .)
+                        if (exists(@unit) and @quantity castable as xs:integer) then
+                            (: No function found for behavior: gap :)
+                            $config?apply($config, ./node())
+                        else
+                            html:omit($config, ., ("tei-gap2", css:map-rend-to-class(.)), .)
                     case element(addrLine) return
                         epub:block($config, ., ("tei-addrLine", css:map-rend-to-class(.)), .)
                     case element(row) return
@@ -498,7 +505,7 @@ declare function model:apply($config as map(*), $input as node()*) {
                         epub:block($config, ., ("tei-byline", css:map-rend-to-class(.)), .)
                     case element(titleStmt) return
                         (
-                            html:heading($config, ., ("tei-titleStmt1", css:map-rend-to-class(.)), title[@type="complete"], ()),
+                            html:heading($config, ., ("tei-titleStmt1", css:map-rend-to-class(.)), title[@type="complete"], 1),
                             if (count(editor[@role = 'primary']) gt 1) then
                                 epub:block($config, ., ("tei-titleStmt2", css:map-rend-to-class(.)), "Editors:")
                             else

transform/frus-web.xql

@@ -264,7 +264,10 @@ declare function model:apply($config as map(*), $input as node()*) {
                             if (@rend = 'flushleft') then
                                 html:paragraph($config, ., css:get-rendition(., ("tei-p2", css:map-rend-to-class(.))), .)
                             else
-                                html:paragraph($config, ., css:get-rendition(., ("tei-p3", css:map-rend-to-class(.))), .)
+                                if (@rend = 'sectiontitleital') then
+                                    html:paragraph($config, ., ("tei-p4", "section-title", "font-italic", css:map-rend-to-class(.)), .)
+                                else
+                                    html:paragraph($config, ., css:get-rendition(., ("tei-p3", css:map-rend-to-class(.))), .)
                     case element(list) return
                         if (head) then
                             (
@@ -360,7 +363,7 @@ declare function model:apply($config as map(*), $input as node()*) {
                         if ($parameters?document-list and div[@type='question']) then
                             ext-html:document-list($config, ., ("tei-div1", css:map-rend-to-class(.)))
                         else
-                            if ($parameters?document-list and @type = ('compilation', 'chapter', 'subchapter', 'section', 'part') and exists(div[@type and not(@type = 'online-supplement')])) then
+                            if ($parameters?document-list and @type = ('compilation', 'chapter', 'chapter-pending', 'subchapter', 'section', 'section-pending', 'part') and exists(div[@type and not(@type = 'online-supplement')])) then
                                 ext-html:document-list($config, ., ("tei-div2", css:map-rend-to-class(.)))
                             else
                                 html:block($config, ., ("tei-div3", css:map-rend-to-class(.)), .)
@@ -479,7 +482,10 @@ declare function model:apply($config as map(*), $input as node()*) {
                             (: If it is inside a paragraph then it is inline, otherwise it is block level :)
                             html:block($config, ., css:get-rendition(., ("tei-quote2", css:map-rend-to-class(.))), .)
                     case element(gap) return
-                        html:omit($config, ., ("tei-gap", css:map-rend-to-class(.)), .)
+                        if (exists(@unit) and @quantity castable as xs:integer) then
+                            ext-html:gap($config, ., ("tei-gap1", css:map-rend-to-class(.)), ., @unit, @quantity cast as xs:integer)
+                        else
+                            html:omit($config, ., ("tei-gap2", css:map-rend-to-class(.)), .)
                     case element(addrLine) return
                         html:block($config, ., ("tei-addrLine", css:map-rend-to-class(.)), .)
                     case element(row) return
@@ -495,7 +501,7 @@ declare function model:apply($config as map(*), $input as node()*) {
                         html:block($config, ., ("tei-byline", css:map-rend-to-class(.)), .)
                     case element(titleStmt) return
                         (
-                            html:heading($config, ., ("tei-titleStmt1", css:map-rend-to-class(.)), title[@type="complete"], ()),
+                            html:heading($config, ., ("tei-titleStmt1", css:map-rend-to-class(.)), title[@type="complete"], 1),
                             if (count(editor[@role = 'primary']) gt 1) then
                                 html:block($config, ., ("tei-titleStmt2", css:map-rend-to-class(.)), "Editors:")
                             else