Changeset 233 for 1dwg


Ignore:
Timestamp:
Aug 11, 2012 6:30:57 PM (7 years ago)
Author:
prjemian
Message:

refs #22, start to revise the documentation and examples

Location:
1dwg/trunk
Files:
1 added
33 edited
3 moved

Legend:

Unmodified
Added
Removed
  • 1dwg/trunk/1998spheres.xml

    r65 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4                 xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4        xmlns="cansas1d/1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <!--  
  • 1dwg/trunk/W1W2.XML

    r65 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4                 xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4                xmlns="cansas1d/1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry name="W1"> 
  • 1dwg/trunk/bimodal-test1.xml

    r65 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4                 xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4        xmlns="cansas1d/1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/cansas1d-template.xml

    r65 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4     xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4        xmlns="cansas1d/1.1" 
    55    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6     xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6    xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77    > 
    88        <!-- 
  • 1dwg/trunk/cansas1d.xml

    r65 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4     xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4        xmlns="cansas1d/1.1" 
    55    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6     xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6    xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77    > 
    88        <SASentry> 
  • 1dwg/trunk/cansas1d.xsd

    r231 r233  
    258258                        <element name="SASentry" minOccurs="1" maxOccurs="unbounded" type="tns:SASentryType" /> 
    259259                </sequence> 
    260                 <attribute name="version" type="string" fixed="1.0" use="required" /> 
     260                <attribute name="version" type="string" fixed="1.1" use="required" /> 
    261261        </complexType> 
    262262 
  • 1dwg/trunk/cs_af1410.xml

    r65 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4  xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4  xmlns="cansas1d/1.1" 
    55 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6  xsi:schemaLocation="cansas1d/1.0   http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
     6 xsi:schemaLocation="cansas1d/1.1   http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
    77  <SASentry name="AF1410:10"> 
    88    <Title>AF1410-10 (AF1410 steel aged 10 h)</Title> 
  • 1dwg/trunk/cs_collagen.xml

    r65 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4                 xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4        xmlns="cansas1d/1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/cs_collagen_full.xml

    r65 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4                 xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4        xmlns="cansas1d/1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
     
    1111                <SASdata> 
    1212                        <!--   
    13                         -   converted to canSAS1D/1.0 XML within Excel spreadsheet using user macro commands such as 
     13                        -   converted to cansas1d/1.1 XML within Excel spreadsheet using user macro commands such as 
    1414                        -    =IDATA_tag(A5,$A$4,0.00055,$A$4,B5,$B$4,C5,$C$4) 
    1515                        -   where 
  • 1dwg/trunk/doc/src/binding_IgorPro.xml

    r168 r233  
    6565            <glossterm>purpose</glossterm> 
    6666            <glossdef><para>Implement an IgorPro file reader to read the canSAS 1-D reduced SAS 
    67                 data in XML files that adhere to the cansas1d/1.0 standard.</para></glossdef> 
     67                data in XML files that adhere to the cansas1d/1.1 standard.</para></glossdef> 
    6868        </glossentry> 
    6969        <glossentry> 
     
    219219            attempts 
    220220            to open the fileand read its contents as if it conformed to the canSAS XML standard 
    221             for reduced 1-D SAS data (cansas1d/1.0, also known as SASXML). If the file is found to be 
     221            for reduced 1-D SAS data (cansas1d/1.1, also known as SASXML). If the file is found to be 
    222222            non-conforming, then <literal>CS_XmlReader(fileName)</literal> returns 
    223223            with an error code (show below), otherwise it returns <literal>0</literal> 
     
    295295                                <entry>1</entry> 
    296296                                <entry>namespace</entry> 
    297                                 <entry>cansas1d/1.0</entry> 
     297                                <entry>cansas1d/1.1</entry> 
    298298                            </row> 
    299299                            <row> 
     
    372372                    (<emphasis>a.k.a.</emphasis> a shortcut), it is likely that your file may be 
    373373                refused by this and other readers. Pay particular attention to UPPER/lower case in 
    374                 the text <emphasis role="bold">cansas1d/1.0</emphasis> as this is a <emphasis 
     374                the text <emphasis role="bold">cansas1d/1.1</emphasis> as this is a <emphasis 
    375375                    role="bold">key component</emphasis> used toindex through the XML file. </para> 
    376376        </section> 
     
    712712root element is not SASroot with valid canSAS namespace 
    713713    Completed in 0.0134224 seconds 
    714 bimodal-test1.xml                identified as: cansas1d/1.0 XML file 
     714bimodal-test1.xml                identified as: cansas1d/1.1 XML file 
    715715    Title: SAS bimodal test1  
    716716    Completed in 0.068654 seconds 
     
    721721root element is not SASroot with valid canSAS namespace 
    722722    Completed in 0.00930118 seconds 
    723 ISIS_SANS_Example.xml            identified as: cansas1d/1.0 XML file 
     723ISIS_SANS_Example.xml            identified as: cansas1d/1.1 XML file 
    724724    Title: standard can 12mm SANS  
    725725    Completed in 0.0410387 seconds 
    726 W1W2.xml                 identified as: cansas1d/1.0 XML file 
     726W1W2.xml                 identified as: cansas1d/1.1 XML file 
    727727    Title: standard can 12mm SANS  
    728728    Title: TK49 standard 12mm SANS  
    729729    Completed in 0.0669074 seconds 
    730 ill_sasxml_example.xml           identified as: cansas1d/1.0 XML file 
     730ill_sasxml_example.xml           identified as: cansas1d/1.1 XML file 
    731731    Title: ILL-D22 example: 7D1 2mm  
    732732    Completed in 0.0332752 seconds 
    733 isis_sasxml_example.xml                  identified as: cansas1d/1.0 XML file 
     733isis_sasxml_example.xml                  identified as: cansas1d/1.1 XML file 
    734734    Title: LOQ TK49 Standard 12mm C9  
    735735    Completed in 0.0388868 seconds 
    736 r586.xml                 identified as: cansas1d/1.0 XML file 
     736r586.xml                 identified as: cansas1d/1.1 XML file 
    737737    Title: ILL-D11 example1: 2A 5mM 0%D2O  
    738738    Completed in 0.0213737 seconds 
    739 r597.xml                 identified as: cansas1d/1.0 XML file 
     739r597.xml                 identified as: cansas1d/1.1 XML file 
    740740    Title: ILL-D11 example2: 2A 5mM 0%D2O  
    741741    Completed in 0.0221894 seconds 
    742 xg009036_001.xml                 identified as: cansas1d/1.0 XML file 
     742xg009036_001.xml                 identified as: cansas1d/1.1 XML file 
    743743    Title: det corrn 5m  
    744744    Completed in 0.0286721 seconds 
    745 cs_collagen.xml                  identified as: cansas1d/1.0 XML file 
     745cs_collagen.xml                  identified as: cansas1d/1.1 XML file 
    746746    Title: dry chick collagen, d = 673 A, 6531 eV, X6B  
    747747    Completed in 0.0296247 seconds 
    748 cs_collagen_full.xml             identified as: cansas1d/1.0 XML file 
     748cs_collagen_full.xml             identified as: cansas1d/1.1 XML file 
    749749    Title: dry chick collagen, d = 673 A, 6531 eV, X6B  
    750750    Completed in 0.0751836 seconds 
    751 cs_af1410.xml            identified as: cansas1d/1.0 XML file 
     751cs_af1410.xml            identified as: cansas1d/1.1 XML file 
    752752    Title: AF1410-10 (AF1410 steel aged 10 h)  
    753753    Title: AF1410-8h (AF1410 steel aged 8 h)  
     
    764764cansas1d-template.xml either not found or cannot be opened for reading 
    765765    Completed in 0.00892823 seconds 
    766 1998spheres.xml                  identified as: cansas1d/1.0 XML file 
     7661998spheres.xml                  identified as: cansas1d/1.1 XML file 
    767767    Title: 255 nm PS spheres  
    768768    Title: 460 nm PS spheres  
     
    771771does-not-exist-file.xml either not found or cannot be opened for reading 
    772772    Completed in 0.00404549 seconds 
    773 cs_rr_polymers.xml               identified as: cansas1d/1.0 XML file 
     773cs_rr_polymers.xml               identified as: cansas1d/1.1 XML file 
    774774    Title: Round Robin Polymer A  
    775775    Title: Round Robin Polymer B  
     
    777777    Title: Round Robin Polymer D  
    778778    Completed in 0.0943477 seconds 
    779 s81-polyurea.xml                 identified as: cansas1d/1.0 XML file 
     779s81-polyurea.xml                 identified as: cansas1d/1.1 XML file 
    780780    Title: S7 Neat Polyurea  
    781781    Completed in 0.0361616 seconds 
  • 1dwg/trunk/doc/src/binding_Java.xml

    r168 r233  
    1313<section xml:id="cansas1d_documentation-binding-Java" xmlns="http://docbook.org/ns/docbook" 
    1414    version="5.0" xmlns:xlink="http://www.w3.org/1999/xlink"> 
    15     <title>Java (JAXB) binding for the canSAS1d/1.0 standard</title> 
    16     <para> A Java binding for the canSAS1d/1.0 standard has been auto-created using the JAXB tools 
     15    <title>Java (JAXB) binding for the cansas1d/1.1 standard</title> 
     16    <para> A Java binding for the cansas1d/1.1 standard has been auto-created using the JAXB tools 
    1717        from Sun (see below for more on JAXB) <indexterm> 
    1818            <primary>binding</primary> 
     
    102102                xlink:href="http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse/src/main/java/org/scatteringsw/reader/Example_canSAS_Reader.java" 
    103103                    ><literal>http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/java/maven/eclipse/src/main/java/org/scatteringsw/reader/Example_canSAS_Reader.java</literal></link></para></footnote> 
    104             to show how to read a canSAS1d/1.0 XML file using the Java API. </para> 
     104            to show how to read a cansas1d/1.1 XML file using the Java API. </para> 
    105105        <para> In short, these are the important two lines: <informalexample> 
    106106                <programlisting>CanSas1dType reader = new CanSas1dType();</programlisting> 
     
    184184            </indexterm> 
    185185            <para>  
    186                 <literal>java-test.xml</literal> is an example canSAS1d/1.0 XML data file 
     186                <literal>java-test.xml</literal> is an example cansas1d/1.1 XML data file 
    187187                (derived from the standard test file for the <literal>lake</literal>  
    188188                desmearing code).</para> 
  • 1dwg/trunk/doc/src/binding_Python.xml

    r142 r233  
    1616    <para> 
    1717        Specific <link xlink:href="http://danse.us/trac/sans"><citetitle>support</citetitle></link>  
    18         for the cansas1d/1.0 data standard in Python  
     18        for the cansas1d/1.1 data standard in Python  
    1919        <indexterm significance="preferred"> 
    2020            <primary>binding</primary> 
     
    174174            can build a binding (map the structure of the XML file directly into a  
    175175            Python data structure) for Python from an XML Schema. 
    176             However, the cansas1d/1.0 XML schema (cansas1d.xsd) does not seem to  
     176            However, the cansas1d/1.1 XML schema (cansas1d.xsd) does not seem to  
    177177            fit the model.It seems, for now, that <literal>generateDS-1.12a</literal>  
    178178            fails on a certain <literal>annotate</literal> line. 
  • 1dwg/trunk/doc/src/brief-sketch-multiple.xml

    r136 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4       xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4      xmlns="cansas1d/1.1" 
    55      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6       xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6      xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77      > 
    88     <!--  
    99          Note:   
    10           This file is not a valid cansas1d/1.0 data file. 
     10          This file is not a valid cansas1d/1.1 data file. 
    1111          It is an example to show how to structure multiple data sets. 
    1212     --> 
  • 1dwg/trunk/doc/src/data-simple.xml

    r137 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="ascii3col.xsl" ?> 
    3 <SASroot version="1.0" 
    4                 xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4                xmlns="cansas1d/1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/doc/src/element_SASdata.xml

    r147 r233  
    324324                        <entry> container </entry> 
    325325                        <entry> [0..inf] </entry> 
    326                         <entry> Any element(s) not defined in the cansas1d/1.0 standard can be 
     326                        <entry> Any element(s) not defined in the cansas1d/1.1 standard can be 
    327327                            placed at this point.  
    328328                            See <link xlink:href="#cansas1d_documentation-element-any" 
  • 1dwg/trunk/doc/src/element_SASentry.xml

    r147 r233  
    128128                    </entry> 
    129129                    <entry> 
    130                         Any element(s) not defined in the cansas1d/1.0 standard can be placed at this point.  
     130                        Any element(s) not defined in the cansas1d/1.1 standard can be placed at this point.  
    131131                        See <link xlink:href="#cansas1d_documentation-element-any" 
    132132                            ><literal>{any}</literal></link>  
     
    177177                    </entry> 
    178178                    <entry> 
    179                         Any element(s) not defined in the cansas1d/1.0 standard can be placed at this point.  
     179                        Any element(s) not defined in the cansas1d/1.1 standard can be placed at this point.  
    180180                        See <link xlink:href="#cansas1d_documentation-element-any"><literal>{any}</literal></link>  
    181181                        for more details. 
  • 1dwg/trunk/doc/src/element_SASnote.xml

    r147 r233  
    7272                    </entry> 
    7373                    <entry> 
    74                         Any element(s) not defined in the cansas1d/1.0 standard can be placed at this point.  
     74                        Any element(s) not defined in the cansas1d/1.1 standard can be placed at this point.  
    7575                        See <link xlink:href="#cansas1d_documentation-element-any"><literal>{any}</literal></link> 
    7676                        for more details. 
  • 1dwg/trunk/doc/src/element_SASprocess.xml

    r147 r233  
    170170                    </entry> 
    171171                    <entry> 
    172                         Any element(s) not defined in the cansas1d/1.0 standard can be placed at this point.  
     172                        Any element(s) not defined in the cansas1d/1.1 standard can be placed at this point.  
    173173                        See <link xlink:href="#cansas1d_documentation-element-any" 
    174174                            ><literal>{any}</literal></link>  
     
    218218                        </entry> 
    219219                        <entry> 
    220                             Any element(s) not defined in the cansas1d/1.0 standard can be placed at this point.  
     220                            Any element(s) not defined in the cansas1d/1.1 standard can be placed at this point.  
    221221                            See <link xlink:href="#cansas1d_documentation-element-any" 
    222222                                ><literal>{any}</literal></link> for more details. 
  • 1dwg/trunk/doc/src/element_SASsample.xml

    r147 r233  
    157157                    <entry> container </entry> 
    158158                    <entry> [0..inf] </entry> 
    159                     <entry> Any element(s) not defined in the cansas1d/1.0 standard can be placed at 
     159                    <entry> Any element(s) not defined in the cansas1d/1.1 standard can be placed at 
    160160                        this point. See  
    161161                        <link xlink:href="#cansas1d_documentation-element-any"><literal>{any}</literal></link> 
  • 1dwg/trunk/doc/src/element_XML_header.xml

    r147 r233  
    1515    <title>Required XML Header</title> 
    1616    <example> 
    17         <title>Required header for cansas1d/1.0 XML files</title> 
     17        <title>Required header for cansas1d/1.1 XML files</title> 
    1818        <indexterm significance="preferred"> 
    1919            <primary>XML header</primary> 
    2020        </indexterm> 
    2121        <programlisting>&lt;?xml version="1.0"?> 
    22 &lt;SASroot version="1.0" 
    23    xmlns="cansas1d/1.0" 
     22&lt;SASroot version="1.1" 
     23   xmlns="cansas1d/1.1" 
    2424   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    25    xsi:schemaLocation="cansas1d/1.0  
     25   xsi:schemaLocation="cansas1d/1.1  
    2626   http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"></programlisting> 
    2727    </example> 
     
    8888                    <entry>[1..1]</entry> 
    8989                    <entry> 
    90                         <para>The canSAS reduced 1-D SAS data (cansas1d/1.0) will be in the 
     90                        <para>The canSAS reduced 1-D SAS data (cansas1d/1.1) will be in the 
    9191                                <literal>SASroot</literal> database.</para> 
    9292                        <para> 
     
    105105                                <para> 
    106106                                    <literal>version="1.0"</literal> is required to 
    107                                     identify the cansas1d/1.0 standard for SAS data.</para> 
     107                                    identify the cansas1d/1.1 standard for SAS data.</para> 
    108108                            </listitem> 
    109109                            <listitem> 
     
    123123                                <para> 
    124124                                    <literal>xsi:schemaLocation</literal> associates a 
    125                                     suggested URL (where the cansas1d/1.0 XML Schema might be found) 
     125                                    suggested URL (where the cansas1d/1.1 XML Schema might be found) 
    126126                                    with the default namespace string. </para> 
    127127                            </listitem> 
  • 1dwg/trunk/doc/src/element_any.xml

    r147 r233  
    4141                    <entry> [0..inf] </entry> 
    4242                    <entry> 
    43                         <para> Any element(s) not defined in the cansas1d/1.0 standard can be placed 
     43                        <para> Any element(s) not defined in the cansas1d/1.1 standard can be placed 
    4444                            at this point. (These are called <emphasis>foreign</emphasis> elements. 
    4545                            <indexterm> 
  • 1dwg/trunk/doc/src/elements.xml

    r147 r233  
    1414    <title>Elements of the canSAS XML standard</title> 
    1515    <para> 
    16         There are various elements (tag names) in the cansas1d/1.0 standard.  
     16        There are various elements (tag names) in the cansas1d/1.1 standard.  
    1717        Each of these is described below. 
    1818    </para> 
  • 1dwg/trunk/doc/src/example-collagen-predata.xml

    r140 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="example.xsl" ?> 
    3 <SASroot version="1.0" 
    4     xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4    xmlns="cansas1d/1.1" 
    55    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6     xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6    xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77    > 
    88    <SASentry> 
  • 1dwg/trunk/doc/src/examples.xml

    r147 r233  
    2020        <title>Example XML Data Files</title> 
    2121        <para> 
    22             This section presents two examples of XML Data Files adhering to the cansas1d/1.0 standard. 
     22            This section presents two examples of XML Data Files adhering to the cansas1d/1.1 standard. 
    2323            <indexterm> 
    2424                <primary>XML</primary> 
    25                 <secondary>cansas1d/1.0 data file</secondary> 
     25                <secondary>cansas1d/1.1 data file</secondary> 
    2626            </indexterm> 
    2727            Thie first file (<literal>data-simple.xml</literal>)  
     
    3838                    <secondary>data-simple.xml</secondary> 
    3939                </indexterm> 
    40                 shows just the basic elements of the cansas1d/1.0 standard.  Only a  
     40                shows just the basic elements of the cansas1d/1.1 standard.  Only a  
    4141                single data point has been shown to more clearly show the other structure. 
    4242                The data file is actually an excerpt from the 
     
    5454            <indexterm> 
    5555                <primary>XML</primary> 
    56                 <secondary>cansas1d/1.0 data file</secondary> 
     56                <secondary>cansas1d/1.1 data file</secondary> 
    5757            </indexterm> 
    5858            <example> 
     
    7474                </indexterm> 
    7575                shows examples 
    76                 of most of the elements of the cansas1d/1.0 standard.  Only a single data  
     76                of most of the elements of the cansas1d/1.1 standard.  Only a single data  
    7777                point has been shown to more clearly show the other structure. 
    7878                <footnote><para><link 
     
    8282            <indexterm> 
    8383                <primary>XML</primary> 
    84                 <secondary>cansas1d/1.0 data file</secondary> 
     84                <secondary>cansas1d/1.1 data file</secondary> 
    8585            </indexterm> 
    8686            <!-- too long for a DocBook "example" --> 
     
    102102                <primary>XML Stylesheet</primary> 
    103103            </indexterm> 
    104             useful for the cansas1d/1.0 standard.   
     104            useful for the cansas1d/1.1 standard.   
    105105            XML Stylesheets (XSLT)  
    106106            <indexterm> 
     
    127127                </indexterm> 
    128128                stylesheet displays  
    129                 all the <literal>Idata</literal> blocks in a cansas1d/1.0 file 
     129                all the <literal>Idata</literal> blocks in a cansas1d/1.1 file 
    130130                in 3-column ASCII form.  Be careful using this stylesheet 
    131131                on files with multiple <literal>SASdata</literal> or 
     
    158158                    <see>XML Stylesheet</see> 
    159159                </indexterm> 
    160                 is the standard XSL stylesheet for cansas1d/1.0 files. 
     160                is the standard XSL stylesheet for cansas1d/1.1 files. 
    161161                It shows all available <literal>SASdata</literal> 
    162162                and metadata, 
  • 1dwg/trunk/doc/src/glossary.xml

    r147 r233  
    2424        <indexterm><primary>glossary</primary></indexterm> 
    2525        defining the details about each specific field (XPath string,  
    26         XML elements and attributes) in the cansas1d/1.0 standard. 
    27         <indexterm><primary>cansas1d/1.0 standard</primary></indexterm>  
     26        XML elements and attributes) in the cansas1d/1.1 standard. 
     27        <indexterm><primary>cansas1d/1.1 standard</primary></indexterm>  
    2828    </para> 
    2929    <itemizedlist mark="opencircle"><listitem> 
     
    3232            <link xlink:href="http://www.w3schools.com/xpath/"><citetitle>XPath</citetitle></link>  
    3333            in the XML file. The <literal>cs:</literal> prefix is defined by a  
    34             <literal>xmlns:cs="cansas1d/1.0"</literal> namespace  
     34            <literal>xmlns:cs="cansas1d/1.1"</literal> namespace  
    3535            attribute listed in the XML header. 
    3636        </para> 
     
    108108    <glossary> 
    109109        <title>Listed by full XPath reference</title> 
    110         <subtitle>assumes namespace declaration: <literal>xmlns:cs="cansas1d/1.0"</literal></subtitle> 
     110        <subtitle>assumes namespace declaration: <literal>xmlns:cs="cansas1d/1.1"</literal></subtitle> 
    111111        <glosslist> 
    112112            <glossentry> 
  • 1dwg/trunk/doc/src/java-test.xml

    r168 r233  
    1010    ########### SVN repository information ################### 
    1111--> 
    12 <SASroot version="1.0" 
    13     xmlns="cansas1d/1.0" 
     12<SASroot version="1.1" 
     13    xmlns="cansas1d/1.1" 
    1414    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    1515    xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
  • 1dwg/trunk/doc/src/manual.xml

    r147 r233  
    3333        <!--<edition>$Id$</edition>--> 
    3434        <!--<edition>draft</edition>--> 
    35         <pubdate>2009</pubdate> 
     35        <pubdate>2012</pubdate> 
    3636        <legalnotice> 
    3737            <para> 
     
    4545                <authorinitials>PRJ</authorinitials> 
    4646                <revremark>converted from mediawiki to DocBook/5.0</revremark> 
     47            </revision> 
     48            <revision> 
     49                <revnumber>v1.1</revnumber> 
     50                <date>2012-09-01</date> 
     51                <authorinitials>PRJ</authorinitials> 
     52                <revremark>v1.1 release</revremark> 
    4753            </revision> 
    4854        </revhistory> 
  • 1dwg/trunk/doc/src/overview.xml

    r147 r233  
    4040            <indexterm significance="preferred"><primary>metadata</primary></indexterm> 
    4141            about the sample, measurement, instrument, processing, or analysis steps. </para> 
    42         <para>The cansas1d/1.0 
    43             <indexterm><primary>cansas1d/1.0 standard</primary></indexterm>  
     42        <para>The cansas1d/1.1 
     43            <indexterm><primary>cansas1d/1.1 standard</primary></indexterm>  
    4444            <indexterm><primary>canSAS</primary><secondary>objective</secondary></indexterm> 
    4545            standard meets the objectives for a 1D standard, incorporating 
     
    5858                </example> 
    5959            </para> 
     60            <para>Version 1.1 was tagged from the subversion repository on 2012-09-01 including  
     61                changes indicated on the TRAC site.  Tickets closed: 17, 18, 20, 21, 22. 
     62                 
     63                See  
     64                <link xlink:href="http://svn.smallangles.net/trac/canSAS/report/6?sort=ticket&amp;asc=1" 
     65                    ><literal>http://svn.smallangles.net/trac/canSAS/report/6?sort=ticket&amp;asc=1</literal></link> 
     66 
     67                <example> 
     68                    <title>Checkout tagged release from subversion repository.</title> 
     69                    <programlisting>svn checkout http://svn.smallangles.net/svn/canSAS/1dwg/tags/v1.1 cansas1dwg-1.1</programlisting> 
     70                </example> 
     71            </para> 
    6072        </section> 
    6173    </section> 
     
    7082        <section xml:id="cansas1d_documentation-XMLLayout-Overview"> 
    7183            <title>Overview</title> 
    72             <para>The basic elements of the cansas1d/1.0 standard are shown in the following table. 
     84            <para>The basic elements of the cansas1d/1.1 standard are shown in the following table. 
    7385                After an XML header, the root element of the file is  
    7486                <link xlink:href="#cansas1d_documentation-element-SASroot" 
     
    8698                    xlink:href="#xml-data-file" 
    8799                    >Example XML Data Files</link> 
    88                 for examples of cansas1d/1.0 XML data file.  
     100                for examples of cansas1d/1.1 XML data files.  
    89101                Examples, Case Studies, and other background information 
    90102                are below. More discussion can be found on the 
     
    114126                </para> 
    115127            <figure> 
    116                 <title>block diagram of minimum elements required for cansas1d/1.0 standard</title> 
     128                <title>block diagram of minimum elements required for cansas1d/1.1 standard</title> 
    117129                <mediaobject> 
    118130                    <imageobject> 
     
    137149            </itemizedlist> 
    138150            <example> 
    139                 <title>Required header for cansas1d/1.0 XML files</title> 
     151                <title>Required header for cansas1d/1.1 XML files</title> 
    140152                <indexterm significance="preferred"> 
    141153                    <primary>XML header</primary> 
    142154                </indexterm> 
    143155                <programlisting>&lt;?xml version="1.0"?> 
    144 &lt;SASroot version="1.0" 
    145    xmlns="cansas1d/1.0" 
     156&lt;SASroot version="1.1" 
     157   xmlns="cansas1d/1.1" 
    146158   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    147    xsi:schemaLocation="cansas1d/1.0  
     159   xsi:schemaLocation="cansas1d/1.1" 
    148160   http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"></programlisting> 
    149161            </example> 
     
    203215                                    <indexterm><primary>element</primary><secondary>&lt;any&gt;</secondary></indexterm> 
    204216                                </entry> 
    205                                 <entry>any <literal>cansas1d/1.0</literal> element can be used at this 
     217                                <entry>any <literal>cansas1d/1.1</literal> element can be used at this 
    206218                                    point</entry> 
    207219                            </row> 
     
    223235                            <row> 
    224236                                <entry> 
     237                                    <link xlink:href="#cansas1d_documentation-element-SASdata" 
     238                                        ><literal>&#160;&#160;SAStransmission_spectrum</literal></link> 
     239                                    <indexterm><primary>element</primary><secondary>SAStransmission_spectrum</secondary></indexterm> 
     240                                </entry> 
     241                                <entry>this is where any transmission spectra may be stored</entry> 
     242                            </row> 
     243                            <row> 
     244                                <entry> 
     245                                    <literal>&#160;&#160;&#160;TSdata</literal> 
     246                                    <indexterm><primary>element</primary><secondary>TSdata</secondary></indexterm> 
     247                                </entry> 
     248                                <entry>a single data point in the transmission spectrum</entry> 
     249                            </row> 
     250                            <row> 
     251                                <entry> 
    225252                                    <link xlink:href="#cansas1d_documentation-element-any" 
    226253                                        ><literal>&#160;&#160;{any}</literal></link> 
    227254                                    <indexterm><primary>element</primary><secondary>&lt;any&gt;</secondary></indexterm> 
    228255                                </entry> 
    229                                 <entry>any cansas1d/1.0 element can be used at this 
     256                                <entry>any cansas1d/1.1 element can be used at this 
    230257                                    point</entry> 
    231258                            </row> 
     
    296323        <orderedlist> 
    297324            <listitem> 
    298                 <para> cansas1d/1.0 XML data files will adhere to the standard if they can 
     325                <para>cansas1d/1.1 XML data files will adhere to the standard if they can 
    299326                    successfully 
    300327                    <link xlink:href="#cansas1d_documentation-schema_validation">validate</link> 
     
    551578            <indexterm><primary><literal>xmlWriter</literal></primary></indexterm> 
    552579            is a WWW form 
    553             to translate three-column ASCII text data into the cansas1d/1.0 XML 
     580            to translate three-column ASCII text data into the cansas1d/1.1 XML 
    554581            format. This form will help you in creating an XML file with all the required 
    555582            elements in the correct places. The form requests the SAS data of Q, I, and Idev 
     
    559586        <para>Press the <code>Submit</code> button and you will receive a nicely 
    560587            formatted WWW page with the SAS data. If you then choose <emphasis>View page source</emphasis> 
    561             (from one of your browser menus), you will see the raw XML of the cansas1d/1.0 XML format 
     588            (from one of your browser menus), you will see the raw XML of the cansas1d/1.1 XML format 
    562589            and you can copy/paste this into an XML file. </para> 
    563590        <para>The SAS data that you paste into the form box is likely to be copied directly from 
     
    633660        </section> 
    634661        <section xml:id="cansas1d_documentation-programming_suggestions"> 
    635             <title>Suggestions for support software that write cansas1d/1.0 XML data files</title> 
     662            <title>Suggestions for support software that write cansas1d/1.1 XML data files</title> 
    636663            <para> 
    637664                Some common best practices have been identified in the list below. 
    638                 <indexterm><primary>file</primary><secondary>Writing cansas1d/1.0 files</secondary></indexterm> 
     665                <indexterm><primary>file</primary><secondary>Writing cansas1d/1.1 files</secondary></indexterm> 
    639666                <indexterm><primary>best practices</primary></indexterm> 
    640667            </para> 
     
    836863                </indexterm> 
    837864                are permitted at select locations in the 
    838                 cansas1d/1.0 format. Please refer to the section  
     865                cansas1d/1.1 format. Please refer to the section  
    839866                <link xlink:href="#wiki-XML_Help"><emphasis>XML Help</emphasis></link> 
    840867                 for more help with XML foreign elements. </para> 
     
    865892        <section xml:id="cansas1d_documentation-Support_Tools"> 
    866893            <title>Support tools for Visualization &amp; Analysis software</title> 
    867             <para> Support for importing cansas1d/1.0 files exists for these  
     894            <para> Support for importing cansas1d/1.1 files exists for these  
    868895                languages and environments:  
    869896            </para> 
     
    941968                            ></link></para></footnote> 
    942969                        of how to import data from the 
    943                         cansas1d/1.0 format into Excel. 
     970                        cansas1d/1.1 format into Excel. 
    944971                        Also note that the 
    945972                            <link 
     
    969996                            <see>binding, PHP</see> 
    970997                        </indexterm> 
    971                         and writes a cansas1d/1.0 data file given three-column ASCII data as input. 
     998                        and writes a cansas1d/1.1 data file given three-column ASCII data as input. 
    972999                        (<link 
    9731000                            xlink:href="http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/php/xmlWriter/index.php" 
     
    10201047        </section> 
    10211048        <section xml:id="cansas1d_documentation-repositories"> 
    1022             <title>Software repositories (for cansas1d/1.0 standard)</title> 
     1049            <title>Software repositories (for cansas1d/1.1 standard)</title> 
    10231050            <itemizedlist> 
    10241051                <listitem> 
  • 1dwg/trunk/doc/src/preface.xml

    r147 r233  
    4545    </para> 
    4646    <para> 
    47         The canonical name for this format is <literal>cansas1d/1.0</literal>. 
     47        The canonical name for this format is <literal>cansas1d/1.1</literal>. 
    4848        This  work is the initiative of the canSAS 1D Data Formats Working Group,  
    4949        established at the canSAS-V workshop, NIST, Gaithersburg, Maryland,  
     
    8282            <link 
    8383                xlink:href="http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd" 
    84                 >cansas1d/1.0 SAS XML Schema</link><footnote><para><link 
     84                >cansas1d/1.1 SAS XML Schema</link><footnote><para><link 
    8585                xlink:href="http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd" 
    8686                ><literal>http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd</literal></link></para></footnote> 
  • 1dwg/trunk/doc/src/specification.xml

    r147 r233  
    1212<chapter xml:id="specification" xmlns="http://docbook.org/ns/docbook" version="5.0" 
    1313    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> 
    14     <title>cansas1d/1.0 Specification</title> 
     14    <title>cansas1d/1.1 Specification</title> 
    1515    <para> 
    1616        This is the definitive specification of  
    17         <literal>cansas1d/1.0</literal>, 
    18         <indexterm><primary>cansas1d/1.0 standard</primary></indexterm>  
     17        <literal>cansas1d/1.1</literal>, 
     18        <indexterm><primary>cansas1d/1.1 standard</primary></indexterm>  
    1919        the canSAS standard format for storing small-angle 
    2020        scattering data in XML files. 
     
    2323    </para> 
    2424    <para> 
    25         Note that the cansas1d/1.0 XML data files must adhere to the  
     25        Note that the cansas1d/1.1 XML data files must adhere to the  
    2626        XML rules which includes being well-formed 
    2727        <indexterm significance="preferred"><primary>XML</primary><secondary>well-formed</secondary></indexterm> 
     
    3636        </footnote> 
    3737        Files that can be validated  
    38         <indexterm><primary>cansas1d/1.0 standard</primary></indexterm> 
     38        <indexterm><primary>cansas1d/1.1 standard</primary></indexterm> 
    3939        <indexterm><primary>validation</primary></indexterm> 
    4040        against  
     
    4242            xlink:href="http://svn.smallangles.net/trac/canSAS/browser/1dwg/trunk/cansas1d.xsd" 
    4343            ><literal>cansas1d.xsd</literal> </link> 
    44         are deemed to be valid cansas1d/1.0 data files. 
     44        are deemed to be valid cansas1d/1.1 data files. 
    4545    </para> 
    4646    <para> 
  • 1dwg/trunk/doc/src/tutorial.xml

    r142 r233  
    1212<chapter xml:id="tutorial" xmlns="http://docbook.org/ns/docbook" version="5.0" 
    1313    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> 
    14     <title>cansas1d/1.0 Tutorial</title> 
     14    <title>cansas1d/1.1 Tutorial</title> 
    1515    <para> 
    1616        This is a tutorial for 
    17         <literal>cansas1d/1.0</literal>, 
    18         <indexterm><primary>cansas1d/1.0 standard</primary></indexterm>  
     17        <literal>cansas1d/1.1</literal>, 
     18        <indexterm><primary>cansas1d/1.1 standard</primary></indexterm>  
    1919        the canSAS standard format for storing small-angle 
    2020        scattering data in XML files. 
  • 1dwg/trunk/gc14-dls-i22.xml

    r83 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot version="1.0" 
    4                 xmlns="cansas1d/1.0" 
     3<SASroot version="1.1" 
     4        xmlns="cansas1d/1.1" 
    55                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    6                 xsi:schemaLocation="cansas1d/1.0 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
     6                xsi:schemaLocation="cansas1d/1.1 http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd" 
    77                > 
    88        <SASentry> 
  • 1dwg/trunk/s81-polyurea.xml

    r65 r233  
    11<?xml version="1.0"?> 
    22<?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
    3 <SASroot xmlns="cansas1d/1.0" version="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="cansas1d/1.0    http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
     3<SASroot xmlns="cansas1d/1.1" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="cansas1d/1.1    http://svn.smallangles.net/svn/canSAS/1dwg/trunk/cansas1d.xsd"> 
    44  <!--created by CS_XML_Indra.ipf--> 
    55  <!--exported from IgorPro::Indra--> 
Note: See TracChangeset for help on using the changeset viewer.