3d45e3cd113b — Norman Gray 11 months ago
Include references to FITS spec v4.0.

Thanks to Mark Taylor for notes on the relevant difference between
versions 3 an 4 (https://github.com/ivoa-std/VOUnits/issues/7).

Closes issue #6.
5 files changed, 36 insertions(+), 27 deletions(-)

M Notes
M README.md
M src/grammar/unity-units.ttl
M src/package-info.txt.in
M unity.html.in
M Notes +3 -2
@@ 8,8 8,9 @@ Relevant pseudo-standards docs:
         ftp://legacy.gsfc.nasa.gov/fits_info/fits_formats/docs/general/ogip_93_001/ogip_93_001.ps
     Standards for Astronomical Catalogues, Version 2.0, section 3.2, 2000
         http://cdsweb.u-strasbg.fr/doc/catstd-3.2.htx
-    FITS v3.0, section 4.3, W.D. Pence et al., A&A 524, A42, 2010
-        doi:10.1051/0004-6361/201015362
+    FITS, section 4.3; see v3.0 (W.D. Pence et al., A&A 524, A42, 2010
+        doi:10.1051/0004-6361/201015362) and v4.0
+        https://fits.gsfc.nasa.gov/fits_standard.html (all)
 
 Standards documents:
     BIPM SI brochure

          
M README.md +11 -8
@@ 145,17 145,18 @@ Notes
 
 The recognised syntaxes are:
 
-* **fits**
-    FITS v3.0, section 4.3, W.D. Pence et al., A&A 524, A42, 2010.
-    [doi:10.1051/0004-6361/201015362][fits]
+* **fits**:
+    FITS, 3.0 Sect.4.3 ([W.D. Pence et al., A&A 524, A42, 2010][fits]);
+    v4.0 Sect.4.3 ([FITS standards page][fitsspec]);
+    and further comments in the [FITS WCS IV paper][fitswcsiv].
 
-* **ogip**
-    [OGIP memo OGIP/93-001, 1993][ogip]
+* **ogip**:
+    [OGIP memo OGIP/93-001, 1993][ogip].
 
-* **cds**
-    [Standards for Astronomical Catalogues, Version 2.0, section 3.2, 2000][cds]
+* **cds**:
+    [Standards for Astronomical Catalogues, Version 2.0, section 3.2, 2000][cds].
 
-* **vounits**
+* **vounits**:
     The VOUnits syntax.  This is a subset of the FITS syntax,
     specified by the [VOUnits specification][vounits].
 

          
@@ 317,6 318,8 @@ repository checkout](README.developer).
 [vounits]:	http://www.ivoa.net/documents/VOUnits/
 [cds]:		http://cdsweb.u-strasbg.fr/doc/catstd-3.2.htx
 [fits]:		http://dx.doi.org/10.1051/0004-6361/201015362
+[fitsspec]:	https://fits.gsfc.nasa.gov/fits_standard.html
+[fitswcsiv]:	http://dx.doi.org/10.1051/0004-6361/201424653
 [ogip]: 	ftp://legacy.gsfc.nasa.gov/fits_info/fits_formats/docs/general/ogip_93_001/ogip_93_001.ps
 [dist]:	https://purl.org/nxg/dist/unity
 

          
M src/grammar/unity-units.ttl +13 -12
@@ 42,7 42,7 @@ unity-unit:Crab
 Mentioned in the OGIP standard, but strongly disrecommended.
 The OGIP standard permits only 'm' as a prefix.""";
     rdfs:label "Crab".
-    
+
 unity-unit:DetectorChannel
     a qudt:CountingUnit;
     qudt:quantityKind qudt-quantity:Dimensionless;

          
@@ 76,14 76,15 @@ unity-unit:JulianCentury
 unity-unit:BesselianYear
     qudt:quantityKind qudt-quantity:Time;
     a qudt:TimeUnit;
-    qudt:description """The Besselian year.
-See the discussion in FITS WCS paper IV, section 4.2,
-for important caveats concerning the use of the Besselian and Tropical years.
-""";
+    qudt:description """The Besselian Year.
+See the discussion in FITS WCS paper IV (section 4.2), and FITS v4.0 (section 9.3)
+for important caveats concerning the use of the Besselian and Tropical years.""";
     rdfs:label "Bessellian Year".
 
 qudt:YearTropical
-    qudt:description "See also the discussion in FITS WCS paper IV, section 4.2".
+    qudt:description """The Tropical Year.
+See the discussion in FITS WCS paper IV (section 4.2), and FITS v4.0 (section 9.3)
+for important caveats concerning the use of the Besselian and Tropical years.""".
 
 unity-unit:MilliArcSecond
     qudt:quantityKind qudt-quantity:PlaneAngle;

          
@@ 103,7 104,7 @@ unity-unit:Pixel                # it's r
     qudt:description "an element of a 2-D image";
     rdfs:label "pixel".
 
-unity-unit:Rayleigh  
+unity-unit:Rayleigh
     a qudt:RadiometryUnit;
     qudt:quantityKind unity-unit:PhotonFlux;
     qudt:description """Unit of photon flux density: Wikipedia has units of 10^10 photons/m2/column/s.

          
@@ 118,14 119,14 @@ unity-unit:Rydberg
     qudt:quantityKind qudt-quantity:EnergyAndWork;
     qudt:description "Half of the Hartree energy, defined as 13.605692 eV.  See http://en.wikipedia.org/wiki/Hartree";
     rdfs:label "Ry".
-    
+
 unity-unit:SolarLuminosity
     a qudt:PowerUnit;
     qudt:quantityKind qudt-quantity:Power;
     qudt:description "3.8268e26 W";
     unity:latexform "L\\solar";
     rdfs:label "solLum".
-    
+
 unity-unit:SolarMass
     a qudt:MassUnit;
     qudt:quantityKind qudt-quantity:Mass;

          
@@ 141,7 142,7 @@ unity-unit:SolarRadius
     qudt:description "6.9599e8 m";
     unity:latexform "R\\solar";
     rdfs:label "solRad".
-    
+
 unity-unit:StellarMagnitude
     a qudt:RadiantIntensityUnit, qudt:LogarithmicUnit, qudt:DimensionlessUnit;
     #qudt:quantityKind qudt-quantity:Dimensionless; # this seems vague....

          
@@ 176,7 177,7 @@ qudt-dimension:Dimension_SI_MT-2 # W m-2
 unity-dimension:Dimension_SI_L-2T-2  # XXX what namespace should this be in?
     a qudt:Dimension;
     rdfs:label "SI_L-2T-2";
-    qudt:dimensionVector 
+    qudt:dimensionVector
         qudt-dimension:Vector_T-2,
         qudt-dimension:Vector_J0,
         qudt-dimension:Vector_M0,

          
@@ 208,7 209,7 @@ unit:Decibel
 # Lacunae
 unit:Parsec   # 3.0857e16 m
     qudt:quantityKind qudt-quantity:Length.
-    
+
 qudt-quantity:InformationEntropy
     qudt:generalization qudt-quantity:Dimensionless.
 

          
M src/package-info.txt.in +6 -2
@@ 42,8 42,12 @@ are as follows
 </p>
 <dl>
 <dt>fits</dt>
-<dd>FITS v3.0, section 4.3, W.D. Pence et al., A&amp;A 524, A42, 2010
-        <a href='http://dx.doi.org/10.1051/0004-6361/201015362'>doi:10.1051/0004-6361/201015362</a></dd>
+<dd>See
+    FITS, 3.0 Sect.4.3
+    (<a href='http://dx.doi.org/10.1051/0004-6361/201015362'>W.D. Pence et al., A&A 524, A42, 2010</a>);
+    v4.0 Sect.4.3 (<a href='https://fits.gsfc.nasa.gov/fits_standard.html'>FITS standards page</a>));
+    and further comments in the
+    <a href='http://dx.doi.org/10.1051/0004-6361/201424653'>FITS WCS IV paper</a>.</dd>
 <dt>ogip</dt>
 <dd><a href='ftp://legacy.gsfc.nasa.gov/fits_info/fits_formats/docs/general/ogip_93_001/ogip_93_001.ps'
 >OGIP memo OGIP/93-001, 1993</a></dd>

          
M unity.html.in +3 -3
@@ 18,10 18,10 @@ specifications using a variety of syntax
 
 <p>The four syntaxes which the library (and VOUnits specification) refers to are:</p>
 <ul>
-<li>the FITS-3.0 specification, section 4.3
+<li>the FITS specifications, section 4.3 (see v3.0
 (<a href='http://dx.doi.org/10.1051/0004-6361/201015362'>doi:10.1051/0004-6361/201015362</a>;
-note that <a href='https://fits.gsfc.nasa.gov/fits_standard.html'>FITS-4.0</a>
-is now available);</li>
+and v4.0 at the
+<a href='https://fits.gsfc.nasa.gov/fits_standard.html'>FITS specification page</a>);</li>
 <li>OGIP memo OGIP/93-001 (<a href='ftp://legacy.gsfc.nasa.gov/fits_info/fits_formats/docs/general/ogip_93_001/ogip_93_001.ps'>postscript</a>); and</li>
 <li>CDS's <a href='http://cdsweb.u-strasbg.fr/doc/catstd-3.2.htx'><em>Standards for Astronomical Catalogues, Version 2.0</em></a>.</li>
 <li>The VOUnits syntax.