Changeset 284


Ignore:
Timestamp:
Mar 15, 2013 10:42:50 PM (6 years ago)
Author:
prjemian
Message:

simplify to just one XSLT, rename, and revise XML files accordingly, update the docs (and call the format "cansas1d:1.1" now)

Location:
1dwg/branches/v1.1
Files:
1 deleted
32 edited
1 moved

Legend:

Unmodified
Added
Removed
  • 1dwg/branches/v1.1/1998spheres.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44                xmlns="urn:cansas1d:1.1" 
  • 1dwg/branches/v1.1/CHANGES.txt

    r263 r284  
    2222        * restriction against using UNICODE is lifted 
    2323        * removed the Glossary 
     24         
     25        2013-03-15, identified that v1.1 is a branch, not yet ready for release 
     26         
     27        * cleanup XSLT and reduce to just one XSLT 
    2428 
    2529:v1.0: 
  • 1dwg/branches/v1.1/GLASSYC_C4G8G9_no_TL.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-extended-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<!-- NOTE: This file contains SAS data sets but no transmission spectra --> 
    44<!-- compare with: GLASSYC_C4G8G9_w_TL.xml --> 
  • 1dwg/branches/v1.1/GLASSYC_C4G8G9_w_TL.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-extended-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<!-- NOTE: This file contains SAS data sets and 0, 1, or 2 transmission spectra (T vs. L) --> 
    44<!-- compare with: GLASSYC_C4G8G9_no_TL.xml --> 
  • 1dwg/branches/v1.1/W1W2.XML

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44                xmlns="urn:cansas1d:1.1" 
  • 1dwg/branches/v1.1/bimodal-test1.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44                xmlns="urn:cansas1d:1.1" 
  • 1dwg/branches/v1.1/cansas1d-template.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44                xmlns="urn:cansas1d:1.1" 
  • 1dwg/branches/v1.1/cansas1d.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44  xmlns="urn:cansas1d:1.1" 
  • 1dwg/branches/v1.1/cansas1d.xsl

    r283 r284  
    1717 
    1818Usage: 
    19         xsltproc cansasxml-html.xsl datafile.xml > datafile.html 
     19        xsltproc cansas1d.xsl datafile.xml > datafile.html 
    2020        (or include it as indicated at the documentation site 
    2121        http://www.cansas.org/wgwiki/index.php/cansas1d_documentation) 
     
    3636                        <body> 
    3737                                <h1>SAS data in canSAS 1-D format</h1> 
    38                                 <small>generated using <TT>cansasxml-extended-html.xsl</TT> from canSAS</small> 
     38                                <small>generated using <TT>cansas1d.xsl</TT> from canSAS</small> 
    3939                                <BR /> 
    4040                                <table border="2"> 
  • 1dwg/branches/v1.1/cs_af1410.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44                xmlns="urn:cansas1d:1.1" 
  • 1dwg/branches/v1.1/cs_collagen.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44                xmlns="urn:cansas1d:1.1" 
  • 1dwg/branches/v1.1/cs_collagen_full.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44                xmlns="urn:cansas1d:1.1" 
  • 1dwg/branches/v1.1/doc/source/binding-igorpro.rst

    r271 r284  
    5050:purpose: 
    5151        Implement an IgorPro file reader to read the canSAS 1-D reduced SAS 
    52         data in XML files that adhere to the cansas1d/1.1 standard. 
     52        data in XML files that adhere to the cansas1d:1.1 standard. 
    5353 
    5454:URL: 
     
    175175Given an XML file, **CS_XmlReader(fileName)** attempts 
    176176to open the file and read its contents as if it conformed to the canSAS XML standard 
    177 for reduced 1-D SAS data (cansas1d/1.1, also known as SASXML). If the file is found to be 
     177for reduced 1-D SAS data (cansas1d:1.1, also known as SASXML). If the file is found to be 
    178178non-conforming, then *CS_XmlReader(fileName)* returns 
    179179with an error code (show below), otherwise it returns *0*, indicating *no error*. 
     
    222222        =======   ===============================================   ===================================================================== 
    223223        0         xmlFile                                           *cs_collagen_full.xml* 
    224         1         namespace                                         ``cansas1d/1.1`` 
     224        1         namespace                                         ``cansas1d:1.1`` 
    225225        2         *Title*                                           ``dry chick collagen, d = 673 A, 6531 eV, X6B`` 
    226226        3         *Run*                                             ``Sep 19 1994 01:41:02 am`` 
     
    252252        If you take a minimalist view (*a.k.a.* a shortcut), it is likely that your file may be 
    253253        refused by this and other readers. Pay particular attention to UPPER and lower case in 
    254         the text **cansas1d/1.1** as this is a **key component** used to index through the XML file. 
     254        the text **cansas1d:1.1** as this is a **key component** used to index through the XML file. 
    255255 
    256256**XML stylesheet processing-instruction is not generated** 
     
    304304        root element is not SASroot with valid canSAS namespace 
    305305            Completed in 0.0134224 seconds 
    306         bimodal-test1.xml                identified as: cansas1d/1.1 XML file 
     306        bimodal-test1.xml                identified as: cansas1d:1.1 XML file 
    307307            Title: SAS bimodal test1  
    308308            Completed in 0.068654 seconds 
     
    313313        root element is not SASroot with valid canSAS namespace 
    314314            Completed in 0.00930118 seconds 
    315         ISIS_SANS_Example.xml            identified as: cansas1d/1.1 XML file 
     315        ISIS_SANS_Example.xml            identified as: cansas1d:1.1 XML file 
    316316            Title: standard can 12mm SANS  
    317317            Completed in 0.0410387 seconds 
    318         W1W2.xml                 identified as: cansas1d/1.1 XML file 
     318        W1W2.xml                 identified as: cansas1d:1.1 XML file 
    319319            Title: standard can 12mm SANS  
    320320            Title: TK49 standard 12mm SANS  
    321321            Completed in 0.0669074 seconds 
    322         ill_sasxml_example.xml           identified as: cansas1d/1.1 XML file 
     322        ill_sasxml_example.xml           identified as: cansas1d:1.1 XML file 
    323323            Title: ILL-D22 example: 7D1 2mm  
    324324            Completed in 0.0332752 seconds 
    325         isis_sasxml_example.xml                  identified as: cansas1d/1.1 XML file 
     325        isis_sasxml_example.xml                  identified as: cansas1d:1.1 XML file 
    326326            Title: LOQ TK49 Standard 12mm C9  
    327327            Completed in 0.0388868 seconds 
    328         r586.xml                 identified as: cansas1d/1.1 XML file 
     328        r586.xml                 identified as: cansas1d:1.1 XML file 
    329329            Title: ILL-D11 example1: 2A 5mM 0%D2O  
    330330            Completed in 0.0213737 seconds 
    331         r597.xml                 identified as: cansas1d/1.1 XML file 
     331        r597.xml                 identified as: cansas1d:1.1 XML file 
    332332            Title: ILL-D11 example2: 2A 5mM 0%D2O  
    333333            Completed in 0.0221894 seconds 
    334         xg009036_001.xml                 identified as: cansas1d/1.1 XML file 
     334        xg009036_001.xml                 identified as: cansas1d:1.1 XML file 
    335335            Title: det corrn 5m  
    336336            Completed in 0.0286721 seconds 
    337         cs_collagen.xml                  identified as: cansas1d/1.1 XML file 
     337        cs_collagen.xml                  identified as: cansas1d:1.1 XML file 
    338338            Title: dry chick collagen, d = 673 A, 6531 eV, X6B  
    339339            Completed in 0.0296247 seconds 
    340         cs_collagen_full.xml             identified as: cansas1d/1.1 XML file 
     340        cs_collagen_full.xml             identified as: cansas1d:1.1 XML file 
    341341            Title: dry chick collagen, d = 673 A, 6531 eV, X6B  
    342342            Completed in 0.0751836 seconds 
    343         cs_af1410.xml            identified as: cansas1d/1.1 XML file 
     343        cs_af1410.xml            identified as: cansas1d:1.1 XML file 
    344344            Title: AF1410-10 (AF1410 steel aged 10 h)  
    345345            Title: AF1410-8h (AF1410 steel aged 8 h)  
     
    356356        cansas1d-template.xml either not found or cannot be opened for reading 
    357357            Completed in 0.00892823 seconds 
    358         1998spheres.xml                  identified as: cansas1d/1.1 XML file 
     358        1998spheres.xml                  identified as: cansas1d:1.1 XML file 
    359359            Title: 255 nm PS spheres  
    360360            Title: 460 nm PS spheres  
     
    363363        does-not-exist-file.xml either not found or cannot be opened for reading 
    364364            Completed in 0.00404549 seconds 
    365         cs_rr_polymers.xml               identified as: cansas1d/1.1 XML file 
     365        cs_rr_polymers.xml               identified as: cansas1d:1.1 XML file 
    366366            Title: Round Robin Polymer A  
    367367            Title: Round Robin Polymer B  
     
    369369            Title: Round Robin Polymer D  
    370370            Completed in 0.0943477 seconds 
    371         s81-polyurea.xml                 identified as: cansas1d/1.1 XML file 
     371        s81-polyurea.xml                 identified as: cansas1d:1.1 XML file 
    372372            Title: S7 Neat Polyurea  
    373373            Completed in 0.0361616 seconds 
  • 1dwg/branches/v1.1/doc/source/binding-java-jaxb.rst

    r271 r284  
    99================ 
    1010 
    11 A Java binding for the cansas1d/1.1 standard has been auto-created using the JAXB tools 
     11A Java binding for the cansas1d:1.1 standard has been auto-created using the JAXB tools 
    1212from Sun (see below for more on JAXB) using the *cansas1d.xsd* :index:`XML Schema`. 
    1313Resources (JAR files and documentation) for the Java binding may be found in 
     
    6161 
    6262An example (*Example_canSAS_Reader.java*) has been constructed 
    63 to show how to read a cansas1d/1.1 XML file using the Java API.  
     63to show how to read a cansas1d:1.1 XML file using the Java API.  
    6464 
    6565http://www.cansas.org/trac/browser/1dwg/trunk/java/maven/eclipse/src/main/java/org/scatteringsw/reader/Example_canSAS_Reader.java 
     
    159159------------------ 
    160160 
    161 *java-test.xml* is an example cansas1d/1.1 XML data file 
     161*java-test.xml* is an example cansas1d:1.1 XML data file 
    162162(derived from the standard test file for the *lake*  
    163163desmearing code). 
  • 1dwg/branches/v1.1/doc/source/binding-php.rst

    r250 r284  
    1111        Needs work. 
    1212 
    13 A demonstration of writing the cansas1d/1.1 XML data format can be 
     13A demonstration of writing the cansas1d:1.1 XML data format can be 
    1414found in the *XmlWriter* form.  See the :ref:`XmlWriter` section for more details. 
  • 1dwg/branches/v1.1/doc/source/binding-python.rst

    r263 r284  
    99================ 
    1010 
    11 Specific support for the cansas1d/1.1 data standard in Python (http://danse.us/trac/sans) 
     11Specific support for the cansas1d:1.1 data standard in Python (http://danse.us/trac/sans) 
    1212is being developed by NIST/NCNR (http://www.ncnr.nist.gov) 
    1313as part of their contribution to the  
    1414DANSE project (http://wiki.cacr.caltech.edu/danse). 
    1515 
    16 Here are some extremeley terse instructions (circa 2008) to get you started on a UNIX or Linux system: 
     16Here are some extremely terse instructions (circa 2008) to get you started on a UNIX or Linux system: 
    1717 
    1818.. code-block:: guess 
     
    180180can build a binding (map the structure of the XML file directly into a  
    181181Python data structure) for Python from an XML Schema. 
    182 However, the cansas1d/1.1 XML schema (cansas1d.xsd) does not seem to  
     182However, the cansas1d:1.1 XML schema (cansas1d.xsd) does not seem to  
    183183fit the model.It seems, for now, that *generateDS-1.12a*  
    184184fails on a certain *annotate* line. 
  • 1dwg/branches/v1.1/doc/source/element_SASdata.rst

    r261 r284  
    103103                                                [#optional]_  [#shadow]_  
    104104:ref:`{any}`           container   [0..inf]     Any element(s) not defined in the           *xmlns:{foreign-prefix}={foreign-namespace}* 
    105                                                 cansas1d/1.1 standard can be placed at  
     105                                                cansas1d:1.1 standard can be placed at  
    106106                                                this point. 
    107107====================== =========== ============ =========================================== ==================================== 
  • 1dwg/branches/v1.1/doc/source/element_SASentry.rst

    r257 r284  
    4444                                                *{short-Run-identifier}*.) 
    4545:ref:`{any}`           container   [0..inf]     Any element(s) not defined in the           *xmlns:{foreign-prefix}={foreign-namespace}* 
    46                                                 cansas1d/1.1 standard can be placed at  
     46                                                cansas1d:1.1 standard can be placed at  
    4747                                                this point. 
    4848:ref:`SASdata`         container   [1..inf]     Reduced 1-D SAS data for this *SASentry*.   *name={short-Run-identifier}* 
     
    5454                                                (Give them the same name.) 
    5555:ref:`{any}`           container   [0..inf]     Any element(s) not defined in the           *xmlns:{foreign-prefix}={foreign-namespace}* 
    56                                                 cansas1d/1.1 standard can be placed at  
     56                                                cansas1d:1.1 standard can be placed at  
    5757                                                this point. 
    5858:ref:`SASsample`       container   [1..1]       Description of the sample.                  *name={short-SASsample-identifier}* 
  • 1dwg/branches/v1.1/doc/source/element_SASnote.rst

    r255 r284  
    2323====================== =========== ============ =========================================== ==================================== 
    2424:ref:`{any}`           container   [0..inf]     Any element(s) not defined in the           *xmlns:{foreign-prefix}={foreign-namespace}* 
    25                                                 cansas1d/1.1 standard can be placed at  
     25                                                cansas1d:1.1 standard can be placed at  
    2626                                                this point. 
    2727====================== =========== ============ =========================================== ==================================== 
  • 1dwg/branches/v1.1/doc/source/element_SASprocess.rst

    r255 r284  
    3939                                                that is not already described. 
    4040:ref:`{any}`           container   [0..inf]     Any element(s) not defined in the           *xmlns:{foreign-prefix}={foreign-namespace}* 
    41                                                 cansas1d/1.1 standard can be placed at  
     41                                                cansas1d:1.1 standard can be placed at  
    4242                                                this point.  
    4343====================== =========== ============ =========================================== ==================================== 
     
    6060====================== =========== ============ =========================================== ==================================== 
    6161:ref:`{any}`           container   [0..inf]     Any element(s) not defined in the           *xmlns:{foreign-prefix}={foreign-namespace}* 
    62                                                 cansas1d/1.1 standard can be placed at  
     62                                                cansas1d:1.1 standard can be placed at  
    6363                                                this point. 
    6464====================== =========== ============ =========================================== ==================================== 
  • 1dwg/branches/v1.1/doc/source/element_SASsample.rst

    r255 r284  
    4141*details*              string      [0..inf]     Any additional sample details. 
    4242:ref:`{any}`           container   [0..inf]     Any element(s) not defined in the           *xmlns:{foreign-prefix}={foreign-namespace}* 
    43                                                 cansas1d/1.1 standard can be placed at  
     43                                                cansas1d:1.1 standard can be placed at  
    4444                                                this point.  
    4545====================== =========== ============ =========================================== ==================================== 
  • 1dwg/branches/v1.1/doc/source/element_SAStransmission_spectrum.rst

    r255 r284  
    6969                                                to have different units. 
    7070:ref:`{any}`           container   [0..inf]     Any element(s) not defined in the           *xmlns:{foreign-prefix}={foreign-namespace}* 
    71                                                 cansas1d/1.1 standard can be placed at  
     71                                                cansas1d:1.1 standard can be placed at  
    7272                                                this point.  
    7373====================== =========== ============ =========================================== ==================================== 
  • 1dwg/branches/v1.1/doc/source/element_XML_header.rst

    r273 r284  
    1313 
    1414.. 
    15         .. rubric:: Required header for cansas1d/1.1 XML files 
     15        .. rubric:: Required header for cansas1d:1.1 XML files 
    1616 
    1717.. code-block:: guess 
  • 1dwg/branches/v1.1/doc/source/element_any.rst

    r255 r284  
    2020====================== =========== ============ =========================================== ==================================== 
    2121*{any}*                container   [0..inf]     Any element(s) not defined in the           *xmlns:{foreign-prefix}={foreign-namespace}* 
    22                                                 cansas1d/1.1 standard can be placed at  
     22                                                cansas1d:1.1 standard can be placed at  
    2323                                                this point. 
    2424                                                (These are called **foreign** elements. 
  • 1dwg/branches/v1.1/doc/source/elements.rst

    r263 r284  
    77=================================================== 
    88 
    9 There are various elements (tag names) in the cansas1d/1.1 standard. 
     9There are various elements (tag names) in the cansas1d:1.1 standard. 
    1010Each of these is described below. 
    1111 
  • 1dwg/branches/v1.1/doc/source/examples.rst

    r271 r284  
    1111 
    1212.. index:: 
    13         single: XML; cansas1d/1.1 data file 
     13        single: XML; cansas1d:1.1 data file 
    1414 
    1515.. _example.xml.data.files: 
     
    1818================================== 
    1919 
    20 This section presents two examples of XML Data Files adhering to the cansas1d/1.1 standard. 
     20This section presents two examples of XML Data Files adhering to the cansas1d:1.1 standard. 
    2121 
    2222The first file (:ref:`data-simple.xml`)  
     
    3333 
    3434The example data file :download:`data-simple.xml <examples/data-simple.xml>` 
    35 shows just the basic elements of the cansas1d/1.1 standard.  Only a  
     35shows just the basic elements of the cansas1d:1.1 standard.  Only a  
    3636single data point has been shown to more clearly show the other structure. 
    3737The data file is actually an excerpt from the *bimodal-test1.xml* 
     
    6565(http://www.cansas.org/trac/browser/1dwg/trunk/cansas1d.xml) 
    6666shows examples 
    67 of most of the elements of the cansas1d/1.1 standard.  Only a single data  
     67of most of the elements of the cansas1d:1.1 standard.  Only a single data  
    6868point has been provided here to more clearly show the other structure 
    6969in the data file. 
    7070 
    71 .. index:: XML; cansas1d/1.1 data file 
     71.. index:: XML; cansas1d:1.1 data file 
    7272 
    7373.. literalinclude:: ../../cansas1d.xml 
     
    8989 
    9090This section presents examples of XML Stylesheets 
    91 useful for the cansas1d/1.1 standard.   
     91useful for the cansas1d:1.1 standard.   
    9292XML Stylesheets (XSLT)  
    9393are used to transform XML documents into  
     
    105105 
    106106The *ascii3col.xsl* stylesheet displays 
    107 all the *Idata* blocks in a cansas1d/1.1 file 
     107all the *Idata* blocks in a cansas1d:1.1 file 
    108108in 3-column ASCII form.  Be careful using this stylesheet 
    109109on files with multiple *SASdata* or 
     
    130130.. index:: XML Stylesheet; cansasxml-html.xsl 
    131131 
    132 The :download:`cansasxml-html.xsl <../../cansasxml-html.xsl>`   
     132The :download:`cansasxml-html.xsl <../../cansas1d.xsl>`   
    133133(at almost 600 lines, it is too large to print here) 
    134 is the standard XSL stylesheet for cansas1d/1.1 files. 
     134is the standard XSL stylesheet for cansas1d:1.1 files. 
    135135It shows all available :ref:`SASdata` and :index:`metadata`, 
    136136separated by the different :ref:`SASentry` blocks. 
  • 1dwg/branches/v1.1/doc/source/index.rst

    r272 r284  
    2929measurement, instrument, processing, or analysis steps. 
    3030 
    31 The cansas1d/1.1 standard meets the objectives for a 1D standard,  
     31The cansas1d:1.1 standard meets the objectives for a 1D standard,  
    3232incorporating metadata about the measurement, parameters and  
    3333results of processing or analysis steps. Even multiple measurements  
  • 1dwg/branches/v1.1/doc/source/overview.rst

    r271 r284  
    2929================ 
    3030 
    31 .. index:: ! cansas1d/1.1 standard 
     31.. index:: ! cansas1d:1.1 standard 
    3232.. index:: canSAS; objective 
    3333 
    34 The cansas1d/1.1 
     34The cansas1d:1.1 
    3535standard meets the objectives for a 1D standard, incorporating :index:`metadata` 
    3636about the measurement, parameters and results of processing or analysis steps. 
     
    5252.. index:: element; SASentry 
    5353 
    54 The basic elements of the cansas1d/1.1 standard are shown in the following table. 
     54The basic elements of the cansas1d:1.1 standard are shown in the following table. 
    5555After an XML header, the root element of the file is :ref:`SASroot` 
    5656which contains one or more :ref:`SASentry` 
     
    6060next figure.  
    6161See the section :ref:`elements` 
    62 for examples of cansas1d/1.1 XML data files.  
     62for examples of cansas1d:1.1 XML data files.  
    6363Examples, Case Studies, and other background information 
    6464are below. More discussion can be found on the 
     
    6969 
    7070        .. figure:: ../../graphics/10-minimum.png 
    71             :alt: cansas1d/1.1 standard block diagram, minimum elements 
     71            :alt: cansas1d:1.1 standard block diagram, minimum elements 
    7272             
    73             block diagram of minimum elements required for *cansas1d/1.1* standard 
     73            block diagram of minimum elements required for *cansas1d:1.1* standard 
    7474 
    7575:ref:`SASroot` 
     
    8383.. _XML.header: 
    8484 
    85 .. rubric:: Required header for cansas1d/1.1 XML files 
     85.. rubric:: Required header for cansas1d:1.1 XML files 
    8686 
    8787.. code-block:: xml 
     
    9090        <?xml version="1.0"?> 
    9191        <SASroot version="1.1" 
    92                 xmlns="cansas1d/1.1" 
     92                xmlns="cansas1d:1.1" 
    9393                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
    94                 xsi:schemaLocation="cansas1d/1.1 
     94                xsi:schemaLocation="cansas1d:1.1 
    9595                    http://www.cansas.org/svn/1dwg/trunk/cansas1d.xsd" 
    9696                > 
     
    154154        single: geometry; orientation (rotation) 
    155155 
    156 #. A cansas1d/1.1 XML data files will adhere to the standard if it can 
     156#. A cansas1d:1.1 XML data files will adhere to the standard if it can 
    157157        successfully :ref:`validate <validate>` against the established XML Schema. 
    158158          
     
    247247The canSAS/xmlWriter (http://www.cansas.org/formats/tools/xmlWriter/) 
    248248is a WWW form 
    249 to translate three-column ASCII text data into the cansas1d/1.1 XML 
     249to translate three-column ASCII text data into the cansas1d:1.1 XML 
    250250format. This form will help you in creating an XML file with all the required 
    251251elements in the correct places. The form requests the SAS data of *Q*, *I*, and *Idev* 
     
    255255Press the *Submit* button and you will receive a nicely 
    256256formatted WWW page with the SAS data. If you then choose *View page source* 
    257 (from one of your browser menus), you will see the raw XML of the cansas1d/1.1 XML format 
     257(from one of your browser menus), you will see the raw XML of the cansas1d:1.1 XML format 
    258258and you can copy/paste this into an XML file.  
    259259 
     
    322322 
    323323 
    324 Suggestions for support software that write cansas1d/1.1 XML data files 
     324Suggestions for support software that write cansas1d:1.1 XML data files 
    325325------------------------------------------------------------------------- 
    326326 
    327327.. index:: 
    328         single: file; Writing cansas1d/1.1 files 
     328        single: file; Writing cansas1d:1.1 files 
    329329        single: best practices 
    330330 
     
    401401.. index:: XML file; cansas1d-template.xml 
    402402 
    403 :Test all the cansas1d/1.1 rules: 
     403:Test all the cansas1d:1.1 rules: 
    404404        http://www.cansas.org/trac/browser/1dwg/trunk/cansas1d-template.xml 
    405405         
     
    455455*cansas1d.xsd* XML Schema, XML **foreign elements**  
    456456are permitted at select locations in the 
    457 cansas1d/1.1 format. Please refer to the :ref:`XML Help` section  
     457cansas1d:1.1 format. Please refer to the :ref:`XML Help` section  
    458458for more help with XML foreign elements. 
    459459 
     
    483483========================================================= 
    484484 
    485 Support for importing cansas1d/1.1 files exists for  
     485Support for importing cansas1d:1.1 files exists for  
    486486these languages and environments:  
    487487 
     
    515515        *cansasxml-html.xsl* (http://www.cansas.org/svn/1dwg/trunk/cansasxml-html.xsl). 
    516516        The ISIS **LOQ** instrument (http://www.isis.stfc.ac.uk/instruments/loq/loq2470.html) 
    517         has provided an excellent description of how to import data from the cansas1d/1.1 format into Excel. 
     517        has provided an excellent description of how to import data from the cansas1d:1.1 format into Excel. 
    518518        Also note that the old WWW site (http://www.isis.rl.ac.uk/archive/LargeScale/LOQ/loq.htm) 
    519519        may still be available.  
     
    528528         
    529529        The *canSAS/xmlWriter* (http://www.cansas.org/xmlWriter/) 
    530         is implemented in PHP (http://www.php.net) and writes a cansas1d/1.1 data  
     530        is implemented in PHP (http://www.php.net) and writes a cansas1d:1.1 data  
    531531        file given three-column ASCII data as input.  The code uses 
    532532        *DomDocument* (http://www.php.net/DomDocument) 
     
    557557 
    558558 
    559 Software repositories (for cansas1d/1.1 standard) 
     559Software repositories (for cansas1d:1.1 standard) 
    560560========================================================= 
    561561 
  • 1dwg/branches/v1.1/doc/source/preface.rst

    r271 r284  
    3131and neutron facilities. 
    3232 
    33 The canonical name for this format is *cansas1d/1.1*. 
     33The canonical name for this format is *cansas1d:1.1*. 
    3434This  work is the initiative of the canSAS 1D Data Formats Working Group,  
    3535established at the canSAS-V workshop, NIST, Gaithersburg, Maryland,  
     
    5858the XML files and to define the spelling of the terms to be used.  
    5959However, should the information in this document and the  
    60 cansas1d/1.1 SAS XML Schema differ,  
     60cansas1d:1.1 SAS XML Schema differ,  
    6161(http://www.cansas.org/trac/browser/1dwg/trunk/cansas1d.xsd)  
    6262the XML Schema will be deemed to have the most correct description of the standard. 
  • 1dwg/branches/v1.1/doc/source/specification.rst

    r271 r284  
    11.. $Id$ 
    22 
    3 .. index:: ! cansas1d/1.1 standard 
     3.. index:: ! cansas1d:1.1 standard 
    44 
    55.. _specification: 
     
    1515below. 
    1616 
    17 This is the definitive specification of *cansas1d/1.1*, 
     17This is the definitive specification of *cansas1d:1.1*, 
    1818the canSAS standard format for storing small-angle 
    1919scattering data in XML files. 
     
    2424 
    2525.. index:: 
    26         single: cansas1d/1.1 standard 
     26        single: cansas1d:1.1 standard 
    2727        single: validation 
    2828 
    29 Note that the cansas1d/1.1 XML data files must adhere to the  
     29Note that the cansas1d:1.1 XML data files must adhere to the  
    3030XML rules which includes being well-formed 
    3131(including the use of closing tags).  [#]_ 
    3232Files that can be validated  against :ref:`cansas1d.xsd` 
    3333(http://www.cansas.org/trac/browser/1dwg/trunk/cansas1d.xsd) 
    34 are deemed to be valid cansas1d/1.1 data files. 
     34are deemed to be valid cansas1d:1.1 data files. 
    3535 
    3636.. [#] For example, see http://www.w3schools.com/xmL/xml_syntax.asp 
  • 1dwg/branches/v1.1/doc/source/tutorial.rst

    r271 r284  
    77================ 
    88 
    9 .. index:: cansas1d/1.1 standard 
     9.. index:: cansas1d:1.1 standard 
    1010 
    11 This is a tutorial for *cansas1d/1.1*, 
     11This is a tutorial for *cansas1d:1.1*, 
    1212the canSAS standard format for storing small-angle 
    1313scattering data in XML files. 
  • 1dwg/branches/v1.1/gc14-dls-i22.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44                xmlns="urn:cansas1d:1.1" 
  • 1dwg/branches/v1.1/s81-polyurea.xml

    r273 r284  
    11<?xml version="1.0"?> 
    2 <?xml-stylesheet type="text/xsl" href="cansasxml-html.xsl" ?> 
     2<?xml-stylesheet type="text/xsl" href="cansas1d.xsl" ?> 
    33<SASroot version="1.1" 
    44                xmlns="urn:cansas1d:1.1" 
Note: See TracChangeset for help on using the changeset viewer.