solid-panes 4.4.2-1 → 4.4.2-3

package/dist/dataContentPane.js

@@ -1,226 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.dataContentPane = void 0;
-var UI = _interopRequireWildcard(require("solid-ui"));
-var $rdf = _interopRequireWildcard(require("rdflib"));
-var _dompurify = _interopRequireDefault(require("dompurify"));
-require("./dataContentPane.css");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-/*      Data content Pane
- **
- **  This pane shows the content of a particular RDF resource
- ** or at least the RDF semantics we attribute to that resource.
- */
-
-// To do:  - Only take data from one graph
-//         - Only do forwards not backward?
-//         - Expand automatically all the way down
-//         - original source view?  Use ffox view source
-
-const ns = UI.ns;
-const dataContentPane = exports.dataContentPane = {
-  icon: UI.icons.originalIconBase + 'rdf_flyer.24.gif',
-  name: 'dataContents',
-  audience: [ns.solid('Developer')],
-  label: function (subject, context) {
-    if ('http://www.w3.org/2007/ont/link#ProtocolEvent' in context.session.store.findTypeURIs(subject)) {
-      return null;
-    }
-    const n = context.session.store.statementsMatching(undefined, undefined, undefined, subject).length;
-    if (n === 0) return null;
-    return 'Data (' + n + ')';
-  },
-  /*
-  shouldGetFocus: function(subject) {
-      return store.whether(subject, UI.ns.rdf('type'), UI.ns.link('RDFDocument'))
-  },
-  */
-  statementsAsTables: function statementsAsTables(sts, context, initialRoots) {
-    const myDocument = context.dom;
-    // const outliner = context.getOutliner(myDocument)
-    const rep = myDocument.createElement('table');
-    rep.classList.add('data-content-pane__table', 'data-content-pane__table--root');
-    const isMobileLayout = context.environment?.layout === 'mobile';
-    const sz = $rdf.Serializer(context.session.store);
-    const res = sz.rootSubjects(sts);
-    let roots = res.roots;
-    const subjects = res.subjects;
-    const loopBreakers = res.loopBreakers ?? {};
-    for (const x in loopBreakers) {
-      console.log('\tdataContentPane: loopbreaker:' + x);
-    }
-    const doneBnodes = {};
-    const referencedBnodes = {};
-    function propertyTree(subject, nestingLevel = 0) {
-      const rep = myDocument.createElement('table');
-      rep.classList.add('data-content-pane__table', 'data-content-pane__table--property');
-      let lastPred = null;
-      const subjectStatements = subjects[sz.toStr(subject)];
-      if (!subjectStatements) {
-        rep.appendChild(myDocument.createTextNode('...'));
-        return rep;
-      }
-      subjectStatements.sort();
-      let same = 0;
-      let predicateTD;
-      for (let i = 0; i < subjectStatements.length; i++) {
-        const st = subjectStatements[i];
-        const tr = myDocument.createElement('tr');
-        tr.classList.add('data-content-pane__row--top-aligned', 'data-content-pane__row--property');
-        if (st.predicate.uri !== lastPred || isMobileLayout) {
-          if (!isMobileLayout && lastPred && same > 1) {
-            predicateTD?.setAttribute('rowspan', '' + same);
-          }
-          predicateTD = myDocument.createElement('td');
-          predicateTD.setAttribute('class', 'data-content-pane__predicate-cell');
-          const anchor = myDocument.createElement('a');
-          anchor.setAttribute('href', st.predicate.uri);
-          anchor.addEventListener('click', UI.widgets.openHrefInOutlineMode, true);
-          anchor.appendChild(myDocument.createTextNode(UI.utils.predicateLabelForXML(st.predicate)));
-          predicateTD.appendChild(anchor);
-          tr.appendChild(predicateTD);
-          lastPred = st.predicate.uri;
-          same = 0;
-        }
-        same++;
-        const objectTD = myDocument.createElement('td');
-        objectTD.classList.add('data-content-pane__value-cell');
-        objectTD.appendChild(objectTree(st.object, nestingLevel + 1));
-        tr.appendChild(objectTD);
-        rep.appendChild(tr);
-      }
-      if (!isMobileLayout && lastPred && same > 1) {
-        predicateTD?.setAttribute('rowspan', '' + same);
-      }
-      return rep;
-    }
-    function objectTree(obj, nestingLevel = 0) {
-      let res;
-      let anchor;
-      switch (obj.termType) {
-        case 'NamedNode':
-          anchor = myDocument.createElement('a');
-          anchor.setAttribute('href', obj.uri);
-          anchor.addEventListener('click', UI.widgets.openHrefInOutlineMode, true);
-          anchor.appendChild(myDocument.createTextNode(UI.utils.label(obj)));
-          return anchor;
-        case 'Literal':
-          if (!obj.datatype || !obj.datatype.uri) {
-            res = myDocument.createElement('div');
-            res.classList.add('data-content-pane__literal');
-            res.textContent = obj.value;
-            return res;
-          } else if (obj.datatype.uri === 'http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral') {
-            res = myDocument.createElement('div');
-            res.classList.add('embeddedXHTML');
-            res.innerHTML = _dompurify.default.sanitize(obj.value);
-            return res;
-          }
-          return myDocument.createTextNode(obj.value);
-        case 'BlankNode':
-          {
-            if (obj.toNT() in doneBnodes) {
-              referencedBnodes[obj.toNT()] = true;
-              const referenceAnchor = myDocument.createElement('a');
-              referenceAnchor.setAttribute('href', '#' + obj.toNT().slice(2));
-              referenceAnchor.setAttribute('class', 'bnodeRef');
-              referenceAnchor.textContent = '*' + obj.toNT().slice(3);
-              return referenceAnchor;
-            }
-            doneBnodes[obj.toNT()] = true;
-            const newTable = propertyTree(obj, nestingLevel);
-            doneBnodes[obj.toNT()] = newTable;
-            if (nestingLevel % 2 === 1) {
-              newTable.classList.add('data-content-pane__nested-table--light');
-            } else {
-              newTable.classList.add('data-content-pane__nested-table--dark');
-            }
-            return newTable;
-          }
-        case 'Collection':
-          res = myDocument.createElement('table');
-          res.setAttribute('class', 'collectionAsTables');
-          for (let i = 0; i < obj.elements.length; i++) {
-            const tr = myDocument.createElement('tr');
-            res.appendChild(tr);
-            tr.appendChild(objectTree(obj.elements[i], nestingLevel + 1));
-          }
-          return res;
-        case 'Graph':
-          res = context.session.paneRegistry.byName('dataContents').statementsAsTables(obj.statements, context);
-          res.setAttribute('class', 'data-content-pane__nested-formula');
-          return res;
-        case 'Variable':
-          return myDocument.createTextNode('?' + obj.uri);
-      }
-      throw new Error('Unhandled node type: ' + obj.termType);
-    }
-    if (initialRoots) {
-      roots = initialRoots.concat(roots.filter(function (x) {
-        for (let i = 0; i < initialRoots.length; i++) {
-          if (x.sameTerm(initialRoots[i])) return false;
-        }
-        return true;
-      }));
-    }
-    for (let i = 0; i < roots.length; i++) {
-      const tr = myDocument.createElement('tr');
-      tr.classList.add(i % 2 === 0 ? 'data-content-pane__row--even' : 'data-content-pane__row--odd', 'data-content-pane__row--root');
-      rep.appendChild(tr);
-      const subjectTD = myDocument.createElement('td');
-      subjectTD.classList.add('data-content-pane__subject-cell');
-      tr.appendChild(subjectTD);
-      const TDTree = myDocument.createElement('td');
-      TDTree.classList.add('data-content-pane__details-cell');
-      tr.appendChild(TDTree);
-      const root = roots[i];
-      if (root.termType === 'BlankNode') {
-        subjectTD.appendChild(myDocument.createTextNode(UI.utils.label(root)));
-      } else {
-        subjectTD.appendChild(objectTree(root, 0));
-      }
-      TDTree.appendChild(propertyTree(root, 0));
-    }
-    for (const bNT in referencedBnodes) {
-      const table = doneBnodes[bNT];
-      if (table === true) continue;
-      const anchor = myDocument.createElement('a');
-      anchor.setAttribute('id', bNT.slice(2));
-      anchor.setAttribute('class', 'bnodeDef');
-      anchor.textContent = bNT.slice(3) + ')';
-      table.insertBefore(anchor, table.firstChild);
-    }
-    return rep;
-  },
-  render: function (subject, context) {
-    const myDocument = context.dom;
-    function applyEnvironmentAttributes(element) {
-      const environment = context.environment ?? {};
-      element.dataset.layout = environment.layout ?? 'desktop';
-      element.dataset.theme = environment.theme ?? 'light';
-      element.dataset.inputMode = environment.inputMode ?? 'pointer';
-    }
-    function mainRendering() {
-      const kb = context.session.store;
-      const sts = kb.statementsMatching(undefined, undefined, undefined, subject);
-      const initialRoots = [];
-      if (kb.holds(subject, undefined, undefined, subject)) {
-        initialRoots.push(subject);
-      }
-      const ps = kb.any(subject, UI.ns.foaf('primaryTopic'), undefined, subject);
-      if (ps && (ps.termType === 'NamedNode' || ps.termType === 'BlankNode')) {
-        initialRoots.push(ps);
-      }
-      div.appendChild(context.session.paneRegistry.byName('dataContents').statementsAsTables(sts, context, initialRoots));
-    }
-    const div = myDocument.createElement('div');
-    div.classList.add('dataContentPane', 'data-content-pane');
-    applyEnvironmentAttributes(div);
-    mainRendering();
-    return div;
-  }
-};

package/dist/defaultPane.css

@@ -1,97 +0,0 @@
-.defaultPane .bottom-border {
-	border: 0.2rem solid transparent;
-	width: 100%;
-}
-
-.defaultPane .bottom-border-active {
-	cursor: copy;
-	border: 0.2rem solid;
-	border-color: var(--color-bottom-border-highlight, rgb(100%, 65%, 0%));
-}
-
-.defaultPane {
-	--default-pane-predicate-column: 16rem;
-	--default-pane-object-indent: 1.75rem;
-}
-
-.defaultPane > tr {
-	display: grid;
-	grid-template-columns: minmax(0, var(--default-pane-predicate-column)) minmax(0, 1fr);
-	align-items: flex-start;
-}
-
-.defaultPane > tr > td.pred {
-	grid-column: 1;
-	display: flex;
-	align-items: flex-start;
-	padding-left: 0 !important;
-	box-sizing: border-box;
-	min-width: 0;
-}
-
-.defaultPane > tr > td.pred > .labelTD {
-	flex: 1 1 auto;
-	min-width: 0;
-	margin: 0;
-	padding-top: 0;
-	padding-bottom: 0;
-}
-
-.defaultPane > tr > td.pred > .iconTD {
-	flex: 0 0 auto;
-	width: auto;
-	margin: 0;
-}
-
-.defaultPane > tr > td.obj {
-	grid-column: 2;
-	min-width: 0;
-	box-sizing: border-box;
-	align-self: start;
-}
-
-.defaultPane > tr > td[colspan='2'] {
-	grid-column: 1 / -1;
-}
-
-.defaultPane[data-layout='mobile'] > tr {
-	grid-template-columns: minmax(0, 1fr);
-}
-
-.defaultPane[data-layout='mobile'] > tr > td.pred,
-.defaultPane[data-layout='mobile'] > tr > td.obj {
-	display: block;
-	grid-column: 1;
-	width: 100%;
-	box-sizing: border-box;
-}
-
-.defaultPane[data-layout='mobile'] > tr > td.pred {
-	padding-bottom: var(--spacing-small, 0.1rem);
-}
-
-.defaultPane[data-layout='mobile'] > tr > td.obj {
-	padding-left: var(--default-pane-object-indent) !important;
-}
-
-@media (max-width: 700px) {
-	.defaultPane > tr {
-		grid-template-columns: minmax(0, 1fr);
-	}
-
-	.defaultPane > tr > td.pred,
-	.defaultPane > tr > td.obj {
-		display: block;
-		grid-column: 1;
-		width: 100%;
-		box-sizing: border-box;
-	}
-
-	.defaultPane > tr > td.pred {
-		padding-bottom: var(--spacing-small, 0.1rem);
-	}
-
-	.defaultPane > tr > td.obj {
-		padding-left: var(--default-pane-object-indent) !important;
-	}
-}

package/dist/defaultPane.js

@@ -1,81 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.defaultPane = void 0;
-var UI = _interopRequireWildcard(require("solid-ui"));
-var $rdf = _interopRequireWildcard(require("rdflib"));
-require("./defaultPane.css");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-/*   Default Pane
- **
- **  This outline pane contains the properties which are
- **  normally displayed to the user. See also: internalPane
- ** This pane hides the ones considered too low-level for the normal user.
- */
-
-const ns = UI.ns;
-const defaultPane = exports.defaultPane = {
-  icon: UI.icons.originalIconBase + 'about.png',
-  name: 'default',
-  audience: [ns.solid('Developer')],
-  label: function (_subject) {
-    return 'about ';
-  },
-  render: function (subject, context) {
-    const dom = context.dom;
-    function applyEnvironmentAttributes(element) {
-      const environment = context.environment ?? {};
-      element.dataset.layout = environment.layout ?? 'desktop';
-    }
-    const filter = function (pred, inverse) {
-      if (typeof context.session.paneRegistry.byName('internal').predicates[pred.uri] !== 'undefined') {
-        return false;
-      }
-      if (inverse && pred.uri === 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type') {
-        return false;
-      }
-      return true;
-    };
-    const outliner = context.getOutliner(dom);
-    const kb = context.session.store;
-    // var outline = outliner; // @@
-    UI.log.info('@defaultPane.render, dom is now ' + dom.location);
-    subject = kb.canon(subject);
-    const div = dom.createElement('div');
-    div.setAttribute('class', 'defaultPane');
-    applyEnvironmentAttributes(div);
-    //        appendRemoveIcon(div, subject, div)
-
-    let plist = subject.termType === 'Literal' ? [] : kb.statementsMatching(subject);
-    outliner.appendPropertyTRs(div, plist, false, filter);
-    plist = kb.statementsMatching(undefined, undefined, subject);
-    outliner.appendPropertyTRs(div, plist, true, filter);
-    const subjectStatement = subject.termType === 'BlankNode' ? kb.anyStatementMatching(subject) : undefined;
-    if (subject.termType === 'Literal' && subject.value.slice(0, 7) === 'http://') {
-      outliner.appendPropertyTRs(div, [$rdf.st(kb.sym(subject.value), UI.ns.link('uri'), subject)], true, filter);
-    }
-    if (subject.termType === 'NamedNode' && kb.updater.editable($rdf.Util.uri.docpart(subject.uri), kb) || subject.termType === 'BlankNode' && subjectStatement && subjectStatement.why && 'uri' in subjectStatement.why && typeof subjectStatement.why.uri === 'string' && kb.updater.editable(subjectStatement.why.uri)
-    // check the document containing something about of the bnode @@ what about as object?
-    /*  ! && HCIoptions["bottom insert highlights"].enabled  */) {
-      const holdingTr = dom.createElement('tr'); // these are to minimize required changes
-      const holdingTd = dom.createElement('td'); // in userinput.js
-      holdingTd.setAttribute('colspan', '2');
-      holdingTd.setAttribute('notSelectable', 'true');
-      const img = dom.createElement('img');
-      img.src = UI.icons.originalIconBase + 'tango/22-list-add-new.png';
-      img.addEventListener('click', function addNewTripleIconMouseDownListener(e) {
-        outliner.UserInput.addNewPredicateObject(e);
-        e.stopPropagation();
-        e.preventDefault();
-      });
-      img.className = 'bottom-border-active';
-      // img.addEventListener('click', thisOutline.UserInput.addNewPredicateObject,false)
-      div.appendChild(holdingTr).appendChild(holdingTd).appendChild(img);
-    }
-    return div;
-  }
-};
-
-// ends

package/dist/dokieli/dokieliPane.js

@@ -1,74 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var UI = _interopRequireWildcard(require("solid-ui"));
-var $rdf = _interopRequireWildcard(require("rdflib"));
-var mime = _interopRequireWildcard(require("mime-types"));
-var _new = _interopRequireDefault(require("./new.js"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-/*   Human-readable editable "Dokieli" Pane
- **
- **  This outline pane contains the document contents for a Dokieli document
- ** The dokeili system allows the user to edit a document including anotations
- ** review.   It does not use turtle, but RDF/a
- */
-// const DOKIELI_TEMPLATE_URI = 'https://dokie.li/new' // Copy to make new dok
-// Distributed with this library
-var _default = exports.default = {
-  icon: UI.icons.iconBase + 'dokieli-logo.png',
-  // @@ improve? more like doccument?
-
-  name: 'Dokieli',
-  mintClass: UI.ns.solid('DokieliDocument'),
-  // @@ A better class?
-
-  // Don't provide viewing - let humanReadablePane handle that with appropriate icon
-  label: function (subject, context) {
-    return null; // Viewing now handled by humanReadablePane
-  },
-  // Create a new folder in a Solid system, with a dokieli editable document in it
-  mintNew: function (context, newPaneOptions) {
-    const kb = context.session.store;
-    let newInstance = newPaneOptions.newInstance;
-    if (!newInstance) {
-      let uri = newPaneOptions.newBase;
-      if (uri.endsWith('/')) {
-        uri = uri.slice(0, -1);
-        newPaneOptions.newBase = uri;
-      }
-      newInstance = kb.sym(uri);
-    }
-    const contentType = mime.lookup(newInstance.uri);
-    if (!contentType || !contentType.includes('html')) {
-      newInstance = $rdf.sym(newInstance.uri + '.html');
-    }
-    newPaneOptions.newInstance = newInstance; // Save for creation system
-
-    // console.log('New dokieli will make: ' + newInstance)
-
-    let htmlContents = _new.default;
-    let filename = newInstance.uri.split('/').slice(-1)[0];
-    filename = decodeURIComponent(filename.split('.')[0]);
-    const encodedTitle = filename.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
-    htmlContents = htmlContents.replace('<title>', '<title>' + encodedTitle);
-    htmlContents = htmlContents.replace('</article>', '<h1>' + encodedTitle + '</h1></article>');
-    // console.log('@@ New HTML for Dok:' + htmlContents)
-    return new Promise(function (resolve) {
-      kb.fetcher.webOperation('PUT', newInstance.uri, {
-        data: htmlContents,
-        contentType: 'text/html'
-      }).then(function () {
-        console.log('new Dokieli document created at ' + newPaneOptions.newInstance);
-        resolve(newPaneOptions);
-      }).catch(function (err) {
-        console.log('Error creating dokieli doc at ' + newPaneOptions.newInstance + ': ' + err);
-      });
-    });
-  }
-
-  // render: removed - now handled by humanReadablePane with appropriate dokieli icon
-}; // ends

package/dist/form/formPane.css

@@ -1,120 +0,0 @@
-.formPane a {
-  color: var(--color-text-link, #3b5998);
-  text-decoration: none;
-}
-
-.formPane a:link {
-  color: var(--color-text-link, #3b5998);
-  text-decoration: none;
-}
-
-.formPane a:visited {
-  color: var(--color-text-link-visited, #3b5998);
-  text-decoration: none;
-}
-
-.formPane a:hover {
-  color: var(--color-text-link-hover, #3b5998);
-  font-weight: bold;
-}
-
-.formPane a:active {
-  color: var(--color-text-link-active, #888);
-  text-decoration: none;
-}
-
-.formPane__message,
-.formPaneMessage {
-  color: #666;
-  margin: var(--spacing-xs, 0.5em) 0;
-  padding: var(--spacing-xs, 0.35em) var(--spacing-xs, 0.5em);
-}
-
-.formPane__message--info {
-  background-color: var(--color-main-block-bg, #eee);
-}
-
-.formPane__message--error {
-  background-color: var(--color-log-error-bg, #fee);
-}
-
-.formPane__editButton {
-  margin-left: auto;
-  align-self: center;
-  padding: var(--spacing-xs, 0.5rem);
-  border: .5rem solid white;
-  font-size: 100%;
-  float: none;
-}
-
-.formPane .formPane__mobileTextareaValue > div {
-  display: block;
-  min-width: 0;
-  position: relative;
-}
-
-.formPane .formPane__mobileTextareaValue > div > textarea {
-  box-sizing: border-box;
-  max-width: 100%;
-  min-width: 0;
-  width: 100%;
-}
-
-.formPane .formPane__mobileTextareaValue > div > button[type='button'] {
-  float: none !important;
-  position: absolute;
-  right: 0;
-  top: 0;
-}
-
-.formPane[data-layout='mobile'] .formPane__mobileTextareaRow {
-  flex-direction: column !important;
-  align-items: stretch;
-}
-
-.formPane[data-layout='mobile'] .formPane__mobileTextareaLabel {
-  width: auto !important;
-  padding-bottom: 0;
-}
-
-.formPane[data-layout='mobile'] .formPane__mobileTextareaValue {
-  box-sizing: border-box;
-  min-width: 0;
-  padding-right: var(--spacing-sm, 0.75rem);
-  width: 100%;
-}
-
-.formPane[data-layout='mobile'] .formPane__mobileTextareaValue textarea {
-  box-sizing: border-box;
-  margin-left: 0 !important;
-  margin-right: 0 !important;
-  max-width: 100%;
-  width: 100%;
-}
-
-@media (max-width: 960px) {
-  .formPane .formPane__mobileTextareaRow {
-    flex-direction: column !important;
-    align-items: stretch;
-  }
-
-  .formPane .formPane__mobileTextareaLabel {
-    width: auto !important;
-    padding-bottom: 0;
-  }
-
-  .formPane .formPane__mobileTextareaValue {
-    box-sizing: border-box;
-    min-width: 0;
-    padding-right: var(--spacing-sm, 0.75rem);
-    width: 100%;
-  }
-
-  .formPane .formPane__mobileTextareaValue textarea {
-    box-sizing: border-box;
-    margin-left: 0 !important;
-    margin-right: 0 !important;
-    max-width: 100%;
-    width: 100%;
-  }
-}