# This is a combination of 7 commits.

# The first commit's message is:

# This is a combination of 4 commits.
# The first commit's message is:

# This is a combination of 60 commits.
# The first commit's message is:

# This is a combination of 17 commits.
# The first commit's message is:

Restructuring for new initiative

Moved everything into 'old' and added a new subdirectory for new
experiments.

More early iteration over names

More adjustments in names mostly

HTML page for Word import testing

Just touchups this time

Updates and misc improvements

Changed document element to 'catalog'

Improved and renamed mapping transformation

Adjustments to models, schema, Schematron

Managing gitignore

Same

Minor adjustments

First cut at 27K mapping into OSCAL

Renamed directories for consistency

Cleanup

Bit more cleanup

Adjustments to mapping

Same

Numerous enhancements, some reorg

Planning notes

Added starter FO XSLT

First cut at FO XSL

Minor improvements

Small adjustments

Many/much schema enhancements; proto XSD version

First cut at inline declarations with live validation

Implementing declarations; styling

Refinements and extensions; new assign, select, withdrawn elements

More support for parameters etc.

Now implementing parameters etc.

More touches

Misc improvements

Sundry adjustments

Many more small improvements

Much documentation

More touchups

Updates

Misc adjustments and notes

Significant rework following design session esp declarations

More improvements incl extending declarations to groups

More adjustments; now mapping SP800-53A also.

More polishing and maintenance

Much more including hierarchical number checking

Adjustments, extensions, corrections

Name changes in the model

More adjustments

Cleanup of obsolete artifacts

Minor alignment

Mostly CSS, also Schematron improvements

ISO27002 mapping document

Many enhancements; new COBIT 5 mappings

More on COBIT

Improvements to mapping docs

Adjustments to mappings incl HTML versions

Moved screenshot for documentation

More adjustments and docs

Mostly improvements to documentation

Refreshed 800-53 data with adjustments

More general improvements to models and mappings

Continuing refinements to validations in samples

Update README.md

Update README.md

Update README.md

Update README.md

Minor tweaks

Including initial cut at profiling (1st, rule-based control extraction) among other refinements and improvements

No longer extant

Added new control to COBIT5 example

Misc improvements including more COBIT5 support

File rename and further adjustments

Misc adjustment; SaxonJS demo files

Misc adjustments

Updated readme contents to reflect merge.

Fixed links.

Changed text to better reflect current state and to add more links.

Rearrangement and cleanup

Schematron and schema adjustment and refactoring

SP800-53 extraction improvement, enhancement, cleanup

Improvements and enhancements to ISO27002 extraction

OSCAL Documentation

COBIT5 example tweakage

Organizational notes

Adjustments

Removed old files directory.
Moved files from draft to root.

Updated README.md to reflect new pathing.

Updated readme to contain more documentation of the OSCAL layers.

Added documentation for the working directory.

Update README.md

Edited the text.

Update README.md

Edited the text.

Added Aug 10 tiger team slides with notes

Create a prose overview of OSCAL

Update OSCAL Overview.md

Update OSCAL Overview.md

Profile and catalog mapping: a trivial example

Replacing graphic with rescaled version

Update OSCAL Overview.md

Rescaled image

Update OSCAL Overview.md

Mods to oXygen project file

Removing 'demo' (till later)

# This is the commit message #2:

Moved proprietary file

# This is the commit message #3:

Refinements to ISO27002 mappings (new model)

# This is the commit message #4:

Refining SP800-53 conversion/mappings

# This is the commit message #5:

Updating lib support for new model

# This is the commit message #6:

Top-level org

# This is the commit message #7:

Draft readme docs

# This is the commit message #8:

Further adjustment to directory readme.md

# This is the commit message #9:

More adjustments to ISO 27002 and SP800-53 (new model etc.)

# This is the commit message #10:

More cleanup to main sample subdirectories + readme tweakage

# This is the commit message #11:

Mostly restructuring

# This is the commit message #12:

More adjustments to extraction, parameter support

# This is the commit message #13:

Includes more model refinements; draft implementation of parameter resolution

# This is the commit message #14:

Adjustments for revised models

# This is the commit message #15:

Adjustments to demos and conversion pipelines

# This is the commit message #16:

Experimenting with profiles

# This is the commit message #17:

Infrastructure adjustments

# This is the commit message #2:

Minor correction to schema docs merge
# This is the commit message #3:

Updating XSD w/ docs
# This is the commit message #4:

More element renaming/adjustment
# This is the commit message #5:

Now a stable schema again? With SP800-53 extraction adjustments
# This is the commit message #6:

Profile-related mods

# This is the commit message #7:

Org stuff

# This is the commit message #8:

Moved mappind docs; added readme
# This is the commit message #9:

schema documentation
# This is the commit message #10:

Schema production and documentation pipeline
# This is the commit message #11:

More reorg; tweaked schema; more docs
# This is the commit message #12:

Improvements to tag library
# This is the commit message #13:

Another attempt at internal links in md
# This is the commit message #14:

trying again
# This is the commit message #15:

Gonna get this eventually
# This is the commit message #16:

More updates and tuneups
# This is the commit message #17:

More updates to schema and docs
# This is the commit message #18:

Lighter adjustments
# This is the commit message #19:

Similarly subtle adjustments
# This is the commit message #20:

Adjustments supporting parameter assignments
# This is the commit message #21:

More docs
# This is the commit message #22:

Enhancements to demo
# This is the commit message #23:

Moving distractions out of the way
# This is the commit message #24:

Slight readme tweakage
# This is the commit message #25:

Tag library tweaks
# This is the commit message #26:

More tag library adjustments
# This is the commit message #27:

New readme for Schematrons
# This is the commit message #28:

Adjustments to readme
# This is the commit message #29:

Adjustments to mapping documents
# This is the commit message #30:

Adjustments to readme
# This is the commit message #31:

More adjustments to mapping documents
# This is the commit message #32:

Updated punchlist
# This is the commit message #33:

Updates to mapping docs
# This is the commit message #34:

# This is the commit message #35:

CSS for local editing of OSCAL OSCAL
# This is the commit message #36:

Slight adjustments
# This is the commit message #37:

Light editing
# This is the commit message #38:

Light editing
# This is the commit message #39:

Light edits
# This is the commit message #40:

Light edits
# This is the commit message #41:

Light edits
# This is the commit message #42:

Light edits
# This is the commit message #43:

More work on profiles
# This is the commit message #44:

Revised directory descriptions
# This is the commit message #45:

Added an explanation of the demo directories
# This is the commit message #46:

More on profiling
# This is the commit message #47:

Editorial tweaks to oscal-oscal.xml
# This is the commit message #48:

Editorial tweaks to oscal-oscal.xml
# This is the commit message #49:

Edits to schema documentation
# This is the commit message #50:

More enhancements to tag library and its presentation
# This is the commit message #51:

Internal links?
# This is the commit message #52:

Slight adjustments
# This is the commit message #53:

Further touchups to schema docs and their HTML rendering
# This is the commit message #54:

Support for 'pre'
# This is the commit message #55:

Rearranged and touched up profile experiments
# This is the commit message #56:

More touchups to tag library (linking)
# This is the commit message #57:

More adjustments to copy
# This is the commit message #58:

More adjustments
# This is the commit message #59:

Correcting display bug failing to render chars in CSS
# This is the commit message #60:

Added a PDF with the notes.

# This is the commit message #2:

Decided to risk it
# This is the commit message #3:

One more readme
# This is the commit message #4:

Added timestamping to extractors

# This is the commit message #2:

Light edits to oscal-oscal.xml
# This is the commit message #3:

More edits to oscal-oscal.xml with regenerated materials
# This is the commit message #4:

Refining markdown export
# This is the commit message #5:

More edits to docs and rendering
# This is the commit message #6:

This time smaller adjustments
# This is the commit message #7:

More improvements to docs and rendering

working/ISO-27002/Convert-ISO-epub-to-OSCAL.xsl

@@ -16,7 +16,34 @@
   <xsl:template match="/">
     <catalog>
       <title>ISO/IEC 27002</title>
-
+      <declarations>
+        <declare-prop context="control-category" class="number">
+          <required/>
+          <identifier/>
+          <regex>^\d\d?$</regex>
+        </declare-prop>
+        <declare-prop context="clause" class="number">
+          <required/>
+          <identifier/>
+          <value><inherit/><autonum>.1</autonum></value>
+        </declare-prop>
+        <declare-part context="clause" class="objective">
+          <required/>
+        </declare-part>
+        <declare-prop context="iso-27002" class="number">
+          <required/>
+          <identifier/>
+          <value>
+            <inherit/>
+            <autonum>.1</autonum>
+          </value>
+        </declare-prop>
+        <declare-part context="control" class="description">
+          <required/>
+        </declare-part>
+        <declare-part context="control" class="guidance"/>
+        <declare-part context="control" class="information"/>
+      </declarations>
       <!--<declarations>
         <property context="control-category" class="number">
           <required/>

working/ISO-27002/ISO-27002-extraction.xpl

@@ -47,6 +47,7 @@
   </p:xslt>
 
   <p:xslt name="final">
+    <p:with-param name="xslt-process" select="'ISO-27002 EXTRACTOR/OBFUSCATOR'"/>
     <p:input port="stylesheet">
       <p:document href="../lib/XSLT/OSCAL-finalize.xsl"/>
     </p:input>

working/SP800-53/SP800-53-OSCAL-refined.xml

@@ -1,11 +1,11 @@
 <?xml-model href="../lib/oscal-working.rnc" type="application/relax-ng-compact-syntax"?>
 <?xml-stylesheet type="text/css" href="../lib/CSS/oscal.css"     title="Basic" alternate="yes"?>
 <?xml-stylesheet type="text/css" href="../lib/CSS/oscal-ui.css"  title="Wiring" alternate="yes"?>
+<!-- XML touched by transformation 'SP800-53 OSCAL EXTRACTION' :2017-08-30T17:13:37.212-04:00 -->
 <?xml-stylesheet type="text/xsl" href="SP800-53-oscal-browser-display.xsl"?>
 <catalog xmlns="http://scap.nist.gov/schema/oscal">
    <title>NIST SP800-53</title>
-    <declarations href="SP800-53-declarations.xml"/>
-   <!-- Adjustments are needed to declarations given in SP800-53-declarations.xml -->
+   <declarations href="SP800-53-declarations.xml"/>
    <group class="family">
       <title>ACCESS CONTROL</title>
       <control class="SP800-53" id="ac.1">

working/SP800-53/SP800-53-extraction.xpl

@@ -53,9 +53,12 @@
   </p:xslt>
 
   <p:xslt name="final">
+    <p:with-param name="xslt-process" select="'SP800-53 OSCAL EXTRACTION'"/>
     <p:input port="stylesheet">
       <p:document href="../lib/XSLT/OSCAL-finalize.xsl"/>
     </p:input>
+    <!--<p:input port="parameters" kind="parameter"/>-->
+
   </p:xslt>
 
 

working/SP800-53/Tuneup-SP800-53-oscal.xsl

@@ -25,9 +25,9 @@
     <xsl:attribute name="class">name</xsl:attribute>
   </xsl:template>
 
-  <xsl:template match="declarations">
+  <!--<xsl:template match="declarations">
     <xsl:comment expand-text="true"> Adjustments are needed to declarations given in {@href} </xsl:comment>
-  </xsl:template>
+  </xsl:template>-->
 
   <xsl:template match="control | subcontrol">
     <xsl:copy>

working/doc/schema/oscal-docs-html.xsl

@@ -46,8 +46,8 @@ div div div h3 { font-size: 110% }
 .tag:after  { content: '\3E' }
 .code { font-family: monospace }
 
-#toc-panel { border: thin solid black; float: left; max-width: 25%; font-size: 80%; font-family: sans-serif;
-  padding: 1em; position: fixed; max-height: 90%; overflow: auto }
+#toc-panel { margin-top: 0em; border: thin solid black; float: left; max-width: 25%; font-size: 80%; font-family: sans-serif;
+padding: 1em; position: fixed; max-height: 80ex; overflow: auto }
 .toc { margin: 0em; padding: 0em; margin-left: 1em; border: none }
 .toc-line { margin: 0em; padding-left: 3em; text-indent: -3em }
 
@@ -60,8 +60,13 @@ a:visited { color: midnightblue }
         </style>
       </head>
       <body>
+        <xsl:for-each select="oscal:catalog/oscal:title">
+          <h1 class="main-title">
+            <xsl:apply-templates/>
+          </h1>
+        </xsl:for-each>
         <xsl:apply-templates mode="toc"/>
-         <xsl:apply-templates/>
+        <xsl:apply-templates/>
       </body>
     </html>
   </xsl:template>
@@ -111,27 +116,24 @@ a:visited { color: midnightblue }
     </div>
   </xsl:template>
 
-  <xsl:template match="oscal:catalog/oscal:title">
-    <h1 class="main-title">
-      <xsl:apply-templates/>
-    </h1>
-  </xsl:template>
+  <xsl:template match="oscal:catalog/oscal:title"/>
 
   <xsl:template match="oscal:title">
-    <h2 class="title">
-      <xsl:apply-templates/>
-    </h2>
+   <!-- <xsl:for-each select="..">
+      <xsl:call-template name="make-title"/>
+    </xsl:for-each>-->
   </xsl:template>
 
   <xsl:template match="oscal:declarations"/>
 
   <xsl:template match="oscal:title" mode="title">
-    <xsl:value-of select="."/>
+    <xsl:apply-templates/>
   </xsl:template>
 
   <xsl:template match="oscal:group | oscal:section | oscal:references">
     <section class="{local-name()}" id="{generate-id(.)}">
       <xsl:copy-of select="@class"/>
+      <xsl:call-template name="make-title"/>
       <xsl:apply-templates/>
     </section>
   </xsl:template>
@@ -149,7 +151,6 @@ a:visited { color: midnightblue }
       <xsl:call-template name="make-title">
         <xsl:with-param name="runins" select="oscal:prop[@class='tag'] | oscal:prop[@class='full_name']"/>
       </xsl:call-template>
-
       <xsl:apply-templates/>
     </div>
   </xsl:template>
@@ -159,13 +160,13 @@ a:visited { color: midnightblue }
 
   <xsl:template name="make-title">
     <xsl:param name="runins" select="/.."/>
-    <xsl:apply-templates select=".." mode="title">
+    <xsl:apply-templates select="." mode="title">
       <xsl:with-param name="runins" select="$runins"/>
     </xsl:apply-templates>
 
-    <xsl:for-each select="oscal:title">
+    <!--<xsl:for-each select="oscal:title">
       <xsl:apply-templates/>
-    </xsl:for-each>
+    </xsl:for-each>-->
     <!--<h3>
       <xsl:apply-templates select="$runins" mode="run-in"/>
       
@@ -213,10 +214,16 @@ a:visited { color: midnightblue }
     <xsl:element name="h{$how-deep}">
       <xsl:copy-of select="@class"/>
       <xsl:apply-templates mode="run-in" select="$runins"/>
-      <xsl:value-of select="@class"/>
+      <xsl:apply-templates select="oscal:title" mode="title"/>
+      <xsl:if test="not(oscal:title | $runins)"><xsl:value-of select="@class"/></xsl:if>
+      <xsl:if test="not(oscal:title | @class | $runins)"><xsl:value-of select="local-name()"/></xsl:if>
     </xsl:element>
   </xsl:template>
 
+  <xsl:template mode="title" match="oscal:control/oscal:title">
+    <xsl:apply-templates/>
+  </xsl:template>
+
   <xsl:template match="oscal:p">
     <p class="p">
       <xsl:apply-templates/>
@@ -252,7 +259,6 @@ a:visited { color: midnightblue }
 
   <xsl:template match="oscal:part">
     <div class="part {@class}">
-      <xsl:apply-templates select="." mode="title"/>
       <xsl:apply-templates/>
     </div>
   </xsl:template>

working/doc/schema/oscal-docs.sch

@@ -43,7 +43,8 @@
       <sch:let name="exception" value="not(../@class='element-description')"/>
       <sch:assert role="warning" test="matches(string(.),'\S')">No control description</sch:assert>
       <sch:assert test="empty(* except oscal:p[1]) or $exception">Description may contain only a single paragraph, with a sentence fragment (no periods)</sch:assert>
-      <sch:report test="matches(string(.),'\.') and not($exception)">Description contains a period</sch:report>
+      <sch:report test="matches(normalize-space(.),'\.$') and not($exception)">Description ends in a period</sch:report>
+      <sch:report test="matches(normalize-space(.),'\.\s*[A-Z]') and not($exception)">Description may be more than a descriptive sentence fragment</sch:report>
 
     </sch:rule>