Skip to content

Commit

Permalink
Merge pull request wendellpiez#36 from wendellpiez/develop
Browse files Browse the repository at this point in the history 
Merging Develop with bug fixes
  • Loading branch information
@wendellpiez
wendellpiez authored Oct 3, 2017
2 parents 07b3f64 + 340ef66 commit 115085a
Show file tree
Hide file tree
Showing 13 changed files with 366 additions and 360 deletions.
236 changes: 234 additions & 2 deletions JATSKit-dev.xpr
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="18.1">
<project version="19.0">
<meta>
<filters directoryPatterns="" filePatterns="JATSKit-dev.xpr" positiveFilePatterns="" showHiddenFiles="false"/>
<options>
<serialized version="18.1" xml:space="preserve">
<serialized version="19.0" xml:space="preserve">
<serializableOrderedMap>
<entry>
<String>additional.frameworks.directories</String>
Expand All @@ -30,6 +30,21 @@
<entry>
<String>scenario.associations</String>
<scenarioAssociation-array>
<scenarioAssociation>
<field name="url">
<String>lib/xproc/jatskit-ebook-produce.xpl</String>
</field>
<field name="scenarioIds">
<list>
<String>JATSKit - NISO JATS / NLM BITS - EPUB debug</String>
</list>
</field>
<field name="scenarioTypes">
<list>
<String>XPROC</String>
</list>
</field>
</scenarioAssociation>
<scenarioAssociation>
<field name="url">
<String>../../Sources/2355-h/vegetable-mould-bits.fo</String>
Expand Down Expand Up @@ -136,6 +151,222 @@
<String-array/>
</field>
</scenario>
<xprocScenario>
<field name="inputPorts">
<xprocInputPort-array>
<xprocInputPort>
<field name="portName">
<String>source</String>
</field>
<field name="urls">
<String-array>
<String>${currentFileURL}</String>
</String-array>
</field>
</xprocInputPort>
</xprocInputPort-array>
</field>
<field name="outputPorts">
<xprocOutputPort-array>
<xprocOutputPort>
<field name="portName">
<String>bookparts-split-document</String>
</field>
<field name="url">
<null/>
</field>
<field name="showInSequenceView">
<Boolean>true</Boolean>
</field>
</xprocOutputPort>
<xprocOutputPort>
<field name="portName">
<String>page-sequence</String>
</field>
<field name="url">
<null/>
</field>
<field name="showInSequenceView">
<Boolean>true</Boolean>
</field>
</xprocOutputPort>
<xprocOutputPort>
<field name="portName">
<String>apparatus</String>
</field>
<field name="url">
<null/>
</field>
<field name="showInSequenceView">
<Boolean>true</Boolean>
</field>
</xprocOutputPort>
<xprocOutputPort>
<field name="portName">
<String>graphics-manifest</String>
</field>
<field name="url">
<null/>
</field>
<field name="showInSequenceView">
<Boolean>true</Boolean>
</field>
</xprocOutputPort>
<xprocOutputPort>
<field name="portName">
<String>support-manifest</String>
</field>
<field name="url">
<null/>
</field>
<field name="showInSequenceView">
<Boolean>true</Boolean>
</field>
</xprocOutputPort>
<xprocOutputPort>
<field name="portName">
<String>source-ready</String>
</field>
<field name="url">
<null/>
</field>
<field name="showInSequenceView">
<Boolean>true</Boolean>
</field>
</xprocOutputPort>
</xprocOutputPort-array>
</field>
<field name="xprocOptions">
<xprocOption-array>
<xprocOption>
<field name="namespaceURI">
<String></String>
</field>
<field name="localName">
<String>debug</String>
</field>
<field name="value">
<null/>
</field>
</xprocOption>
<xprocOption>
<field name="namespaceURI">
<String></String>
</field>
<field name="localName">
<String>target-format</String>
</field>
<field name="value">
<null/>
</field>
</xprocOption>
</xprocOption-array>
</field>
<field name="xprocParameters">
<xprocParameterPort-array>
<xprocParameterPort>
<field name="portName">
<String>*</String>
</field>
<field name="parameters">
<xprocParameter-array/>
</field>
</xprocParameterPort>
<xprocParameterPort>
<field name="portName">
<String>parameters</String>
</field>
<field name="parameters">
<xprocParameter-array/>
</field>
</xprocParameterPort>
</xprocParameterPort-array>
</field>
<field name="advancedOptionsMap">
<null/>
</field>
<field name="name">
<String>JATSKit - NISO JATS / NLM BITS - EPUB debug</String>
</field>
<field name="baseURL">
<null/>
</field>
<field name="footerURL">
<null/>
</field>
<field name="fOPMethod">
<null/>
</field>
<field name="fOProcessorName">
<null/>
</field>
<field name="headerURL">
<null/>
</field>
<field name="inputXSLURL">
<String>${pdu}/lib/xproc/jatskit-ebook-sequence.xpl</String>
</field>
<field name="inputXMLURL">
<String></String>
</field>
<field name="defaultScenario">
<Boolean>false</Boolean>
</field>
<field name="isFOPPerforming">
<Boolean>false</Boolean>
</field>
<field name="type">
<String>XPROC</String>
</field>
<field name="saveAs">
<Boolean>false</Boolean>
</field>
<field name="openInBrowser">
<Boolean>false</Boolean>
</field>
<field name="outputFile">
<null/>
</field>
<field name="outputResource">
<null/>
</field>
<field name="openOtherLocationInBrowser">
<Boolean>false</Boolean>
</field>
<field name="locationToOpenInBrowserURL">
<String>${cfdu}/${cfn}</String>
</field>
<field name="openInEditor">
<Boolean>false</Boolean>
</field>
<field name="showInHTMLPane">
<Boolean>false</Boolean>
</field>
<field name="showInXMLPane">
<Boolean>true</Boolean>
</field>
<field name="showInSVGPane">
<Boolean>false</Boolean>
</field>
<field name="showInResultSetPane">
<Boolean>false</Boolean>
</field>
<field name="useXSLTInput">
<Boolean>false</Boolean>
</field>
<field name="xsltParams">
<list/>
</field>
<field name="cascadingStylesheets">
<String-array/>
</field>
<field name="xslTransformer">
<String>Calabash XProc</String>
</field>
<field name="extensionURLs">
<String-array/>
</field>
</xprocScenario>
</scenario-array>
</entry>
<entry>
Expand All @@ -150,5 +381,6 @@
<folder path="../../"/>
<folder path="../../../PellucidLiterature/EpigramMicrophone/"/>
<folder path="../../../../public_html/"/>
<file name="../../../PellucidLiterature/pausepress/index.html"/>
</projectTree>
</project>
30 changes: 17 additions & 13 deletions jats.framework
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<serialized version="18.1" xml:space="preserve">
<serialized version="19.0" xml:space="preserve">
<serializableOrderedMap>
<entry>
<String>document.types</String>
Expand Down Expand Up @@ -63,17 +63,6 @@
<Boolean>true</Boolean>
</field>
</cssFile>
<cssFile>
<field name="href">
<String>${framework}/lib/author-css/jatskit-noisy-authoring.css</String>
</field>
<field name="title">
<String>JATSKit 'noisy' Authoring</String>
</field>
<field name="alternate">
<Boolean>true</Boolean>
</field>
</cssFile>
</cssFile-array>
</field>
<field name="mergeCSSsFromDocument">
Expand Down Expand Up @@ -2402,7 +2391,19 @@
<xprocOutputPort-array/>
</field>
<field name="xprocOptions">
<xprocOption-array/>
<xprocOption-array>
<xprocOption>
<field name="namespaceURI">
<String></String>
</field>
<field name="localName">
<String>xproc-loc</String>
</field>
<field name="value">
<String>${framework}/lib/xproc/jatskit-epub3-produce.xpl</String>
</field>
</xprocOption>
</xprocOption-array>
</field>
<field name="xprocParameters">
<xprocParameterPort-array>
Expand Down Expand Up @@ -2778,6 +2779,9 @@
<field name="customAttributeValueEditor">
<null/>
</field>
<field name="textModeExternalObjectInsertionHandler">
<null/>
</field>
</documentTypeDescriptor>
</documentTypeDescriptor-array>
</entry>
Expand Down
57 changes: 57 additions & 0 deletions lib/author-css/jatskit-authoring.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ list:before { font-family: sans-serif; font-size: 80%;
values, "order, bullet, simple");
}


fn { -oxy-foldable:true; display: inline }
fn:before { font-family: sans-serif; font-size: 80%;
color: #440000; counter-increment: footnote; content: "Note " counter(footnote);
Expand All @@ -98,6 +99,62 @@ vertical-align : middle ;
)
}

count:before, book-count:before { font-family: sans-serif; font-size: 80%;
content: "Count " attr(count-type) }

fig-count:before, book-fig-count:before { font-family: sans-serif; font-size: 80%;
content: "Figure count: " }

table-count:before, book-table-count:before { font-family: sans-serif; font-size: 80%;
content: "Table count: " }

equation-count:before, book-equation-count:before { font-family: sans-serif; font-size: 80%;
content: "Equation count: " }

ref-count:before, book-ref-count:before { font-family: sans-serif; font-size: 80%;
content: "Reference count: " }

page-count:before, book-page-count:before { font-family: sans-serif; font-size: 80%;
content: "Page count: " }

word-count:before, book-word-count:before { font-family: sans-serif; font-size: 80%;
content: "Word count: " }

counts > *:after { font-family: sans-serif; font-size: 80%;
content:
oxy_textfield(
edit, "@count",
columns 5 )
}

date:after, access-date:after, conf-date:after,
pub-date:after, string-date:after { font-family: sans-serif; font-size: 80%;
content:
oxy_datePicker(
columns, 10,
edit, "@iso-8601-date",
format, "yyyy-MM-dd");
}

*[id]:before {
font-family: sans-serif; font-size: 80%;
content: "id: "
oxy_textfield(
edit, "@id",
columns, 28);
}


xref:before {
font-family: sans-serif; font-size: 80%;
content: "rid: "
oxy_textfield(
edit, "@rid",
columns, 14);
}

/* Treatment of specialized named-content illustrating potential enhancements */

named-content { background-color: #fff8dc /*cornsilk*/ }

named-content:not([content-type]):after,
Expand Down
Loading

0 comments on commit 115085a

Please sign in to comment.