Improvements

builds/demo/demo.js

@@ -13,7 +13,8 @@ window.addEventListener('load', () => {
       storageType: getQueryStringParam('storage') || 'vfs',
       storageUrl: getQueryStringParam('storageUrl') || '/archives',
       vfs: window.vfs,
-      enableRouting: true
+      enableRouting: true,
+      editable: true
     }, window.document.body)
 
     // put the archive and some more things into global scope, for debugging

builds/desktop/main.js

@@ -3,7 +3,7 @@ const fs = require('fs')
 const path = require('path')
 const url = require('url')
 const fsExtra = require('fs-extra')
-const { DarFileStorage } = require('./lib/texture')
+const { DarFileStorage } = require('./lib/dar-server')
 const debug = require('debug')('main')
 
 const {
@@ -13,10 +13,8 @@ const {
 const DEBUG = process.env.DEBUG
 
 const BLANK_DOCUMENT = path.join(__dirname, 'templates', 'blank.dar')
-const BLANK_FIGURE_PACKAGE = path.join(__dirname, 'templates', 'blank-figure-package.dar')
 const templates = {
-  'article': BLANK_DOCUMENT,
-  'figure-package': BLANK_FIGURE_PACKAGE
+  'article': BLANK_DOCUMENT
 }
 
 let argv = process.argv
@@ -282,12 +280,6 @@ function _createMenu () {
               click () {
                 _openNew('article')
               }
-            },
-            {
-              label: 'Figure Package',
-              click () {
-                _openNew('figure-package')
-              }
             }
           ]
         },

data/kitchen-sink/manuscript.xml

@@ -322,42 +322,15 @@ def read() = in.read()
           </permissions>
         </fig>
         <p id="p-4">Lorem ipsum.</p>
-        <fig-group id="fig2">
-          <fig id="fig2a">
-            <label>Figure 2A</label>
-            <caption>
-              <title>First panel</title>
-              <p id="fig2a-caption-p1">First panel legend</p>
-            </caption>
-            <graphic id="fig2a-graphic" mimetype="image" mime-subtype="jpeg" xlink:href="fig2.jpg" />
-          </fig>
-          <fig id="fig2b">
-            <label>Figure 2B</label>
-            <caption>
-              <title>Second panel</title>
-              <p id="fig2b-caption-p1">Second panel caption</p>
-            </caption>
-            <graphic id="fig2b-graphic" mimetype="image" mime-subtype="jpeg" xlink:href="fig1.jpg" />
-          </fig>
-        </fig-group>
-        <p id="p-5">abc</p>
-        <fig id="fig3">
-          <label>Figure 3</label>
+        <fig id="fig2">
+          <label>Figure 2</label>
           <caption>
-            <title>Figure with metadata.</title>
-            <p id="fig3-caption-p1">Legend.</p>
+            <title>First panel</title>
+            <p id="fig2-caption-p1">First panel legend</p>
           </caption>
-          <kwd-group>
-            <label>Field I</label>
-            <kwd>Value A</kwd>
-            <kwd>Value B</kwd>
-          </kwd-group>
-          <kwd-group>
-            <label>Field II</label>
-            <kwd>Value C</kwd>
-          </kwd-group>
-          <graphic id="fig3-graphic-1" mimetype="image" mime-subtype="jpeg" xlink:href="placeholder.jpg" />
+          <graphic id="fig2-graphic" mimetype="image" mime-subtype="jpeg" xlink:href="fig2.jpg" />
         </fig>
+        <p id="p-5">abc</p>
       </sec>
       <sec id="sec-3-3">
         <title>Supplementary Files</title>

docs/TextureJATS.md

@@ -233,7 +233,7 @@ id, xml:base, specific-use
 </pre>
 **Contains**:
 <pre style="white-space:pre-wrap;">
-(sec|boxed-text|chem-struct-wrap|fig|fig-group|table-wrap|disp-formula|disp-formula-group|def-list|list|p|preformat|disp-quote|supplementary-material|disp-formula|disp-formula-group|def-list|list|p|ack|disp-quote|speech|statement|verse-group)*
+(sec|boxed-text|chem-struct-wrap|fig|table-wrap|disp-formula|disp-formula-group|def-list|list|p|preformat|disp-quote|supplementary-material|disp-formula|disp-formula-group|def-list|list|p|ack|disp-quote|speech|statement|verse-group)*
 </pre>
 **This element may be contained in:**
 <pre style="white-space:pre-wrap;">
@@ -698,22 +698,7 @@ id, xml:base, position, orientation, specific-use, xml:lang, fig-type
 </pre>
 **Contains**:
 <pre style="white-space:pre-wrap;">
-object-id?,label?,caption?,kwd-group*,graphic,permissions?
-</pre>
-**This element may be contained in:**
-<pre style="white-space:pre-wrap;">
-fig-group, named-content, sec, body
-</pre>
-
-### `<fig-group>`
-
-**Attributes**:
-<pre style="white-space:pre-wrap;">
-id, xml:base, position, orientation, specific-use, xml:lang, content-type
-</pre>
-**Contains**:
-<pre style="white-space:pre-wrap;">
-label?,fig+
+object-id?,label?,caption?,graphic,permissions?
 </pre>
 **This element may be contained in:**
 <pre style="white-space:pre-wrap;">
@@ -1032,7 +1017,7 @@ label?,kwd*
 </pre>
 **This element may be contained in:**
 <pre style="white-space:pre-wrap;">
-article-meta, fig
+article-meta
 </pre>
 
 ### `<label>`
@@ -1047,7 +1032,7 @@ id, xml:base, alt, xml:lang
 </pre>
 **This element may be contained in:**
 <pre style="white-space:pre-wrap;">
-aff, kwd-group, fn-group, fig-group, fig, supplementary-material, table-wrap, fn, disp-formula
+aff, kwd-group, fn-group, fig, supplementary-material, table-wrap, fn, disp-formula
 </pre>
 
 ### `<license>`
@@ -1538,7 +1523,7 @@ id, xml:base, xml:lang, sec-type, disp-level, specific-use
 </pre>
 **Contains**:
 <pre style="white-space:pre-wrap;">
-title?,(boxed-text|chem-struct-wrap|fig|fig-group|table-wrap|disp-formula|disp-formula-group|def-list|list|p|preformat|disp-quote|supplementary-material|disp-formula|disp-formula-group|def-list|list|p|ack|disp-quote|speech|statement|verse-group)*,sec*
+title?,(boxed-text|chem-struct-wrap|fig|table-wrap|disp-formula|disp-formula-group|def-list|list|p|preformat|disp-quote|supplementary-material|disp-formula|disp-formula-group|def-list|list|p|ack|disp-quote|speech|statement|verse-group)*,sec*
 </pre>
 **This element may be contained in:**
 <pre style="white-space:pre-wrap;">
@@ -2116,6 +2101,7 @@ element-citation, date, pub-date
 - equation-count
 - etal
 - fig-count
+- fig-group
 - floats-group
 - front-stub
 - funding-statement

index.node.js

@@ -0,0 +1,2 @@
+export * from './index.js'
+export * from './src/dar-server/index.js'