Changeset 3925


Ignore:
Timestamp:
10/31/13 17:28:26 (11 years ago)
Author:
mwindhouwer
Message:

M mod-ISOcat-site*

  • keep track of the revision info
  • added DCIF version 1.3.1

A mod-ISOcat-access-data/schemas/DCIF-1_3_1.rng
M mod-ISOcat-access-data/module.xml

  • added DCIF version 1.3.1, which fixes the pattern to check for real content in a XSD regexp . doesn't include \n and \r

M mod-ISOcat-interface-rest/representations/dcs2/clavas.xsl

  • added license info
Location:
cats/ISOcat/trunk
Files:
1 added
16 edited

Legend:

Unmodified
Added
Removed

  • cats/ISOcat/trunk/mod-ISOcat-access-data/module.xml

    r3543 r3925  
    641641        <rewrite>
    642642            <match>active:ISOcat.access.data.dcif.schema</match>
    643             <to>active:ISOcat.access.data.dcif.schema.1.3</to>
     643            <to>active:ISOcat.access.data.dcif.schema.1.3.1</to>
     644        </rewrite>
     645        <rewrite>
     646            <match>active:ISOcat.access.data.dcif.schema.1.3.1</match>
     647            <to>active:ISOcat.access.data.dcif.schema.1.3.1.strict</to>
     648        </rewrite>
     649        <rewrite>
     650            <match>active:ISOcat.access.data.dcif.schema.strict</match>
     651            <to>active:ISOcat.access.data.dcif.schema.1.3.1.strict</to>
     652        </rewrite>
     653        <rewrite>
     654            <match>active:ISOcat.access.data.dcif.schema.lax</match>
     655            <to>active:ISOcat.access.data.dcif.schema.1.3.1.lax</to>
     656        </rewrite>
     657        <rewrite>
     658            <match>active:ISOcat.access.data.dcif.schema.1.3.1.strict</match>
     659            <to>active:xslt2+operand@active:ISOcat.access.data.dcif.schema.1.3.1.render+operator@ffcpl:/schemas/xrng.xsl+mode@data:text/xml,%3Cstring%3Estrict%3C%2Fstring%3E</to>
     660        </rewrite>
     661        <rewrite>
     662            <match>active:ISOcat.access.data.dcif.schema.1.3.1.lax</match>
     663            <to>active:xslt2+operand@active:ISOcat.access.data.dcif.schema.1.3.1.render+operator@ffcpl:/schemas/xrng.xsl+mode@data:text/xml,%3Cstring%3Elax%3C%2Fstring%3E</to>
     664        </rewrite>
     665        <rewrite>
     666            <match>active:ISOcat.access.data.dcif.schema.1.3.1.render</match>
     667            <to>active:sloot.render+template@ffcpl:/schemas/DCIF-1_3_1.rng+attributes@active:ISOcat.access.system.properties</to>
    644668        </rewrite>
    645669        <rewrite>

  • cats/ISOcat/trunk/mod-ISOcat-interface-rest/representations/dcs2/clavas.xsl

    r2510 r3925  
    11<?xml version="1.0" encoding="UTF-8"?>
     2<!--
     3  Copyright 2013 The Language Archive, Max Planck Institute for Psycholinguistics (MPIP)
     4
     5  This code is part of ISOcat (www.isocat.org).
     6 
     7  ISOcat is free software: you can redistribute it and/or modify
     8  it under the terms of the GNU General Public License version 3 as
     9  published by the Free Software Foundation.
     10
     11  ISOcat is distributed in the hope that it will be useful,
     12  but WITHOUT ANY WARRANTY; without even the implied warranty of
     13  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     14  GNU General Public License for more details.
     15
     16  You should have received a copy of the GNU General Public License
     17  along with ISOcat. If not, see <http://www.gnu.org/licenses/>.
     18-->
    219<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0" xmlns:dcif="http://www.isocat.org/ns/dcif" xmlns:dcr="http://www.isocat.org/ns/dcr.rdf#" xmlns:isocat="http://www.isocat.org/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" xmlns:skos="http://www.w3.org/2004/02/skos/core#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" exclude-result-prefixes="dcif isocat">
    320    <xsl:output method="xml" encoding="utf-8" indent="yes"/>

  • cats/ISOcat/trunk/mod-ISOcat-site/module.xml

    r3697 r3925  
    119119        <rule>
    120120            <match>ffcpl:/12620/schemas/DCIF.rng((\+.*)?)</match>
    121             <to>ffcpl:/12620/schemas/DCIF-1_3.rng</to>
     121            <to>ffcpl:/12620/schemas/DCIF-1_3_1.rng</to>
    122122        </rule>
    123123        <rule>
    124124            <match>ffcpl:/12620/schemas/DCIF.rnc((\+.*)?)</match>
    125             <to>ffcpl:/12620/schemas/DCIF-1_3.rnc</to>
     125            <to>ffcpl:/12620/schemas/DCIF-1_3_1.rnc</to>
    126126        </rule>
    127127        <rule>
    128128            <match>ffcpl:/12620/schemas/DCIF.html((\+.*)?)</match>
    129             <to>ffcpl:/12620/schemas/DCIF-1_3.html</to>
     129            <to>ffcpl:/12620/schemas/DCIF-1_3_1.html</to>
    130130        </rule>
    131131        <rule>
    132132            <match>ffcpl:/12620/schemas/DCIF-lax.rng((\+.*)?)</match>
    133             <to>ffcpl:/12620/schemas/DCIF-1_3-lax.rng</to>
     133            <to>ffcpl:/12620/schemas/DCIF-1_3_1-lax.rng</to>
    134134        </rule>
    135135        <rule>
    136136            <match>ffcpl:/12620/schemas/DCIF-lax.rnc((\+.*)?)</match>
    137             <to>ffcpl:/12620/schemas/DCIF-1_3-lax.rnc</to>
     137            <to>ffcpl:/12620/schemas/DCIF-1_3_1-lax.rnc</to>
    138138        </rule>
    139139        <rule>
    140140            <match>ffcpl:/12620/schemas/DCIF-lax.html((\+.*)?)</match>
    141             <to>ffcpl:/12620/schemas/DCIF-1_3-lax.html</to>
     141            <to>ffcpl:/12620/schemas/DCIF-1_3_1-lax.html</to>
     142        </rule>
     143        <rule>
     144            <match>ffcpl:/12620/schemas/DCIF-1_3_1.rng((\+.*)?)</match>
     145            <to>active:sloot.mime+mime@data:text/plain,text/xml+file@active:ISOcat.manage.dm.dcif.schema.1.3.1</to>
     146        </rule>
     147        <rule>
     148            <match>ffcpl:/12620/schemas/DCIF-1_3_1.rnc((\+.*)?)</match>
     149            <to>active:xslt2+operand@active:ISOcat.manage.dm.dcif.schema.1.3.1+operator@ffcpl:/utils/RngToRnc/RngToRncText.xsl</to>
     150        </rule>
     151        <rule>
     152            <match>ffcpl:/12620/schemas/DCIF-1_3_1.html((\+.*)?)</match>
     153            <to>active:xslt2+operand@active:ISOcat.manage.dm.dcif.schema.1.3.1+operator@ffcpl:/utils/RngToRnc/RngToRncHtml.xsl</to>
     154        </rule>
     155        <rule>
     156            <match>ffcpl:/12620/schemas/DCIF-1_3_1-lax.rng((\+.*)?)</match>
     157            <to>active:sloot.mime+mime@data:text/plain,text/xml+file@active:ISOcat.manage.dm.dcif.schema.1.3.1.lax</to>
     158        </rule>
     159        <rule>
     160            <match>ffcpl:/12620/schemas/DCIF-1_3_1-lax.rnc((\+.*)?)</match>
     161            <to>active:xslt2+operand@active:ISOcat.manage.dm.dcif.schema.1.3.1.lax+operator@ffcpl:/utils/RngToRnc/RngToRncText.xsl</to>
     162        </rule>
     163        <rule>
     164            <match>ffcpl:/12620/schemas/DCIF-1_3_1-lax.html((\+.*)?)</match>
     165            <to>active:xslt2+operand@active:ISOcat.manage.dm.dcif.schema.1.3.1.lax+operator@ffcpl:/utils/RngToRnc/RngToRncHtml.xsl</to>
    142166        </rule>
    143167        <rule>

  • cats/ISOcat/trunk/mod-ISOcat-site/site/index.html

    r3678 r3925  
    9393background="index_files/image552.png" style='margin:0'>
    9494<!--[if gte vml 1]><v:background id="_x0000_s3073" o:bwmode="white"
    95  fillcolor="#dbe1e5" o:targetscreensize="1680,905">
     95 fillcolor="#dbe1e5" o:targetscreensize="1680,907">
    9696 <v:fill focus="100%" type="gradient"/>
    9797</v:background><![endif]-->

  • cats/ISOcat/trunk/mod-ISOcat-site/site/index_files/12620.html

    r3678 r3925  
    6262style='margin:0'>
    6363<!--[if gte vml 1]><v:background id="_x0000_s3073" o:bwmode="white"
    64  fillcolor="#e0e6e6" o:targetscreensize="1680,905">
     64 fillcolor="#e0e6e6" o:targetscreensize="1680,907">
    6565 <v:fill color2="white [7]" focus="100%" type="gradient"/>
    6666</v:background><![endif]-->
    … …  
    959959  italic;language:en-US'>DCIF revision history</span><span lang=en-US
    960960  style='font-family:Verdana;language:en-US'>:</span></p>
     961  <p class=MsoNormal><span lang=en-US style='font-family:Verdana;language:en-US'>[2013-10-31] Version 1.3.1 </span><span
     962  lang=en-US style='font-size:8.0pt;font-family:Verdana;language:en-US'>(</span><a
     963  href="$site$12620/schemas/DCIF-1_3_1.html"><span lang=en-US style='font-size:
     964  8.0pt;font-family:Verdana;text-decoration:underline;language:en-US'>HTML</span></a><span
     965  lang=en-US style='font-size:8.0pt;font-family:Verdana;language:en-US'>, </span><a
     966  href="$site$12620/schemas/DCIF-1_3_1.rnc"><span lang=en-US style='font-size:
     967  8.0pt;font-family:Verdana;text-decoration:underline;language:en-US'>RNC</span></a><span
     968  lang=en-US style='font-size:8.0pt;font-family:Verdana;language:en-US'>, </span><a
     969  href="$site$12620/schemas/DCIF-1_3_1.rng"><span lang=en-US style='font-size:
     970  8.0pt;font-family:Verdana;text-decoration:underline;language:en-US'>RNG</span></a><span
     971  lang=en-US style='font-size:8.0pt;font-family:Verdana;language:en-US'>)</span><span
     972  lang=en-US style='font-family:Verdana;language:en-US'>:</span></p>
     973  <p class=MsoNormal style='margin-left:18.0pt;text-indent:-18.0pt'><span
     974  style='direction:ltr;unicode-bidi:embed;font-family:Verdana;font-size:10.0pt;
     975  language:en-US;color:black'>1.</span><span style='width:9.0pt'>&nbsp;</span><span
     976  lang=en-US style='font-family:Verdana;language:en-US'>fixed the pattern to prevent empty strings, it should just require a first non-whitespace character</span></p>
    961977  <p class=MsoNormal><span lang=en-US style='font-family:Verdana;language:en-US'>[2013-9-9] Version 1.3 </span><span
    962978  lang=en-US style='font-size:8.0pt;font-family:Verdana;language:en-US'>(</span><a

  • cats/ISOcat/trunk/mod-ISOcat-site/site/index_files/TDGs.html

    r3678 r3925  
    6464<body link=blue vlink=purple bgcolor="#DAE1EB" style='margin:0'>
    6565
    66 <div style='position:absolute;width:7.-71in;height:31.-1793in'>
     66<div style='position:absolute;width:7.-71in;height:31.-1750in'>
    6767<!--[if gte vml 1]><v:rect id="_x0000_s1516" style='position:absolute;left:234pt;
    6868 top:231pt;width:336pt;height:336pt;z-index:70;mso-wrap-distance-left:2.88pt;
    … …  
    904904 <o:lock v:ext="edit" shapetype="t"/>
    905905</v:shapetype><v:shape id="_x0000_s1566" type="#_x0000_t201" style='position:absolute;
    906  left:175.5pt;top:175.5pt;width:525.48pt;height:2110.1pt;z-index:77;
     906 left:175.5pt;top:175.5pt;width:525.48pt;height:2110.41pt;z-index:77;
    907907 mso-wrap-distance-left:2.88pt;mso-wrap-distance-top:2.88pt;
    908908 mso-wrap-distance-right:2.88pt;mso-wrap-distance-bottom:2.88pt' stroked="f"
    … …  
    922922
    923923<table v:shapes="_x0000_s1566" cellpadding=0 cellspacing=0 width=701
    924  height=2813 border=0 dir=ltr style='width:525.48pt;height:2110.1pt;border-collapse:
    925  collapse;position:absolute;top:175.5pt;left:175.5pt;z-index:77'>
     924 height=2814 border=0 dir=ltr style='width:525.48pt;height:2110.41pt;
     925 border-collapse:collapse;position:absolute;top:175.5pt;left:175.5pt;
     926 z-index:77'>
    926927 <tr>
    927928  <td width=102 height=26 bgcolor=black style='width:76.5pt;height:19.5pt;
    … …  
    13871388 <tr>
    13881389  <td width=701 height=35 colspan=3 bgcolor="#E0E6E6" style='width:525.48pt;
    1389   height:26.0944pt;padding-left:1.5pt;padding-right:1.5pt;padding-top:1.5pt;
     1390  height:26.2479pt;padding-left:1.5pt;padding-right:1.5pt;padding-top:1.5pt;
    13901391  padding-bottom:1.5pt;background:#E0E6E6;border-left:solid black 6.0pt;
    13911392  border-top:solid black .25pt;border-right:solid black 2.0pt;border-bottom:
    … …  
    14201421 </tr>
    14211422 <tr>
    1422   <td width=701 height=65 colspan=3 bgcolor="#E0E6E6" style='width:525.48pt;
    1423   height:49.0924pt;padding-left:1.5pt;padding-right:1.5pt;padding-top:1.5pt;
     1423  <td width=701 height=66 colspan=3 bgcolor="#E0E6E6" style='width:525.48pt;
     1424  height:49.2459pt;padding-left:1.5pt;padding-right:1.5pt;padding-top:1.5pt;
    14241425  padding-bottom:1.5pt;background:#E0E6E6;border-left:solid black 6.0pt;
    14251426  border-top:solid black .25pt;border-right:solid black 2.0pt;border-bottom:
    … …  
    14541455 </tr>
    14551456 <tr>
    1456   <td width=701 height=254 colspan=3 bgcolor="#E0E6E6" style='width:525.48pt;
     1457  <td width=701 height=253 colspan=3 bgcolor="#E0E6E6" style='width:525.48pt;
    14571458  height:190.3437pt;padding-left:1.5pt;padding-right:1.5pt;padding-top:1.5pt;
    14581459  padding-bottom:1.5pt;background:#E0E6E6;border-left:solid black 6.0pt;
    … …  
    15361537 </tr>
    15371538 <tr>
    1538   <td width=701 height=191 colspan=3 bgcolor="#E0E6E6" style='width:525.48pt;
     1539  <td width=701 height=192 colspan=3 bgcolor="#E0E6E6" style='width:525.48pt;
    15391540  height:143.7392pt;padding-left:1.5pt;padding-right:1.5pt;padding-top:1.5pt;
    15401541  padding-bottom:1.5pt;background:#E0E6E6;border-left:solid black 6.0pt;

  • cats/ISOcat/trunk/mod-ISOcat-site/site/index_files/feedback.html

    r3678 r3925  
    6565style='margin:0'>
    6666<!--[if gte vml 1]><v:background id="_x0000_s3073" o:bwmode="white"
    67  fillcolor="#dbe1e5" o:targetscreensize="1680,905">
     67 fillcolor="#dbe1e5" o:targetscreensize="1680,907">
    6868 <v:fill focus="100%" type="gradient"/>
    6969</v:background><![endif]-->

  • cats/ISOcat/trunk/mod-ISOcat-site/site/index_files/issues.html

    r3678 r3925  
    6565style='margin:0'>
    6666<!--[if gte vml 1]><v:background id="_x0000_s3073" o:bwmode="white"
    67  fillcolor="#dbe1e5" o:targetscreensize="1680,905">
     67 fillcolor="#dbe1e5" o:targetscreensize="1680,907">
    6868 <v:fill focus="100%" type="gradient"/>
    6969</v:background><![endif]-->

  • cats/ISOcat/trunk/mod-ISOcat-site/site/index_files/manual.html

    r3678 r3925  
    6262style='margin:0'>
    6363<!--[if gte vml 1]><v:background id="_x0000_s3073" o:bwmode="white"
    64  fillcolor="#dbe1e5" o:targetscreensize="1680,905">
     64 fillcolor="#dbe1e5" o:targetscreensize="1680,907">
    6565 <v:fill focus="100%" type="gradient"/>
    6666</v:background><![endif]-->

  • cats/ISOcat/trunk/mod-ISOcat-site/site/index_files/news.html

    r3583 r3925  
    813813  class=shape>
    814814  <p class=MsoNormal><span lang=en-US style='font-family:Verdana;font-weight:
     815  bold;language:en-US'>2013-11-??</span></p>
     816  <p class=MsoNormal><span lang=en-US style='font-family:Verdana;language:en-US'>The 3??? revision provides the following functionality:</span></p>
     817  <p class=MsoNormal style='margin-left:54.0pt;text-indent:-18.0pt'><span
     818  style='direction:ltr;unicode-bidi:embed;font-family:"Times New Roman";
     819  font-size:10.0pt;language:x-none;color:black'>●</span><span style='width:
     820  12.75pt'>&nbsp;</span><a href="$site$12620/schemas/DCIF-1_3_1.html"><span
     821  lang=en-US style='font-family:Verdana;text-decoration:underline;language:
     822  en-US'>version 1.3.1 of the DCIF schema</span></a><span lang=en-US
     823  style='font-family:Verdana;language:en-US'> fixes the pattern to prevent empty strings, i.e., it now just requires a non-whitespace first character</span></p>
     824  <p class=MsoNormal><span lang=en-US style='font-family:Verdana;font-weight:
     825  bold;language:en-US'>&nbsp;</span></p>
     826  <p class=MsoNormal><span lang=en-US style='font-family:Verdana;font-weight:
    815827  bold;language:en-US'>2013-9-16</span></p>
    816828  <p class=MsoNormal><span lang=en-US style='font-family:Verdana;language:en-US'>The 3583 revision provides the following functionality:</span></p>
Note: See TracChangeset for help on using the changeset viewer.