From 43393096ac8db3ec09df346085d9bb221a6f1432 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 30 Aug 2012 00:53:07 -0500
Subject: [PATCH 01/25] Add ability to save & retrieve comments to DBD objects

---
 src/tools/DBD.pm            | 12 +++++++++++-
 src/tools/DBD/Base.pm       |  5 +++++
 src/tools/DBD/Menu.pm       | 10 ++++++++++
 src/tools/DBD/Output.pm     |  2 --
 src/tools/DBD/Parser.pm     | 15 ++++++++-------
 src/tools/DBD/Recfield.pm   | 11 +++++++++++
 src/tools/DBD/Recordtype.pm | 10 ++++++++++
 7 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/src/tools/DBD.pm b/src/tools/DBD.pm
index 20b149b85..2d7180dcb 100644
--- a/src/tools/DBD.pm
+++ b/src/tools/DBD.pm
@@ -21,7 +21,8 @@ sub new {
         'DBD::Menu'       => {},
         'DBD::Recordtype' => {},
         'DBD::Registrar'  => {},
-        'DBD::Variable'   => {}
+        'DBD::Variable'   => {},
+        'COMMENTS'        => []
     };
     bless $this, $class;
     return $this;
@@ -43,6 +44,15 @@ sub add {
     }
 }
 
+sub add_comment {
+    my ($this, $comment) = @_;
+    push @{$this->{COMMENTS}}, $comment;
+}
+
+sub comments {
+    return @{shift->{COMMENTS}};
+}
+
 sub breaktables {
     return shift->{'DBD::Breaktable'};
 }
diff --git a/src/tools/DBD/Base.pm b/src/tools/DBD/Base.pm
index 92b23a388..8c6b80cbb 100644
--- a/src/tools/DBD/Base.pm
+++ b/src/tools/DBD/Base.pm
@@ -128,6 +128,11 @@ sub what {
     return shift->{WHAT};
 }
 
+sub add_comment {
+    my ($this, $comment) = @_;
+    # Ignore
+}
+
 sub equals {
     my ($a, $b) = @_;
     return $a->{NAME} eq $b->{NAME}
diff --git a/src/tools/DBD/Menu.pm b/src/tools/DBD/Menu.pm
index a7ca26ab9..357f8792c 100644
--- a/src/tools/DBD/Menu.pm
+++ b/src/tools/DBD/Menu.pm
@@ -7,6 +7,7 @@ sub init {
     $this->SUPER::init($name, "menu");
     $this->{CHOICE_LIST} = [];
     $this->{CHOICE_INDEX} = {};
+    $this->{COMMENTS} = [];
     return $this;
 }
 
@@ -39,6 +40,15 @@ sub legal_choice {
     return exists $this->{CHOICE_INDEX}->{$value};
 }
 
+sub add_comment {
+    my ($this, $comment) = @_;
+    push @{$this->{COMMENTS}}, $comment;
+}
+
+sub comments {
+    return @{shift->{COMMENTS}};
+}
+
 sub equals {
     my ($a, $b) = @_;
     return $a->SUPER::equals($b)
diff --git a/src/tools/DBD/Output.pm b/src/tools/DBD/Output.pm
index b82ff98c9..99cb9e5ad 100644
--- a/src/tools/DBD/Output.pm
+++ b/src/tools/DBD/Output.pm
@@ -42,8 +42,6 @@ sub OutputRecordtypes {
     my ($out, $recordtypes) = @_;
     while (my ($name, $recordtype) = each %{$recordtypes}) {
         printf $out "recordtype(%s) {\n", $name;
-        print $out "    %$_\n"
-            foreach $recordtype->cdefs;
         foreach $field ($recordtype->fields) {
             printf $out "    field(%s, %s) {\n",
                 $field->name, $field->dbf_type;
diff --git a/src/tools/DBD/Parser.pm b/src/tools/DBD/Parser.pm
index 8cace9c17..af7afeaaf 100644
--- a/src/tools/DBD/Parser.pm
+++ b/src/tools/DBD/Parser.pm
@@ -19,10 +19,9 @@ use DBD::Variable;
 our $debug=0;
 
 sub ParseDBD {
-    my $dbd = shift;
-    $_ = shift;
+    (my $dbd, $_) = @_;
     while (1) {
-        parseCommon();
+        parseCommon($dbd);
         if (m/\G menu \s* \( \s* $RXstr \s* \) \s* \{/oxgc) {
             print "Menu: $1\n" if $debug;
             parse_menu($dbd, $1);
@@ -70,6 +69,7 @@ sub ParseDBD {
 }
 
 sub parseCommon {
+    my ($obj) = @_;
     while (1) {
         # Skip leading whitespace
         m/\G \s* /oxgc;
@@ -85,6 +85,7 @@ sub parseCommon {
             }
             else {
                 m/\G (.*) \n/oxgc;
+		$obj->add_comment($1);
                 print "Comment: $1\n" if $debug;
             }
         } else {
@@ -98,7 +99,7 @@ sub parse_menu {
     pushContext("menu($name)");
     my $menu = DBD::Menu->new($name);
     while(1) {
-        parseCommon();
+        parseCommon($menu);
         if (m/\G choice \s* \( \s* $RXstr \s* , \s* $RXstr \s* \)/oxgc) {
             print " Menu-Choice: $1, $2\n" if $debug;
             $menu->add_choice($1, $2);
@@ -120,7 +121,7 @@ sub parse_breaktable {
     pushContext("breaktable($name)");
     my $bt = DBD::Breaktable->new($name);
     while(1) {
-        parseCommon();
+        parseCommon($bt);
         if (m/\G point\s* \(\s* $RXstr \s* , \s* $RXstr \s* \)/oxgc) {
             print " Breaktable-Point: $1, $2\n" if $debug;
             $bt->add_point($1, $2);
@@ -146,7 +147,7 @@ sub parse_recordtype {
     pushContext("recordtype($name)");
     my $rtyp = DBD::Recordtype->new($name);
     while(1) {
-        parseCommon();
+        parseCommon($rtyp);
         if (m/\G field \s* \( \s* $RXstr \s* , \s* $RXstr \s* \) \s* \{/oxgc) {
             print " Recordtype-Field: $1, $2\n" if $debug;
             parse_field($rtyp, $1, $2);
@@ -172,7 +173,7 @@ sub parse_field {
     my $fld = DBD::Recfield->new($name, $field_type);
     pushContext("field($name, $field_type)");
     while(1) {
-        parseCommon();
+        parseCommon($fld);
         if (m/\G (\w+) \s* \( \s* $RXstr \s* \)/oxgc) {
             print "  Field-Attribute: $1, $2\n" if $debug;
             $fld->add_attribute($1, $2);
diff --git a/src/tools/DBD/Recfield.pm b/src/tools/DBD/Recfield.pm
index a370b2cc7..0feaded56 100644
--- a/src/tools/DBD/Recfield.pm
+++ b/src/tools/DBD/Recfield.pm
@@ -56,6 +56,7 @@ sub init {
         sort keys %field_types) unless exists $field_types{$type};
     $this->{DBF_TYPE} = $type;
     $this->{ATTR_INDEX} = {};
+    $this->{COMMENTS} = [];
     return $this;
 }
 
@@ -109,6 +110,16 @@ sub check_valid {
         if (defined($default) and !$this->legal_value($default));
 }
 
+sub add_comment {
+    my ($this, $comment) = @_;
+    push @{$this->{COMMENTS}}, $comment;
+}
+
+sub comments {
+    return @{shift->{COMMENTS}};
+}
+
+
 # The C structure member name is usually the field name converted to
 # lower-case.  However if that is a reserved word, use the original.
 sub C_name {
diff --git a/src/tools/DBD/Recordtype.pm b/src/tools/DBD/Recordtype.pm
index f730777a3..27b714124 100644
--- a/src/tools/DBD/Recordtype.pm
+++ b/src/tools/DBD/Recordtype.pm
@@ -12,6 +12,7 @@ sub init {
     $this->{DEVICE_LIST} = [];
     $this->{DEVICE_INDEX} = {};
     $this->{CDEFS} = [];
+    $this->{COMMENTS} = [];
     return $this;
 }
 
@@ -69,6 +70,15 @@ sub device {
     return $this->{DEVICE_INDEX}->{$choice};
 }
 
+sub add_comment {
+    my ($this, $comment) = @_;
+    push @{$this->{COMMENTS}}, $comment;
+}
+
+sub comments {
+    return @{shift->{COMMENTS}};
+}
+
 sub add_cdef {
     my ($this, $cdef) = @_;
     push @{$this->{CDEFS}}, $cdef;

From 874cebb63d452ff414c221c8d391c17d5468030b Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 30 Aug 2012 00:55:22 -0500
Subject: [PATCH 02/25] Change dbdToHtml.pl to parse POD from DBD comments

---
 src/tools/Makefile     |   3 +
 src/tools/dbdToHtml.pl | 290 +++++++++------------------
 src/tools/style.css    | 433 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 531 insertions(+), 195 deletions(-)
 create mode 100644 src/tools/style.css

diff --git a/src/tools/Makefile b/src/tools/Makefile
index 496b0e4d1..88707df47 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -51,5 +51,8 @@ PERL_SCRIPTS += dbdExpand.pl
 PERL_SCRIPTS += dbdToHtml.pl
 PERL_SCRIPTS += registerRecordDeviceDriver.pl
 
+HTMLS_DIR = std
+HTMLS = style.css
+
 include $(TOP)/configure/RULES
  
diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl
index 936cbf48c..f41e656a9 100644
--- a/src/tools/dbdToHtml.pl
+++ b/src/tools/dbdToHtml.pl
@@ -1,5 +1,4 @@
 #!/usr/bin/perl
-
 #*************************************************************************
 # Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
@@ -17,6 +16,7 @@ use DBD::Parser;
 use EPICS::Getopts;
 use EPICS::macLib;
 use EPICS::Readfile;
+use Pod::Simple::HTML;
 
 my $tool = 'dbdToHtml';
 getopts('DI@o:') or
@@ -31,6 +31,12 @@ $infile =~ m/\.dbd$/ or
 
 &ParseDBD($dbd, &Readfile($infile, 0, \@opt_I));
 
+if (!$opt_o) {
+    ($opt_o = $infile) =~ s/\.dbd$/.html/;
+    $opt_o =~ s/^.*\///;
+    $opt_o =~ s/dbCommonRecord/dbCommon/;
+}
+
 if ($opt_D) {   # Output dependencies only
     my %filecount;
     my @uniqfiles = grep { not $filecount{$_}++ } @inputfiles;
@@ -39,214 +45,108 @@ if ($opt_D) {   # Output dependencies only
     exit 0;
 }
 
-my $out;
-if ($opt_o) {
-    $out = $opt_o;
-} else {
-    ($out = $infile) =~ s/\.dbd$/.html/;
-    $out =~ s/^.*\///;
-    $out =~ s/dbCommonRecord/dbCommon/;
-}
-open $out, '>', $opt_o or die "Can't create $opt_o: $!\n";
+open my $out, '>', $opt_o or die "Can't create $opt_o: $!\n";
 
-print $out "<h1>$infile</h1>\n";
+my @pod = map { s/^ //; $_ } $dbd->comments;
 
 my $rtypes = $dbd->recordtypes;
 
-my ($rn, $rtyp) = each %{$rtypes};
-print $out "<h2>Record Name $rn</h2>\n";
-
-my @fields = $rtyp->fields;
-
-#create a Hash to store the table of field information for each GUI type
-%dbdTables = (
-    "GUI_COMMON" => "",
-    "GUI_COMMON" => "",
-    "GUI_ALARMS" => "",
-    "GUI_BITS1" => "",
-    "GUI_BITS2" => "",
-    "GUI_CALC" => "",
-    "GUI_CLOCK" => "",
-    "GUI_COMPRESS" => "",
-    "GUI_CONVERT" => "",
-    "GUI_DISPLAY" => "",
-    "GUI_HIST" => "",
-    "GUI_INPUTS" => "",
-    "GUI_LINKS" => "",
-    "GUI_MBB" => "",
-    "GUI_MOTOR" => "",
-    "GUI_OUTPUT" => "",
-    "GUI_PID" => "",
-    "GUI_PULSE" => "",
-    "GUI_SELECT" => "",
-    "GUI_SEQ1" => "",
-    "GUI_SEQ2" => "",
-    "GUI_SEQ3" => "",
-    "GUI_SUB" => "",
-    "GUI_TIMER" => "",
-    "GUI_WAVE" => "",
-    "GUI_SCAN" => "",
-    "GUI_NONE" => ""
-);
-
-
-#Loop over all of the fields.  Build a string that contains the table body
-#for each of the GUI Types based on which fields go with which GUI type.
-foreach $fVal (@fields) {
-    my $pg = $fVal->attribute('promptgroup');
-    while ( ($typ1, $content) = each %dbdTables) {
-        if ( $pg eq $typ1 or ($pg eq "" and $typ1 eq "GUI_NONE")) {
-            buildTableRow($fVal, $dbdTables{$typ1} );
-        }
+while (my ($rn, $rtyp) = each %{$rtypes}) {
+    foreach my $_ ($rtyp->comments) {
+        s/^ //;
+	if (m/^=fields (.*)/) {
+	    my @names = split /,\s*/, $1;
+	    my @fields = map {
+	            my $field = $rtyp->field($_);
+		    print STDERR "Unknown field name '$_' in $infile POD\n" unless $field;
+		    $field;
+	        } @names;
+	    my $html;
+	    foreach $field (@fields) {
+	        $html .= $field->htmlTableRow if $field;
+	    }
+	    push @pod, podTable($html);
+	}
+	else {
+	    push @pod, $_;
+	}
     }
 }
 
-#Write out each table
-while ( ($typ2, $content) = each %dbdTables) {
-    printHtmlTable($typ2, $content);
+my $podHtml = Pod::Simple::HTML->new();
+$podHtml->html_css('style.css');
+$podHtml->set_source(\@pod);
+# $podHtml->index(1);
+$podHtml->output_string(\my $html);
+$podHtml->run;
+print $out $html;
+close $out;
+
+
+sub podTable {
+    my $content = shift;
+    return ("=begin html\n", "\n",
+        "<blockquote><table border =\"1\"><tr>\n",
+        "<th>Field</th><th>Summary</th><th>Type</th><th>DCT</th>",
+        "<th>Default</th><th>Read</th><th>Write</th><th>CA PP</th></tr>\n",
+        $content, "</table></blockquote>\n",
+	"\n", "=end html\n");
 }
 
-
-#add a field to a table body.  The specified field and table body are passed 
-#in as parameters
-sub buildTableRow {
-    my ( $fld, $outStr) = @_;
-    $longDesc = "&nbsp;";
-    %htmlCellFmt = (
-        rowStart => "<tr><td rowspan = \"2\">",
-        nextCell => "</td><td>",
-        endRow   => "</td></tr>",
-        nextRow  => "<tr><td colspan = \"7\" align=left>"
-        );
-    my %cellFmt = %htmlCellFmt;
-    my $rowStart = $cellFmt{rowStart};
-    my $nextCell = $cellFmt{nextCell};
-    my $endRow   = $cellFmt{endRow};
-    my $nextRow  = $cellFmt{nextRow};
-    $outStr = $outStr . $rowStart;
-    $outStr = $outStr . $fld->name;
-    $outStr = $outStr . $nextCell;
-    $outStr = $outStr . $fld->attribute('prompt');
-    $outStr = $outStr . $nextCell;
-    my $recType = $fld->dbf_type;
-    $typStr = $recType;
-    if ($recType eq "DBF_STRING") {
-        $typStr = $recType . " [" . $fld->attribute('size') . "]";
-    }
-    
-    $outStr = $outStr . $typStr;
-    $outStr = $outStr . $nextCell;
-    $outStr = $outStr . design($fld);
-    $outStr = $outStr . $nextCell;
-    my $initial = $fld->attribute('initial');
-    if ( $initial eq '' ) {$initial = "&nbsp;";}
-    $outStr = $outStr . $initial;
-    $outStr = $outStr . $nextCell;
-    $outStr = $outStr . readable($fld);
-    $outStr = $outStr . $nextCell;
-    $outStr = $outStr . writable($fld);
-    $outStr = $outStr . $nextCell;
-    $outStr = $outStr . processPassive($fld);
-    $outStr = $outStr . $endRow;
-    $outStr = $outStr . "\n";
-    $outStr = $outStr . $nextRow;
-    $outStr = $outStr . $longDesc;
-    $outStr = $outStr . $endRow;
-    $outStr = $outStr . "\n";
-    $_[1] = $outStr;
+sub DBD::Recfield::htmlTableRow {
+    my $fld = shift;
+    my $html = '<tr><td class="cell">';
+    $html .= $fld->name;
+    $html .= '</td><td class="cell">';
+    $html .= $fld->attribute('prompt');
+    $html .= '</td><td class="cell">';
+    my $type = $fld->public_type;
+    $html .= $type;
+    $html .= ' [' . $fld->attribute('size') . ']'
+        if $type eq 'STRING';
+    $html .= ' (' . $fld->attribute('menu') . ')'
+        if $type eq 'MENU';
+    $html .= '</td><td class="cell">';
+    $html .= $fld->attribute('promptgroup') ? 'Yes' : 'No';
+    $html .= '</td><td class="cell">';
+    $html .= $fld->attribute('initial') || '&nbsp;';
+    $html .= '</td><td class="cell">';
+    $html .= $fld->readable;
+    $html .= '</td><td class="cell">';
+    $html .= $fld->writable;
+    $html .= '</td><td class="cell">';
+    $html .= $fld->attribute('pp') eq "TRUE" ? 'Yes' : 'No';
+    $html .= "</td></tr>\n";
+    return $html;
 }
 
-#Check if the prompt group is defined so that this can be used by clients
-sub design {
-    my $fld = $_[0];
-    my $pg = $fld->attribute('promptgroup');
-    if ( $pg eq '' ) {
-        my $result = 'No';
-    }
-    else {
-        my $result = 'Yes';
-    } 
+# Native type presented to dbAccess users
+sub DBD::Recfield::public_type {
+    my $fld = shift;
+    m/^=type (.+)$/i && return $1 for $fld->comments;
+    my $type = $fld->dbf_type;
+    $type =~ s/^DBF_//;
+    return $type;
 }
 
-#Check if this field is readable by clients
-sub readable {
-    my $fld = $_[0];
-    if ( $fld->attribute('special') eq "SPC_DBADDR") {
-        $return = "Probably";
-    }
-    else{
-        if ( $fld->dbf_type eq "DBF_NOACCESS" ) {
-            $return = "No";
-        }
-        else {
-            $return = "Yes"
-        }
-    }
+# Check if this field is readable
+sub DBD::Recfield::readable {
+    my $fld = shift;
+    m/^=read (Yes|No)$/i && return $1 for $fld->comments;
+    return 'Probably'
+        if $fld->attribute('special') eq "SPC_DBADDR";
+    return $fld->dbf_type eq 'DBF_NOACCESS' ? 'No' : 'Yes';
 }
 
-#Check if this field is writable by clients
-sub writable {
-    my $fld = $_[0];
-    my $spec = $fld->attribute('special');
-    if ( $spec eq "SPC_NOMOD" ) {
-        $return = "No";
-    }
-    else {
-        if ( $spec ne "SPC_DBADDR") {
-            if ( $fld->dbf_type eq "DBF_NOACCESS" ) {
-                $return = "No";
-            }
-            else {
-                $return = "Yes";
-            }
-        }
-        else {
-            $return = "Maybe";
-        }
-    }
+# Check if this field is writable
+sub DBD::Recfield::writable {
+    my $fld = shift;
+    m/^=write (Yes|No)$/i && return $1 for $fld->comments;
+    my $special = $fld->attribute('special');
+    return 'No'
+        if $special eq "SPC_NOMOD";
+    return 'Maybe'
+        if $special eq "SPC_DBADDR";
+    return $fld->dbf_type eq "DBF_NOACCESS" ? 'No' : 'Yes';
 }
 
-
-#Check to see if the field is process passive on caput
-sub processPassive {
-    my $fld = $_[0];
-    $pp = $fld->attribute('pp');
-    if ( $pp eq "YES" or $pp eq "TRUE" ) {
-        $result = "Yes";
-    }
-    elsif ( $PP eq "NO" or $pp eq "FALSE"  or $pp eq "" ) {
-        $result = "No";
-    }
-}
-
-#print the start row to define a table
-sub printTableStart {
-    print $out "<table border =\"1\"> \n";
-    print $out "<caption><em>$_[0]</em></caption>";
-    print $out "<th>Field</th>\n";
-    print $out "<th>Summary</th>\n";
-    print $out "<th>Type</th>\n";
-    print $out "<th>DCT</th>\n";
-    print $out "<th>Default</th>\n";
-    print $out "<th>Read</th>\n";
-    print $out "<th>Write</th>\n";
-    print $out "<th>caPut=PP</th></tr>\n";
-
-}
-
-#print the tail end of the table
-sub printTableEnd {
-    print $out "</table>\n";
-}
-
-# Print the table for a GUI type.  The name of the GUI type and the Table body
-# for this type are fed in as parameters
-sub printHtmlTable {
-    my ($typ2, $content) = $_;
-    if ( (length $_[1]) gt 0) {
-        printTableStart($_[0]);
-        print $out "$_[1]\n";
-        printTableEnd();
-    }
-    
-}
diff --git a/src/tools/style.css b/src/tools/style.css
new file mode 100644
index 000000000..fe0ad441c
--- /dev/null
+++ b/src/tools/style.css
@@ -0,0 +1,433 @@
+BODY, .logo { background: white; }
+
+BODY {
+  color: black;
+  font-family: arial,sans-serif;
+  margin: 0;
+  padding: 1ex;
+}
+
+TABLE {
+  border-collapse: collapse;
+  border-spacing: 0;
+  border-width: 0;
+  color: inherit;
+}
+
+IMG { border: 0; }
+FORM { margin: 0; }
+input { margin: 2px; }
+
+.logo {
+  float: left;
+  width: 264px;
+  height: 77px;
+}
+
+.front .logo  {
+  float: none;
+  display:block;
+}
+
+.front .searchbox  {
+  margin: 2ex auto;
+  text-align: center;
+}
+
+.front .menubar {
+  text-align: center;
+}
+
+.menubar {
+  background: #006699;
+  margin: 1ex 0;
+  padding: 1px;
+} 
+
+.menubar A {
+  padding: 0.8ex;
+  font: bold 10pt Arial,Helvetica,sans-serif;
+}
+
+.menubar A:link, .menubar A:visited {
+  color: white;
+  text-decoration: none;
+}
+
+.menubar A:hover {
+  color: #ff6600;
+  text-decoration: underline;
+}
+
+A:link, A:visited {
+  background: transparent;
+  color: #006699;
+}
+
+A[href="#POD_ERRORS"] {
+  background: transparent;
+  color: #FF0000;
+}
+
+TD {
+  margin: 0;
+  padding: 0;
+}
+
+DIV {
+  border-width: 0;
+}
+
+DT {
+  margin-top: 1em;
+}
+
+.credits TD {
+  padding: 0.5ex 2ex;
+}
+
+.huge {
+  font-size: 32pt;
+}
+
+.s {
+  background: #dddddd;
+  color: inherit;
+}
+
+.s TD, .r TD {
+  padding: 0.2ex 1ex;
+  vertical-align: baseline;
+}
+
+TH {
+  background: #bbbbbb;
+  color: inherit;
+  padding: 0.4ex 1ex;
+  text-align: left;
+}
+
+TH A:link, TH A:visited {
+  background: transparent;
+  color: black;
+}
+
+.box {
+  border: 1px solid #006699;
+  margin: 1ex 0;
+  padding: 0;
+}
+
+.distfiles TD {
+  padding: 0 2ex 0 0;
+  vertical-align: baseline;
+}
+
+.manifest TD {
+  padding: 0 1ex;
+  vertical-align: top;
+}
+
+.l1 {
+  font-weight: bold;
+}
+
+.l2 {
+  font-weight: normal;
+}
+
+.t1, .t2, .t3, .t4, .t5  {
+  background: #006699;
+  color: white;
+}
+.t4 {
+  padding: 0.2ex 0.4ex;
+}
+.t1, .t2, .t3  {
+  padding: 0.5ex 1ex;
+}
+
+/* IE does not support  .box>.t1  Grrr */
+.box .t1, .box .t2, .box .t3, .box .t5 {
+  margin: 0;
+}
+
+.t1 {
+  font-size: 1.4em;
+  font-weight: bold;
+  text-align: center;
+}
+
+.t2 {
+  font-size: 1.0em;
+  font-weight: bold;
+  text-align: left;
+}
+
+.t3 {
+  font-size: 1.0em;
+  font-weight: normal;
+  text-align: left;
+}
+
+.t5 {
+  font-size: 0.8em;
+  font-weight: normal;
+  text-align: center;
+}
+
+/* width: 100%; border: 0.1px solid #FFFFFF; */ /* NN4 hack */
+
+.datecell {
+  text-align: center;
+  width: 17em;
+}
+
+.cell {
+  padding: 0.2ex 1ex;
+  text-align: left;
+}
+
+.label {
+  background: #aaaaaa;
+  color: black;
+  font-weight: bold;
+  padding: 0.2ex 1ex;
+  text-align: right;
+  white-space: nowrap;
+  vertical-align: baseline;
+}
+
+.categories {
+  border-bottom: 3px double #006699;
+  margin-bottom: 1ex;
+  padding-bottom: 3ex;
+  padding-top: 2ex;
+}
+
+.categories TABLE {
+  margin: auto;
+}
+
+.categories TD {
+  padding: 0.5ex 1ex;
+  vertical-align: baseline;
+}
+
+.path A {
+  background: transparent;
+  color: #006699;
+  font-weight: bold;
+}
+
+.pages {
+  background: #dddddd;
+  color: #006699;
+  padding: 0.2ex 0.4ex;
+}
+
+.path {
+  background: #dddddd;
+  border-bottom: 1px solid #006699;
+  color: #006699;
+ /*  font-size: 1.4em;*/
+  margin: 1ex 0;
+  padding: 0.5ex 1ex;
+}
+
+.menubar TD {
+  background: #006699;
+  color: white;
+}
+
+.menubar {
+  background: #006699;
+  color: white;
+  margin: 1ex 0;
+  padding: 1px;
+}
+
+.menubar .links     {
+  background: transparent;
+  color: white;
+  padding: 0.2ex;
+  text-align: left;
+}
+
+.menubar .searchbar {
+  background: black;
+  color: black;
+  margin: 0px;
+  padding: 2px;
+  text-align: right;
+}
+
+A.m:link, A.m:visited {
+  background: #006699;
+  color: white;
+  font: bold 10pt Arial,Helvetica,sans-serif;
+  text-decoration: none;
+}
+
+A.o:link, A.o:visited {
+  background: #006699;
+  color: #ccffcc;
+  font: bold 10pt Arial,Helvetica,sans-serif;
+  text-decoration: none;
+}
+
+A.o:hover {
+  background: transparent;
+  color: #ff6600;
+  text-decoration: underline;
+}
+
+A.m:hover {
+  background: transparent;
+  color: #ff6600;
+  text-decoration: underline;
+}
+
+table.dlsip     {
+  background: #dddddd;
+  border: 0.4ex solid #dddddd;
+}
+
+.pod, .manifest { margin-right: 20ex; }
+
+.pod PRE     {
+  background: #eeeeee;
+  border: 1px solid #888888;
+  color: black;
+  padding: 1em;
+  white-space: pre;
+}
+
+.pod H1      {
+  background: transparent;
+  color: #006699;
+  font-size: large;
+}
+
+.pod H1 A { text-decoration: none; }
+.pod H2 A { text-decoration: none; }
+.pod H3 A { text-decoration: none; }
+.pod H4 A { text-decoration: none; }
+
+.pod H2      {
+  background: transparent;
+  color: #006699;
+  font-size: medium;
+}
+
+.pod H3      {
+  background: transparent;
+  color: #006699;
+  font-size: medium;
+  font-style: italic;
+}
+
+.pod H4      {
+  background: transparent;
+  color: #006699;
+  font-size: medium;
+  font-weight: normal;
+}
+
+.pod IMG     {
+  vertical-align: top;
+}
+
+.pod .toc A  {
+  text-decoration: none;
+}
+
+.pod .toc LI {
+  line-height: 1.2em;
+  list-style-type: none;
+}
+
+.faq DT {
+  font-size: 1.4em;
+  font-weight: bold;
+}
+
+.chmenu {
+  background: black;
+  color: red;
+  font: bold 1.1em Arial,Helvetica,sans-serif;
+  margin: 1ex auto;
+  padding: 0.5ex;
+}
+
+.chmenu TD {
+  padding: 0.2ex 1ex;
+}
+
+.chmenu A:link, .chmenu A:visited  {
+  background: transparent;
+  color: white;
+  text-decoration: none;
+}
+
+.chmenu A:hover {
+  background: transparent;
+  color: #ff6600;
+  text-decoration: underline;
+}
+
+.column {
+  padding: 0.5ex 1ex;
+  vertical-align: top;
+}
+
+.datebar {
+  margin: auto;
+  width: 14em;
+}
+
+.date {
+  background: transparent;
+  color: #008000;
+}
+
+.footer {
+  margin-top: 1ex;
+  text-align: right;
+  color: #006699;
+  font-size: x-small;
+  border-top: 1px solid #006699;
+  line-height: 120%;
+}
+
+.front .footer {
+  border-top: none;
+}
+
+#permalink {
+  float: right
+}
+
+#permalink A {
+  font-size: small;
+}
+
+.sr {
+  font-size: inherit;
+  margin: 0;
+}
+
+.cpanstats {
+  float: left;
+  text-align: left;
+  color: #bbb;
+  white-space: pre;
+}
+
+form.tool {
+  margin: 1ex;
+}
+
+.styleswitch {
+  text-align: right;
+}

From 56c812f99095f0bf46d081e2a585b160a6fe9c0f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 30 Aug 2012 00:57:00 -0500
Subject: [PATCH 03/25] Add rules to run dbdToHtml.pl and install the result

---
 configure/RULES.Db    | 9 +++++++++
 configure/RULES_BUILD | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/configure/RULES.Db b/configure/RULES.Db
index 6a01ad19b..5d1e0622a 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -395,6 +395,15 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 
 .PRECIOUS: $(COMMON_DBDS) $(COMMON_DIR)/%Include.dbd
 
+##################################################### HTML files
+
+$(COMMON_DIR)/%.html: %.dbd $(TOOLS)/dbdToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/dbdToHtml.pl $(DBDFLAGS) -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+.PRECIOUS: $(COMMON_DIR)/%.html
+
 ##################################################### DB files
 
 $(COMMON_DIR)/%.db$(RAW): $(COMMON_DIR)/%.edf 
diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 711da3434..a0699e5d2 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -474,6 +474,10 @@ $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
 	$(ECHO) "Installing html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
+$(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
+	$(ECHO) "Installing html $@"
+	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
+
 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%
 	$(ECHO) "Installing $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)

From d86db4e6b67e7c279381f9a022f1b10db0d31e35 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 30 Aug 2012 00:59:17 -0500
Subject: [PATCH 04/25] Start annotating fields and writing POD comments

---
 src/std/Makefile                |   1 +
 src/std/filters/Makefile        |   2 +
 src/std/filters/filters.dbd     |  70 +++++++++++++++
 src/std/rec/Makefile            |   1 +
 src/std/rec/aSubRecord.dbd      | 126 +++++++++++++++++++++++++++
 src/std/rec/aaiRecord.dbd       |   3 +
 src/std/rec/aaoRecord.dbd       |   3 +
 src/std/rec/aiRecord.dbd        | 148 +++++++++++++++++++++++++++++++-
 src/std/rec/compressRecord.dbd  |   8 ++
 src/std/rec/histogramRecord.dbd |   3 +
 src/std/rec/mbboRecord.dbd      |   2 +
 src/std/rec/subArrayRecord.dbd  |   3 +
 src/std/rec/waveformRecord.dbd  |   3 +
 13 files changed, 370 insertions(+), 3 deletions(-)

diff --git a/src/std/Makefile b/src/std/Makefile
index cde499d75..63ef02054 100644
--- a/src/std/Makefile
+++ b/src/std/Makefile
@@ -11,6 +11,7 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 
 STDDIR=$(TOP)/src/std
+HTMLS_DIR = std
 
 LIBRARY_IOC += dbRecStd
 dbRecStd_LIBS = dbCore ca Com
diff --git a/src/std/filters/Makefile b/src/std/filters/Makefile
index 7e33500d1..09ed25f12 100644
--- a/src/std/filters/Makefile
+++ b/src/std/filters/Makefile
@@ -16,3 +16,5 @@ dbRecStd_SRCS += dbnd.c
 dbRecStd_SRCS += arr.c
 dbRecStd_SRCS += sync.c
 
+HTMLS += filters.html
+
diff --git a/src/std/filters/filters.dbd b/src/std/filters/filters.dbd
index 7fb0c5133..aa93223b4 100644
--- a/src/std/filters/filters.dbd
+++ b/src/std/filters/filters.dbd
@@ -1,3 +1,73 @@
+#=head1 Channel Filters
+#
+# Channel Filters can be applied to Channel Access channels by a client, using
+# a JSON Field Modifier to select the filter and any parameters.
+# The following filters are available in this release:
+#
+#=over 4
+#
+#=item * L<TimeStamp|/"TimeStamp Filter (ts)">
+#
+#=item * Deadband
+#
+#=item * Array
+#
+#=item * Synchronized
+#
+#=back
+#
+#=head2 Using Filters
+#
+# Channel filters can be added to any Channel Access channel name.
+# There can be more than one filter applied to the same channel, in which case the
+# order that they are specified will control the order in which they are applied
+# to the resulting data-stream.
+# The filter specification must appear after the field name, or if the default
+# (VAL) field is used after a dot C<.> appended to the record name.
+# With the exception of the array short-hand which is described below, all filters
+# must appear inside a pair of braces C< {} > after the dot expressed as a JSON
+# (L<JavaScript Object Notation|http://www.json.org/>) object, which allows filter
+# parameters to be included as needed.
+#
+# Each filter is given as a name/value pair. The filter name (given in parentheses
+# in the titles below) is a string, and must be enclosed inside double-quotes C<">
+# characters as per the JSON specification.
+# Paramters to that filter are provided as the value part of the name/value pair,
+# and will normally appear as a child JSON object inside another pair of braces C< {} >.
+#
+#=head4 Example Filter
+#
+# Given a record called C<test:channel> the following would apply a filter C<f> to
+# the VAL field of that record, giving the filter two numeric parameters named C<lo>
+# and C<hi>:
+#
+#  test:channel.{"f":{"lo":0,"hi":10}}
+#
+# Note that due to the required presence of the double-quote characters in the JSON
+# strings in the channel name it will usually be necessary to enclose a filtered name
+# within single-quotes C<'...'> when typing it as an argument to a Unix shell command.
+#
+#=head2 Filter Reference
+#
+#=head3 TimeStamp Filter (C<ts>)
+#
+# This filter is used to set the timestamp of the (first) value fetched through the
+# channel to the connection time, rather than the time the record last processed
+# which could have been days or even weeks ago for some records, or set to the
+# EPICS epoch if the record has never processed.
+#
+#=head4 Parameters
+#
+# None, use an empty pair of braces.
+#
+#=head4 Example
+#
+#  Hal$ caget -a 'test:channel.{"ts":{}}'
+#  test:channel.{"ts":{}}   2012-08-28 22:10:31.192547 0 UDF INVALID
+#  Hal$ caget -a 'test:channel'
+#  test:channel             <undefined> 0 UDF INVALID
+#
+#=cut
 registrar(tsInitialize)
 registrar(dbndInitialize)
 registrar(arrInitialize)
diff --git a/src/std/rec/Makefile b/src/std/rec/Makefile
index c2d44ddb9..a5c6c4499 100644
--- a/src/std/rec/Makefile
+++ b/src/std/rec/Makefile
@@ -51,3 +51,4 @@ stdRecords_DBD = $(patsubst %,%.dbd,$(stdRecords))
 
 dbRecStd_SRCS += $(patsubst %,%.c,$(stdRecords))
 
+HTMLS = $(patsubst %,%.html,$(stdRecords))
diff --git a/src/std/rec/aSubRecord.dbd b/src/std/rec/aSubRecord.dbd
index 3297db59b..918b36d3a 100644
--- a/src/std/rec/aSubRecord.dbd
+++ b/src/std/rec/aSubRecord.dbd
@@ -197,6 +197,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *a")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTA
 	}
 	field(B,DBF_NOACCESS) {
 		prompt("Input value B")
@@ -204,6 +207,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *b")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTB
 	}
 	field(C,DBF_NOACCESS) {
 		prompt("Input value C")
@@ -211,6 +217,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *c")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTC
 	}
 	field(D,DBF_NOACCESS) {
 		prompt("Input value D")
@@ -218,6 +227,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *d")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTD
 	}
 	field(E,DBF_NOACCESS) {
 		prompt("Input value E")
@@ -225,6 +237,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *e")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTE
 	}
 	field(F,DBF_NOACCESS) {
 		prompt("Input value F")
@@ -232,6 +247,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *f")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTF
 	}
 	field(G,DBF_NOACCESS) {
 		prompt("Input value G")
@@ -239,6 +257,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *g")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTG
 	}
 	field(H,DBF_NOACCESS) {
 		prompt("Input value H")
@@ -246,6 +267,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *h")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTH
 	}
 	field(I,DBF_NOACCESS) {
 		prompt("Input value I")
@@ -253,6 +277,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *i")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTI
 	}
 	field(J,DBF_NOACCESS) {
 		prompt("Input value J")
@@ -260,6 +287,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *j")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTJ
 	}
 	field(K,DBF_NOACCESS) {
 		prompt("Input value K")
@@ -267,6 +297,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *k")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTK
 	}
 	field(L,DBF_NOACCESS) {
 		prompt("Input value L")
@@ -274,6 +307,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *l")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTL
 	}
 	field(M,DBF_NOACCESS) {
 		prompt("Input value M")
@@ -281,6 +317,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *m")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTM
 	}
 	field(N,DBF_NOACCESS) {
 		prompt("Input value N")
@@ -288,6 +327,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *n")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTN
 	}
 	field(O,DBF_NOACCESS) {
 		prompt("Input value O")
@@ -295,6 +337,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *o")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTO
 	}
 	field(P,DBF_NOACCESS) {
 		prompt("Input value P")
@@ -302,6 +347,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *p")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTP
 	}
 	field(Q,DBF_NOACCESS) {
 		prompt("Input value Q")
@@ -309,6 +357,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *q")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTQ
 	}
 	field(R,DBF_NOACCESS) {
 		prompt("Input value R")
@@ -316,6 +367,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *r")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTR
 	}
 	field(S,DBF_NOACCESS) {
 		prompt("Input value S")
@@ -323,6 +377,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *s")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTS
 	}
 	field(T,DBF_NOACCESS) {
 		prompt("Input value T")
@@ -330,6 +387,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *t")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTT
 	}
 	field(U,DBF_NOACCESS) {
 		prompt("Input value U")
@@ -337,6 +397,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *u")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTU
 	}
 	field(FTA,DBF_MENU) {
 		prompt("Type of A")
@@ -911,6 +974,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *vala")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVA
 	}
 	field(VALB,DBF_NOACCESS) {
 		prompt("Output value B")
@@ -918,6 +984,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valb")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVB
 	}
 	field(VALC,DBF_NOACCESS) {
 		prompt("Output value C")
@@ -925,6 +994,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valc")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVC
 	}
 	field(VALD,DBF_NOACCESS) {
 		prompt("Output value D")
@@ -932,6 +1004,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *vald")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVD
 	}
 	field(VALE,DBF_NOACCESS) {
 		prompt("Output value E")
@@ -939,6 +1014,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *vale")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVE
 	}
 	field(VALF,DBF_NOACCESS) {
 		prompt("Output value F")
@@ -946,6 +1024,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valf")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVF
 	}
 	field(VALG,DBF_NOACCESS) {
 		prompt("Output value G")
@@ -953,6 +1034,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valg")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVG
 	}
 	field(VALH,DBF_NOACCESS) {
 		prompt("Output value H")
@@ -960,6 +1044,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valh")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVH
 	}
 	field(VALI,DBF_NOACCESS) {
 		prompt("Output value I")
@@ -967,6 +1054,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *vali")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVI
 	}
 	field(VALJ,DBF_NOACCESS) {
 		prompt("Output value J")
@@ -974,6 +1064,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valj")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVJ
 	}
 	field(VALK,DBF_NOACCESS) {
 		prompt("Output value K")
@@ -981,6 +1074,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valk")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVK
 	}
 	field(VALL,DBF_NOACCESS) {
 		prompt("Output value L")
@@ -988,6 +1084,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *vall")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVL
 	}
 	field(VALM,DBF_NOACCESS) {
 		prompt("Output value M")
@@ -995,6 +1094,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valm")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVM
 	}
 	field(VALN,DBF_NOACCESS) {
 		prompt("Output value N")
@@ -1002,6 +1104,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valn")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVN
 	}
 	field(VALO,DBF_NOACCESS) {
 		prompt("Output value O")
@@ -1009,6 +1114,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valo")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVO
 	}
 	field(VALP,DBF_NOACCESS) {
 		prompt("Output value P")
@@ -1016,6 +1124,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valp")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVP
 	}
 	field(VALQ,DBF_NOACCESS) {
 		prompt("Output value Q")
@@ -1023,6 +1134,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valq")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVQ
 	}
 	field(VALR,DBF_NOACCESS) {
 		prompt("Output value R")
@@ -1030,6 +1144,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valr")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVR
 	}
 	field(VALS,DBF_NOACCESS) {
 		prompt("Output value S")
@@ -1037,6 +1154,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *vals")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVS
 	}
 	field(VALT,DBF_NOACCESS) {
 		prompt("Output value T")
@@ -1044,6 +1164,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valt")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVT
 	}
 	field(VALU,DBF_NOACCESS) {
 		prompt("Output value U")
@@ -1051,6 +1174,9 @@ recordtype(aSub) {
 		special(SPC_DBADDR)
 		interest(2)
 		extra("void *valu")
+		#=read Yes
+		#=write Yes
+		#=type Set by FTVU
 	}
 	field(OVLA,DBF_NOACCESS) {
 		prompt("Old Output A")
diff --git a/src/std/rec/aaiRecord.dbd b/src/std/rec/aaiRecord.dbd
index fb921cfc4..3b6c5fb2c 100644
--- a/src/std/rec/aaiRecord.dbd
+++ b/src/std/rec/aaiRecord.dbd
@@ -19,6 +19,9 @@ recordtype(aai) {
 		special(SPC_DBADDR)
 		pp(TRUE)
 		extra("void *		val")
+		#=type DOUBLE[]
+		#=read Yes
+		#=write Yes
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
diff --git a/src/std/rec/aaoRecord.dbd b/src/std/rec/aaoRecord.dbd
index 025920a48..861a16613 100644
--- a/src/std/rec/aaoRecord.dbd
+++ b/src/std/rec/aaoRecord.dbd
@@ -19,6 +19,9 @@ recordtype(aao) {
 		special(SPC_DBADDR)
 		pp(TRUE)
 		extra("void *		val")
+		#=type DOUBLE[]
+		#=read Yes
+		#=write Yes
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
diff --git a/src/std/rec/aiRecord.dbd b/src/std/rec/aiRecord.dbd
index 0573768fd..7b54fe89d 100644
--- a/src/std/rec/aiRecord.dbd
+++ b/src/std/rec/aiRecord.dbd
@@ -1,13 +1,155 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 recordtype(ai) {
+	#=head1 Analog Input (ai)
+	#
+	# This record type is normally used to obtain an analog value from
+	# a hardware input and convert it to engineering units. The record
+	# supports linear and break-point conversion to engineering units,
+	# smoothing, alarm limits, alarm filtering, and graphics and control
+	# limits.
+	#
+	#=head2 Parameter Fields
+	#
+	# The record fields are described below grouped by functionality.
+	#
+	#=head3 Input Specification
+	#
+	# These fields control where (if anywhere) the record reads data from
+	# when it is processed:
+	#
+	#=fields INP, DTYP
+	#
+	# I<Description?>
+	#
+	#=head3 Units Conversion
+	#
+	# These fields control how the raw input value gets converted into
+	# engineering units:
+	#
+	#=fields RVAL, ROFF, ASLO, AOFF, LINR, ESLO, EOFF, EGUL, EGUF
+	#
+	# These fields are not used if the device support layer reads its
+	# value in engineering units and puts it directly into the VAL field.
+	#
+	# If the device support sets the RVAL field, the LINR field controls
+	# how this gets converted into engineering units and placed in the
+	# VAL field as follows:
+	#
+	#=over 4
+	#
+	#=item 1. RVAL is converted to a double and ROFF is added to it
+	#
+	#=item 2. If ASLO is non-zero the value is multiplied by ASLO
+	#
+	#=item 3. AOFF is added
+	#
+	#=item 4. If LINR is C<NO CONVERSION> the units conversion is finished
+	# after the above steps
+	#
+	#=item 5. If LINR is C<LINEAR> or C<SLOPE>, the value from step 3
+	# above is multiplied by ESLO and EOFF is added to complete the units
+	# conversion process
+	#
+	#=item 6. Any other value for LINR selects a particular breakpoint
+	# table to be used on the value from step 3 above
+	#
+	#=back
+	#
+	# The distinction between the C<LINEAR> and C<SLOPE> settings for the
+	# LINR field are in how the conversion parameters are calculated:
+	#
+	#=over 4
+	#
+	#=item *
+	# With C<LINEAR> conversion the user must set EGUL and EGUF to the
+	# lowest and highest possible engineering units values respectively
+	# that can be converted by the hardware. The device support knows
+	# the range of the raw data and calculates ESLO and EOFF from them.
+	#
+	#=item *
+	# C<SLOPE> conversion requires the user to calculate the appropriate
+	# scaling and offset factors and put them directly in ESLO and EOFF.
+	#
+	#=back
+	#
+	#=head3 Smoothing Filter
+	#
+	# This filter is usually only used if the device support sets the RVAL
+	# field and the Units Conversion process is used. Device support that
+	# directly sets the VAL field may implement the filter if desired.
+	#
+	# The filter is controlled with a single parameter field:
+	#
+	#=fields SMOO
+	#
+	# The SMOO field should be set to a number between 0 and 1. If set to
+	# zero the filter is not used (no smoothing), while if set to one the
+	# result is infinite smoothing (the VAL field will never change). The
+	# calculation performed is:
+	#
+	#     VAL = VAL * SMOO + (1 - SMOO) * New Data
+	#
+	# where C<New Data> was the result from the Units Conversion above.
+	# This implements a first-order infinite impulse response (IIR)
+	# digital filter with z-plane pole at SMOO. The equivalent
+	# continuous-time filter time constant E<tau> is given by
+	#
+	#=over 4
+	#
+	# E<tau> = E<minus>T / ln(SMOO)
+	#
+	#=back
+	#
+	# where T is the time between record processing.
+	#
+	#=head3 Undefined Check
+	#
+	# If after applying the smoothing filter the VAL field contains a NaN
+	# (Not-a-Number) value, the UDF field is set to indicate that the
+	# record value is undefined, which triggers a C<UDF_ALARM> with
+	# severity C<INVALID_ALARM>.
+	#
+	#=fields UDF
+	#
+	#=head3 Operator Display Parameters
+	#
+	# These parameters are used to present meaningful data to the operator.
+	#
+	#=over 4
+	#
+	#=item *
+	# DESC is a string that is usually used to briefly describe the record.
+	#
+	#=item *
+	# EGU is a string of up to 16 characters giving the units that the
+	# analog input measures.
+	#
+	#=item *
+	# The HOPR and LOPR fields set the upper and lower display limits for
+	# the VAL, HIHI, HIGH, LOW, and LOLO fields.
+	#
+	#=item *
+	# The PREC field determines the floating point precision with which
+	# to display VAL.
+	#
+	#=back
+	#
+	#=fields DESC, EGU, HOPR, LOPR, PREC
+	#
+	#=head3 Alarm Parameters
+	#
+	# ...
+	#
+	#=fields HIHI, HIGH, LOW, LOLO, HHSV, HSV, LSV, LLSV, HYST, AFTC
+	#
+	#=cut
 	include "dbCommon.dbd" 
 	field(VAL,DBF_DOUBLE) {
 		prompt("Current EGU Value")
diff --git a/src/std/rec/compressRecord.dbd b/src/std/rec/compressRecord.dbd
index 347b807e2..96190331c 100644
--- a/src/std/rec/compressRecord.dbd
+++ b/src/std/rec/compressRecord.dbd
@@ -16,6 +16,11 @@ menu(compressALG) {
 	choice(compressALG_N_to_1_Median,"N to 1 Median")
 }
 recordtype(compress) {
+	#=head1 Compress Record (compress)
+	#
+	#=fields VAL
+	#
+	#=cut
 	include "dbCommon.dbd" 
 	field(VAL,DBF_NOACCESS) {
 		prompt("Value")
@@ -23,6 +28,9 @@ recordtype(compress) {
 		special(SPC_DBADDR)
 		pp(TRUE)
 		extra("void *		val")
+		#=type DOUBLE[]
+		#=read Yes
+		#=write Yes
 	}
 	field(INP,DBF_INLINK) {
 		prompt("Input Specification")
diff --git a/src/std/rec/histogramRecord.dbd b/src/std/rec/histogramRecord.dbd
index 06a84b52a..08fc12d4f 100644
--- a/src/std/rec/histogramRecord.dbd
+++ b/src/std/rec/histogramRecord.dbd
@@ -20,6 +20,9 @@ recordtype(histogram) {
 		asl(ASL0)
 		special(SPC_DBADDR)
 		extra("void *	val")
+		#=type ULONG[]
+		#=read Yes
+		#=write Yes
 	}
 	field(NELM,DBF_USHORT) {
 		prompt("Num of Array Elements")
diff --git a/src/std/rec/mbboRecord.dbd b/src/std/rec/mbboRecord.dbd
index 4f748a7fd..5920a0c76 100644
--- a/src/std/rec/mbboRecord.dbd
+++ b/src/std/rec/mbboRecord.dbd
@@ -15,6 +15,8 @@ recordtype(mbbo) {
 		special(SPC_DBADDR)
 		asl(ASL0)
 		pp(TRUE)
+		#=read Yes
+		#=write Yes
 	}
 	field(DOL,DBF_INLINK) {
 		prompt("Desired Output Loc")
diff --git a/src/std/rec/subArrayRecord.dbd b/src/std/rec/subArrayRecord.dbd
index 6442ede16..92c221c59 100644
--- a/src/std/rec/subArrayRecord.dbd
+++ b/src/std/rec/subArrayRecord.dbd
@@ -15,6 +15,9 @@ recordtype(subArray) {
 		special(SPC_DBADDR)
 		pp(TRUE)
 		extra("void *		val")
+		#=type See FTVL
+		#=read Yes
+		#=write Yes
 	}
 	field(PREC,DBF_SHORT) {
 		prompt("Display Precision")
diff --git a/src/std/rec/waveformRecord.dbd b/src/std/rec/waveformRecord.dbd
index 92d0fc156..32394971e 100644
--- a/src/std/rec/waveformRecord.dbd
+++ b/src/std/rec/waveformRecord.dbd
@@ -18,6 +18,9 @@ recordtype(waveform) {
 		special(SPC_DBADDR)
 		pp(TRUE)
 		extra("void *		val")
+		#=type See FTVL
+		#=read Yes
+		#=write Yes
 	}
 	field(RARM,DBF_SHORT) {
 		prompt("Rearm the waveform")

From dad89d5bbafa6a039afa0c25bde0437403dacb3f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Sun, 2 Sep 2012 00:02:38 -0500
Subject: [PATCH 05/25] dbdToHtml.pl: Fix generated link URLs to other docs

Also added some code comments
---
 src/tools/dbdToHtml.pl | 48 +++++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl
index f41e656a9..56f1c9414 100644
--- a/src/tools/dbdToHtml.pl
+++ b/src/tools/dbdToHtml.pl
@@ -20,9 +20,8 @@ use Pod::Simple::HTML;
 
 my $tool = 'dbdToHtml';
 getopts('DI@o:') or
-    die "Usage: $tool [-D] [-I dir] [-o xRecord.html] xRecord.dbd\n";
+    die "Usage: $tool [-D] [-I dir] [-o file.html] file.dbd\n";
 
-my @path = map { split /[:;]/ } @opt_I;
 my $dbd = DBD->new();
 
 my $infile = shift @ARGV;
@@ -47,34 +46,45 @@ if ($opt_D) {   # Output dependencies only
 
 open my $out, '>', $opt_o or die "Can't create $opt_o: $!\n";
 
+# Grab the comments from the root DBD object
+# Strip a single leading space off all comment lines
 my @pod = map { s/^ //; $_ } $dbd->comments;
 
 my $rtypes = $dbd->recordtypes;
 
+# Process the comments from any record types defined
 while (my ($rn, $rtyp) = each %{$rtypes}) {
     foreach my $_ ($rtyp->comments) {
+        # Strip a single leading space
         s/^ //;
-	if (m/^=fields (.*)/) {
-	    my @names = split /,\s*/, $1;
-	    my @fields = map {
-	            my $field = $rtyp->field($_);
-		    print STDERR "Unknown field name '$_' in $infile POD\n" unless $field;
-		    $field;
-	        } @names;
-	    my $html;
-	    foreach $field (@fields) {
-	        $html .= $field->htmlTableRow if $field;
-	    }
-	    push @pod, podTable($html);
-	}
-	else {
-	    push @pod, $_;
-	}
+        # Handle our 'fields' Pod directive
+        if (m/^=fields (.*)/) {
+            my @names = split /\s*,\s*/, $1;
+	    # Look up every named field
+            my @fields = map {
+                    my $field = $rtyp->field($_);
+                    print STDERR "Unknown field name '$_' in $infile POD\n" unless $field;
+                    $field;
+                } @names;
+            my $html;
+	    # Generate a HTML table row for each field
+            foreach $field (@fields) {
+                $html .= $field->htmlTableRow if $field;
+            }
+	    # Add the complete table
+            push @pod, podTable($html);
+        }
+        else {
+	    # Add other comments
+            push @pod, $_;
+        }
     }
 }
 
 my $podHtml = Pod::Simple::HTML->new();
 $podHtml->html_css('style.css');
+$podHtml->perldoc_url_prefix('');
+$podHtml->perldoc_url_postfix('.html');
 $podHtml->set_source(\@pod);
 # $podHtml->index(1);
 $podHtml->output_string(\my $html);
@@ -90,7 +100,7 @@ sub podTable {
         "<th>Field</th><th>Summary</th><th>Type</th><th>DCT</th>",
         "<th>Default</th><th>Read</th><th>Write</th><th>CA PP</th></tr>\n",
         $content, "</table></blockquote>\n",
-	"\n", "=end html\n");
+        "\n", "=end html\n");
 }
 
 sub DBD::Recfield::htmlTableRow {

From 29c6d34be46c3b13559e749350bb91d0294c548b Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Sun, 2 Sep 2012 00:04:47 -0500
Subject: [PATCH 06/25] filters: Document the deadband filter

---
 src/std/filters/filters.dbd | 85 ++++++++++++++++++++++++++++++++-----
 1 file changed, 74 insertions(+), 11 deletions(-)

diff --git a/src/std/filters/filters.dbd b/src/std/filters/filters.dbd
index aa93223b4..69a40b9fc 100644
--- a/src/std/filters/filters.dbd
+++ b/src/std/filters/filters.dbd
@@ -6,13 +6,13 @@
 #
 #=over 4
 #
-#=item * L<TimeStamp|/"TimeStamp Filter (ts)">
+#=item * L<TimeStamp|/"TimeStamp Filter "ts"">
 #
-#=item * Deadband
+#=item * L<Deadband|/"Deadband Filter "dbnd"">
 #
-#=item * Array
+#=item * L<Array|/"Array Filter "arr"">
 #
-#=item * Synchronized
+#=item * L<Synchronize|/"Synchronize Filter "sync"">
 #
 #=back
 #
@@ -32,8 +32,9 @@
 # Each filter is given as a name/value pair. The filter name (given in parentheses
 # in the titles below) is a string, and must be enclosed inside double-quotes C<">
 # characters as per the JSON specification.
-# Paramters to that filter are provided as the value part of the name/value pair,
-# and will normally appear as a child JSON object inside another pair of braces C< {} >.
+# Parameters to that filter are provided as the value part of the name/value pair,
+# and will normally appear as a child JSON object consisting of name/value pairs
+# inside a nested pair of braces C< {} >.
 #
 #=head4 Example Filter
 #
@@ -44,12 +45,16 @@
 #  test:channel.{"f":{"lo":0,"hi":10}}
 #
 # Note that due to the required presence of the double-quote characters in the JSON
-# strings in the channel name it will usually be necessary to enclose a filtered name
-# within single-quotes C<'...'> when typing it as an argument to a Unix shell command.
+# strings in the name string, it will usually be necessary to enclose a filtered name
+# within single-quotes C<< ' E<hellip> ' >> when typing it as an argument to a Unix
+# shell command.
 #
 #=head2 Filter Reference
 #
-#=head3 TimeStamp Filter (C<ts>)
+
+registrar(tsInitialize)
+
+#=head3 TimeStamp Filter C<"ts">
 #
 # This filter is used to set the timestamp of the (first) value fetched through the
 # channel to the connection time, rather than the time the record last processed
@@ -67,8 +72,66 @@
 #  Hal$ caget -a 'test:channel'
 #  test:channel             <undefined> 0 UDF INVALID
 #
-#=cut
-registrar(tsInitialize)
+
 registrar(dbndInitialize)
+
+#=head3 Deadband Filter C<"dbnd">
+#
+# This filter implements a channel-specific monitor deadband, which is applied
+# after any deadbands implemented by the record itself (it can only drop updates
+# that the unfiltered channel generates, never add additional updates).
+#
+# The deadband can be specified as an absolute value change, or as a relative
+# percentage.
+#
+#=head4 Parameters
+#
+#=over 4
+#
+#=item Deadband C<"d">
+#
+# The size of the deadband to use.
+# Relative deadband values are given as a numeric percentage, but without any
+# trailing percent character.
+#
+#=item Mode C<"m"> (optional)
+#
+# A string (enclosed in double-quotes C<">), which should contain either
+# C<abs> or C<rel>.
+# The default mode is absolute if no mode parameter is included.
+#
+#=back
+#
+#=head4 Example
+#
+#  Hal$ camonitor 'test:channel'
+#  test:channel                    2012-09-01 22:10:19.600595 1 LOLO MAJOR
+#  test:channel                    2012-09-01 22:10:20.600661 2 LOLO MAJOR
+#  test:channel                    2012-09-01 22:10:21.600819 3 LOW MINOR
+#  test:channel                    2012-09-01 22:10:22.600905 4 LOW MINOR
+#  test:channel                    2012-09-01 22:10:23.601023 5  
+#  test:channel                    2012-09-01 22:10:24.601136 6 HIGH MINOR
+#  ^C
+#  Hal$ camonitor 'test:channel.{"dbnd":{"d":1.5}}'
+#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:49.613341 1 LOLO MAJOR
+#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:51.613615 3 LOW MINOR
+#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:53.613804 5  
+#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:55.614074 7 HIGH MINOR
+#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:57.614305 9 HIHI MAJOR
+#  ^C
+#
+
 registrar(arrInitialize)
+
+#=head3 Array Filter C<"arr">
+#
+# ...
+#
+
 registrar(syncInitialize)
+
+#=head3 Synchronize Filter C<"sync">
+#
+# ...
+#
+

From 29a9ad3f90770b9caa0de8b6106e603d15368751 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 4 Sep 2012 00:35:17 -0500
Subject: [PATCH 07/25] Make the DBD parser recognize Pod syntax directly

Source DBD files can include Pod blocks, as long as the dbdExpand.pl
script doesn't try and include it in expanded DBD output files.
This makes it easier to write the Pod, and perldoc can parse most
of the result for checking (it complains about the =field directives
though, which dbdToHtml.pl handles itself).
---
 src/tools/DBD.pm            | 16 +++++++++++++---
 src/tools/DBD/Base.pm       | 12 +++++++++---
 src/tools/DBD/Breaktable.pm | 10 ++++++++++
 src/tools/DBD/Menu.pm       |  4 ++--
 src/tools/DBD/Parser.pm     | 30 ++++++++++++++++++++++++++----
 src/tools/DBD/Recfield.pm   |  4 ++--
 src/tools/DBD/Recordtype.pm | 10 ++++++++++
 src/tools/dbdToHtml.pl      | 19 ++++++++-----------
 8 files changed, 80 insertions(+), 25 deletions(-)

diff --git a/src/tools/DBD.pm b/src/tools/DBD.pm
index 2d7180dcb..3189588c3 100644
--- a/src/tools/DBD.pm
+++ b/src/tools/DBD.pm
@@ -22,7 +22,8 @@ sub new {
         'DBD::Recordtype' => {},
         'DBD::Registrar'  => {},
         'DBD::Variable'   => {},
-        'COMMENTS'        => []
+        'COMMENTS'        => [],
+        'POD'             => []
     };
     bless $this, $class;
     return $this;
@@ -45,14 +46,23 @@ sub add {
 }
 
 sub add_comment {
-    my ($this, $comment) = @_;
-    push @{$this->{COMMENTS}}, $comment;
+    my $this = shift;
+    push @{$this->{COMMENTS}}, @_;
 }
 
 sub comments {
     return @{shift->{COMMENTS}};
 }
 
+sub add_pod {
+    my $this = shift;
+    push @{$this->{POD}}, @_;
+}
+
+sub pod {
+    return @{shift->{POD}};
+}
+
 sub breaktables {
     return shift->{'DBD::Breaktable'};
 }
diff --git a/src/tools/DBD/Base.pm b/src/tools/DBD/Base.pm
index 8c6b80cbb..b0388d725 100644
--- a/src/tools/DBD/Base.pm
+++ b/src/tools/DBD/Base.pm
@@ -104,7 +104,7 @@ sub escapeCstring {
 }
 
 
-# Base class routines for the DBD component objects
+# Base methods for the DBD component objects
 
 sub new {
     my $class = shift;
@@ -129,8 +129,14 @@ sub what {
 }
 
 sub add_comment {
-    my ($this, $comment) = @_;
-    # Ignore
+    my $this = shift;
+    confess "add_comment() not supported by $this->{WHAT} ($this)\n",
+        "Context: ", join(' in ', @context), "\n";
+}
+
+sub add_pod {
+    my $this = shift;
+    warnContext "Warning: Pod text inside $this->{WHAT} will be ignored";
 }
 
 sub equals {
diff --git a/src/tools/DBD/Breaktable.pm b/src/tools/DBD/Breaktable.pm
index 8d2479834..eb7bea6c9 100644
--- a/src/tools/DBD/Breaktable.pm
+++ b/src/tools/DBD/Breaktable.pm
@@ -8,6 +8,7 @@ sub init {
     my ($this, $name) = @_;
     $this->SUPER::init($name, "breakpoint table");
     $this->{POINT_LIST} = [];
+    $this->{COMMENTS} = [];
     return $this;
 }
 
@@ -31,6 +32,15 @@ sub point {
     return $this->{POINT_LIST}[$idx];
 }
 
+sub add_comment {
+    my $this = shift;
+    push @{$this->{COMMENTS}}, @_;
+}
+
+sub comments {
+    return @{shift->{COMMENTS}};
+}
+
 sub equals {
     my ($a, $b) = @_;
     return $a->SUPER::equals($b)
diff --git a/src/tools/DBD/Menu.pm b/src/tools/DBD/Menu.pm
index 357f8792c..65bae1526 100644
--- a/src/tools/DBD/Menu.pm
+++ b/src/tools/DBD/Menu.pm
@@ -41,8 +41,8 @@ sub legal_choice {
 }
 
 sub add_comment {
-    my ($this, $comment) = @_;
-    push @{$this->{COMMENTS}}, $comment;
+    my $this = shift;
+    push @{$this->{COMMENTS}}, @_;
 }
 
 sub comments {
diff --git a/src/tools/DBD/Parser.pm b/src/tools/DBD/Parser.pm
index af7afeaaf..90d02e866 100644
--- a/src/tools/DBD/Parser.pm
+++ b/src/tools/DBD/Parser.pm
@@ -74,18 +74,22 @@ sub parseCommon {
         # Skip leading whitespace
         m/\G \s* /oxgc;
 
-        if (m/\G \# /oxgc) {
-            if (m/\G \#!BEGIN\{ ( [^}]* ) \}!\#\# \n/oxgc) {
+        # Extract POD
+        if (m/\G ( = [a-zA-Z] .* ) \n/oxgc) {
+            $obj->add_pod($1, &parsePod);
+        }
+        elsif (m/\G \# /oxgc) {
+            if (m/\G \# ! BEGIN \{ ( [^}]* ) \} ! \# \# \n/oxgc) {
                 print "File-Begin: $1\n" if $debug;
                 pushContext("file '$1'");
             }
-            elsif (m/\G \#!END\{ ( [^}]* ) \}!\#\# \n?/oxgc) {
+            elsif (m/\G \# ! END \{ ( [^}]* ) \} ! \# \# \n?/oxgc) {
                 print "File-End: $1\n" if $debug;
                 popContext("file '$1'");
             }
             else {
                 m/\G (.*) \n/oxgc;
-		$obj->add_comment($1);
+                $obj->add_comment($1);
                 print "Comment: $1\n" if $debug;
             }
         } else {
@@ -94,6 +98,24 @@ sub parseCommon {
     }
 }
 
+sub parsePod {
+    pushContext("Pod markup");
+    my @pod;
+    while (1) {
+        if (m/\G ( =cut .* ) \n?/oxgc) {
+            push @pod, $1;
+            popContext("Pod markup");
+            return @pod;
+        }
+        elsif (m/\G ( .* ) $/oxgc) {
+            dieContext("Unexpected end of input file, Pod block not closed");
+        }
+        elsif (m/\G ( .* ) \n/oxgc) {
+            push @pod, $1
+        }
+    }
+}
+
 sub parse_menu {
     my ($dbd, $name) = @_;
     pushContext("menu($name)");
diff --git a/src/tools/DBD/Recfield.pm b/src/tools/DBD/Recfield.pm
index 0feaded56..6dbf1696f 100644
--- a/src/tools/DBD/Recfield.pm
+++ b/src/tools/DBD/Recfield.pm
@@ -111,8 +111,8 @@ sub check_valid {
 }
 
 sub add_comment {
-    my ($this, $comment) = @_;
-    push @{$this->{COMMENTS}}, $comment;
+    my $this = shift;
+    push @{$this->{COMMENTS}}, @_;
 }
 
 sub comments {
diff --git a/src/tools/DBD/Recordtype.pm b/src/tools/DBD/Recordtype.pm
index 27b714124..d8c5e7654 100644
--- a/src/tools/DBD/Recordtype.pm
+++ b/src/tools/DBD/Recordtype.pm
@@ -13,6 +13,7 @@ sub init {
     $this->{DEVICE_INDEX} = {};
     $this->{CDEFS} = [];
     $this->{COMMENTS} = [];
+    $this->{POD} = [];
     return $this;
 }
 
@@ -92,6 +93,15 @@ sub toCdefs {
     return join("\n", shift->cdefs) . "\n\n";
 }
 
+sub add_pod {
+    my $this = shift;
+    push @{$this->{POD}}, @_;
+}
+
+sub pod {
+    return @{shift->{POD}};
+}
+
 sub equals {
     my ($a, $b) = @_;
     dieContext("Duplicate definition of record type '$a->{NAME}'");
diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl
index 56f1c9414..42779a008 100644
--- a/src/tools/dbdToHtml.pl
+++ b/src/tools/dbdToHtml.pl
@@ -46,36 +46,33 @@ if ($opt_D) {   # Output dependencies only
 
 open my $out, '>', $opt_o or die "Can't create $opt_o: $!\n";
 
-# Grab the comments from the root DBD object
-# Strip a single leading space off all comment lines
-my @pod = map { s/^ //; $_ } $dbd->comments;
+# Grab the Pod text from the root DBD object
+my @pod = $dbd->pod;
 
 my $rtypes = $dbd->recordtypes;
 
-# Process the comments from any record types defined
+# Append the processed Pod text from any record types defined
 while (my ($rn, $rtyp) = each %{$rtypes}) {
-    foreach my $_ ($rtyp->comments) {
-        # Strip a single leading space
-        s/^ //;
+    foreach my $_ ($rtyp->pod) {
         # Handle our 'fields' Pod directive
         if (m/^=fields (.*)/) {
             my @names = split /\s*,\s*/, $1;
-	    # Look up every named field
+            # Look up every named field
             my @fields = map {
                     my $field = $rtyp->field($_);
                     print STDERR "Unknown field name '$_' in $infile POD\n" unless $field;
                     $field;
                 } @names;
             my $html;
-	    # Generate a HTML table row for each field
+            # Generate a HTML table row for each field
             foreach $field (@fields) {
                 $html .= $field->htmlTableRow if $field;
             }
-	    # Add the complete table
+            # Add the complete table
             push @pod, podTable($html);
         }
         else {
-	    # Add other comments
+            # Add other Pod text
             push @pod, $_;
         }
     }

From d2d40b901ae3b90f8b5f079b24694d26dfd91091 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Tue, 4 Sep 2012 00:40:37 -0500
Subject: [PATCH 08/25] Update the initial documentation to normal Pod syntax

---
 src/std/filters/filters.dbd    | 252 +++++++++++++++--------------
 src/std/rec/aiRecord.dbd       | 288 +++++++++++++++++----------------
 src/std/rec/compressRecord.dbd |  15 +-
 3 files changed, 281 insertions(+), 274 deletions(-)

diff --git a/src/std/filters/filters.dbd b/src/std/filters/filters.dbd
index 69a40b9fc..9dbc97feb 100644
--- a/src/std/filters/filters.dbd
+++ b/src/std/filters/filters.dbd
@@ -1,137 +1,141 @@
-#=head1 Channel Filters
-#
-# Channel Filters can be applied to Channel Access channels by a client, using
-# a JSON Field Modifier to select the filter and any parameters.
-# The following filters are available in this release:
-#
-#=over 4
-#
-#=item * L<TimeStamp|/"TimeStamp Filter "ts"">
-#
-#=item * L<Deadband|/"Deadband Filter "dbnd"">
-#
-#=item * L<Array|/"Array Filter "arr"">
-#
-#=item * L<Synchronize|/"Synchronize Filter "sync"">
-#
-#=back
-#
-#=head2 Using Filters
-#
-# Channel filters can be added to any Channel Access channel name.
-# There can be more than one filter applied to the same channel, in which case the
-# order that they are specified will control the order in which they are applied
-# to the resulting data-stream.
-# The filter specification must appear after the field name, or if the default
-# (VAL) field is used after a dot C<.> appended to the record name.
-# With the exception of the array short-hand which is described below, all filters
-# must appear inside a pair of braces C< {} > after the dot expressed as a JSON
-# (L<JavaScript Object Notation|http://www.json.org/>) object, which allows filter
-# parameters to be included as needed.
-#
-# Each filter is given as a name/value pair. The filter name (given in parentheses
-# in the titles below) is a string, and must be enclosed inside double-quotes C<">
-# characters as per the JSON specification.
-# Parameters to that filter are provided as the value part of the name/value pair,
-# and will normally appear as a child JSON object consisting of name/value pairs
-# inside a nested pair of braces C< {} >.
-#
-#=head4 Example Filter
-#
-# Given a record called C<test:channel> the following would apply a filter C<f> to
-# the VAL field of that record, giving the filter two numeric parameters named C<lo>
-# and C<hi>:
-#
-#  test:channel.{"f":{"lo":0,"hi":10}}
-#
-# Note that due to the required presence of the double-quote characters in the JSON
-# strings in the name string, it will usually be necessary to enclose a filtered name
-# within single-quotes C<< ' E<hellip> ' >> when typing it as an argument to a Unix
-# shell command.
-#
-#=head2 Filter Reference
-#
+=head1 Channel Filters
+
+Channel Filters can be applied to Channel Access channels by a client, using
+a JSON Field Modifier to select the filter and any parameters.
+The following filters are available in this release:
+
+=over 4
+
+=item * L<TimeStamp|/"TimeStamp Filter "ts"">
+
+=item * L<Deadband|/"Deadband Filter "dbnd"">
+
+=item * L<Array|/"Array Filter "arr"">
+
+=item * L<Synchronize|/"Synchronize Filter "sync"">
+
+=back
+
+=head2 Using Filters
+
+Channel filters can be added to any Channel Access channel name.
+There can be more than one filter applied to the same channel, in which case the
+order that they are specified will control the order in which they are applied
+to the resulting data-stream.
+The filter specification must appear after the field name, or if the default
+(VAL) field is used after a dot C<.> appended to the record name.
+With the exception of the array short-hand which is described below, all filters
+must appear inside a pair of braces C< {} > after the dot expressed as a JSON
+(L<JavaScript Object Notation|http://www.json.org/>) object, which allows filter
+parameters to be included as needed.
+
+Each filter is given as a name/value pair. The filter name (given in parentheses
+in the titles below) is a string, and must be enclosed inside double-quotes C<">
+characters as per the JSON specification.
+Parameters to that filter are provided as the value part of the name/value pair,
+and will normally appear as a child JSON object consisting of name/value pairs
+inside a nested pair of braces C< {} >.
+
+=head4 Example Filter
+
+Given a record called C<test:channel> the following would apply a filter C<f> to
+the VAL field of that record, giving the filter two numeric parameters named
+C<lo> and C<hi>:
+
+ test:channel.{"f":{"lo":0,"hi":10}}
+
+Note that due to the required presence of the double-quote characters in the
+JSON strings in the name string, it will usually be necessary to enclose a
+filtered name within single-quotes C<< ' E<hellip> ' >> when typing it as an
+argument to a Unix shell command.
+
+=head2 Filter Reference
+
+=cut
 
 registrar(tsInitialize)
 
-#=head3 TimeStamp Filter C<"ts">
-#
-# This filter is used to set the timestamp of the (first) value fetched through the
-# channel to the connection time, rather than the time the record last processed
-# which could have been days or even weeks ago for some records, or set to the
-# EPICS epoch if the record has never processed.
-#
-#=head4 Parameters
-#
-# None, use an empty pair of braces.
-#
-#=head4 Example
-#
-#  Hal$ caget -a 'test:channel.{"ts":{}}'
-#  test:channel.{"ts":{}}   2012-08-28 22:10:31.192547 0 UDF INVALID
-#  Hal$ caget -a 'test:channel'
-#  test:channel             <undefined> 0 UDF INVALID
-#
+=head3 TimeStamp Filter C<"ts">
+
+This filter is used to set the timestamp of the (first) value fetched through
+the channel to the connection time, rather than the time the record last
+processed which could have been days or even weeks ago for some records, or set
+to the EPICS epoch if the record has never processed.
+
+=head4 Parameters
+
+None, use an empty pair of braces.
+
+=head4 Example
+
+ Hal$ caget -a 'test:channel.{"ts":{}}'
+ test:channel.{"ts":{}}   2012-08-28 22:10:31.192547 0 UDF INVALID
+ Hal$ caget -a 'test:channel'
+ test:channel             <undefined> 0 UDF INVALID
+
+=cut
 
 registrar(dbndInitialize)
 
-#=head3 Deadband Filter C<"dbnd">
-#
-# This filter implements a channel-specific monitor deadband, which is applied
-# after any deadbands implemented by the record itself (it can only drop updates
-# that the unfiltered channel generates, never add additional updates).
-#
-# The deadband can be specified as an absolute value change, or as a relative
-# percentage.
-#
-#=head4 Parameters
-#
-#=over 4
-#
-#=item Deadband C<"d">
-#
-# The size of the deadband to use.
-# Relative deadband values are given as a numeric percentage, but without any
-# trailing percent character.
-#
-#=item Mode C<"m"> (optional)
-#
-# A string (enclosed in double-quotes C<">), which should contain either
-# C<abs> or C<rel>.
-# The default mode is absolute if no mode parameter is included.
-#
-#=back
-#
-#=head4 Example
-#
-#  Hal$ camonitor 'test:channel'
-#  test:channel                    2012-09-01 22:10:19.600595 1 LOLO MAJOR
-#  test:channel                    2012-09-01 22:10:20.600661 2 LOLO MAJOR
-#  test:channel                    2012-09-01 22:10:21.600819 3 LOW MINOR
-#  test:channel                    2012-09-01 22:10:22.600905 4 LOW MINOR
-#  test:channel                    2012-09-01 22:10:23.601023 5  
-#  test:channel                    2012-09-01 22:10:24.601136 6 HIGH MINOR
-#  ^C
-#  Hal$ camonitor 'test:channel.{"dbnd":{"d":1.5}}'
-#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:49.613341 1 LOLO MAJOR
-#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:51.613615 3 LOW MINOR
-#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:53.613804 5  
-#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:55.614074 7 HIGH MINOR
-#  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:57.614305 9 HIHI MAJOR
-#  ^C
-#
+=head3 Deadband Filter C<"dbnd">
+
+This filter implements a channel-specific monitor deadband, which is applied
+after any deadbands implemented by the record itself (it can only drop updates
+that the unfiltered channel generates, never add additional updates).
+
+The deadband can be specified as an absolute value change, or as a relative
+percentage.
+
+=head4 Parameters
+
+=over 4
+
+=item Deadband C<"d">
+
+The size of the deadband to use.
+Relative deadband values are given as a numeric percentage, but without any
+trailing percent character.
+
+=item Mode C<"m"> (optional)
+
+A string (enclosed in double-quotes C<">), which should contain either
+C<abs> or C<rel>.
+The default mode is absolute if no mode parameter is included.
+
+=back
+
+=head4 Example
+
+ Hal$ camonitor 'test:channel'
+ test:channel                    2012-09-01 22:10:19.600595 1 LOLO MAJOR
+ test:channel                    2012-09-01 22:10:20.600661 2 LOLO MAJOR
+ test:channel                    2012-09-01 22:10:21.600819 3 LOW MINOR
+ test:channel                    2012-09-01 22:10:22.600905 4 LOW MINOR
+ test:channel                    2012-09-01 22:10:23.601023 5  
+ test:channel                    2012-09-01 22:10:24.601136 6 HIGH MINOR
+ ^C
+ Hal$ camonitor 'test:channel.{"dbnd":{"d":1.5}}'
+ test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:49.613341 1 LOLO MAJOR
+ test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:51.613615 3 LOW MINOR
+ test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:53.613804 5  
+ test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:55.614074 7 HIGH MINOR
+ test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:57.614305 9 HIHI MAJOR
+ ^C
+
+=cut
 
 registrar(arrInitialize)
 
-#=head3 Array Filter C<"arr">
-#
-# ...
-#
+=head3 Array Filter C<"arr">
+
+...
+
+=cut
 
 registrar(syncInitialize)
 
-#=head3 Synchronize Filter C<"sync">
-#
-# ...
-#
+=head3 Synchronize Filter C<"sync">
 
+...
+
+=cut
diff --git a/src/std/rec/aiRecord.dbd b/src/std/rec/aiRecord.dbd
index 7b54fe89d..cc5171cf4 100644
--- a/src/std/rec/aiRecord.dbd
+++ b/src/std/rec/aiRecord.dbd
@@ -7,149 +7,151 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 recordtype(ai) {
-	#=head1 Analog Input (ai)
-	#
-	# This record type is normally used to obtain an analog value from
-	# a hardware input and convert it to engineering units. The record
-	# supports linear and break-point conversion to engineering units,
-	# smoothing, alarm limits, alarm filtering, and graphics and control
-	# limits.
-	#
-	#=head2 Parameter Fields
-	#
-	# The record fields are described below grouped by functionality.
-	#
-	#=head3 Input Specification
-	#
-	# These fields control where (if anywhere) the record reads data from
-	# when it is processed:
-	#
-	#=fields INP, DTYP
-	#
-	# I<Description?>
-	#
-	#=head3 Units Conversion
-	#
-	# These fields control how the raw input value gets converted into
-	# engineering units:
-	#
-	#=fields RVAL, ROFF, ASLO, AOFF, LINR, ESLO, EOFF, EGUL, EGUF
-	#
-	# These fields are not used if the device support layer reads its
-	# value in engineering units and puts it directly into the VAL field.
-	#
-	# If the device support sets the RVAL field, the LINR field controls
-	# how this gets converted into engineering units and placed in the
-	# VAL field as follows:
-	#
-	#=over 4
-	#
-	#=item 1. RVAL is converted to a double and ROFF is added to it
-	#
-	#=item 2. If ASLO is non-zero the value is multiplied by ASLO
-	#
-	#=item 3. AOFF is added
-	#
-	#=item 4. If LINR is C<NO CONVERSION> the units conversion is finished
-	# after the above steps
-	#
-	#=item 5. If LINR is C<LINEAR> or C<SLOPE>, the value from step 3
-	# above is multiplied by ESLO and EOFF is added to complete the units
-	# conversion process
-	#
-	#=item 6. Any other value for LINR selects a particular breakpoint
-	# table to be used on the value from step 3 above
-	#
-	#=back
-	#
-	# The distinction between the C<LINEAR> and C<SLOPE> settings for the
-	# LINR field are in how the conversion parameters are calculated:
-	#
-	#=over 4
-	#
-	#=item *
-	# With C<LINEAR> conversion the user must set EGUL and EGUF to the
-	# lowest and highest possible engineering units values respectively
-	# that can be converted by the hardware. The device support knows
-	# the range of the raw data and calculates ESLO and EOFF from them.
-	#
-	#=item *
-	# C<SLOPE> conversion requires the user to calculate the appropriate
-	# scaling and offset factors and put them directly in ESLO and EOFF.
-	#
-	#=back
-	#
-	#=head3 Smoothing Filter
-	#
-	# This filter is usually only used if the device support sets the RVAL
-	# field and the Units Conversion process is used. Device support that
-	# directly sets the VAL field may implement the filter if desired.
-	#
-	# The filter is controlled with a single parameter field:
-	#
-	#=fields SMOO
-	#
-	# The SMOO field should be set to a number between 0 and 1. If set to
-	# zero the filter is not used (no smoothing), while if set to one the
-	# result is infinite smoothing (the VAL field will never change). The
-	# calculation performed is:
-	#
-	#     VAL = VAL * SMOO + (1 - SMOO) * New Data
-	#
-	# where C<New Data> was the result from the Units Conversion above.
-	# This implements a first-order infinite impulse response (IIR)
-	# digital filter with z-plane pole at SMOO. The equivalent
-	# continuous-time filter time constant E<tau> is given by
-	#
-	#=over 4
-	#
-	# E<tau> = E<minus>T / ln(SMOO)
-	#
-	#=back
-	#
-	# where T is the time between record processing.
-	#
-	#=head3 Undefined Check
-	#
-	# If after applying the smoothing filter the VAL field contains a NaN
-	# (Not-a-Number) value, the UDF field is set to indicate that the
-	# record value is undefined, which triggers a C<UDF_ALARM> with
-	# severity C<INVALID_ALARM>.
-	#
-	#=fields UDF
-	#
-	#=head3 Operator Display Parameters
-	#
-	# These parameters are used to present meaningful data to the operator.
-	#
-	#=over 4
-	#
-	#=item *
-	# DESC is a string that is usually used to briefly describe the record.
-	#
-	#=item *
-	# EGU is a string of up to 16 characters giving the units that the
-	# analog input measures.
-	#
-	#=item *
-	# The HOPR and LOPR fields set the upper and lower display limits for
-	# the VAL, HIHI, HIGH, LOW, and LOLO fields.
-	#
-	#=item *
-	# The PREC field determines the floating point precision with which
-	# to display VAL.
-	#
-	#=back
-	#
-	#=fields DESC, EGU, HOPR, LOPR, PREC
-	#
-	#=head3 Alarm Parameters
-	#
-	# ...
-	#
-	#=fields HIHI, HIGH, LOW, LOLO, HHSV, HSV, LSV, LLSV, HYST, AFTC
-	#
-	#=cut
+
+=head1 Analog Input (ai)
+
+This record type is normally used to obtain an analog value from
+a hardware input and convert it to engineering units. The record
+supports linear and break-point conversion to engineering units,
+smoothing, alarm limits, alarm filtering, and graphics and control
+limits.
+
+=head2 Parameter Fields
+
+The record fields are described below grouped by functionality.
+
+=head3 Input Specification
+
+These fields control where (if anywhere) the record reads data from
+when it is processed:
+
+=fields INP, DTYP
+
+I<Description?>
+
+=head3 Units Conversion
+
+These fields control how the raw input value gets converted into
+engineering units:
+
+=fields RVAL, ROFF, ASLO, AOFF, LINR, ESLO, EOFF, EGUL, EGUF
+
+These fields are not used if the device support layer reads its
+value in engineering units and puts it directly into the VAL field.
+
+If the device support sets the RVAL field, the LINR field controls
+how this gets converted into engineering units and placed in the
+VAL field as follows:
+
+=over 4
+
+=item 1. RVAL is converted to a double and ROFF is added to it
+
+=item 2. If ASLO is non-zero the value is multiplied by ASLO
+
+=item 3. AOFF is added
+
+=item 4. If LINR is C<NO CONVERSION> the units conversion is finished
+after the above steps
+
+=item 5. If LINR is C<LINEAR> or C<SLOPE>, the value from step 3
+above is multiplied by ESLO and EOFF is added to complete the units
+conversion process
+
+=item 6. Any other value for LINR selects a particular breakpoint
+table to be used on the value from step 3 above
+
+=back
+
+The distinction between the C<LINEAR> and C<SLOPE> settings for the
+LINR field are in how the conversion parameters are calculated:
+
+=over 4
+
+=item *
+With C<LINEAR> conversion the user must set EGUL and EGUF to the
+lowest and highest possible engineering units values respectively
+that can be converted by the hardware. The device support knows
+the range of the raw data and calculates ESLO and EOFF from them.
+
+=item *
+C<SLOPE> conversion requires the user to calculate the appropriate
+scaling and offset factors and put them directly in ESLO and EOFF.
+
+=back
+
+=head3 Smoothing Filter
+
+This filter is usually only used if the device support sets the RVAL
+field and the Units Conversion process is used. Device support that
+directly sets the VAL field may implement the filter if desired.
+
+The filter is controlled with a single parameter field:
+
+=fields SMOO
+
+The SMOO field should be set to a number between 0 and 1. If set to
+zero the filter is not used (no smoothing), while if set to one the
+result is infinite smoothing (the VAL field will never change). The
+calculation performed is:
+
+ VAL = VAL * SMOO + (1 - SMOO) * New Data
+
+where C<New Data> was the result from the Units Conversion above.
+This implements a first-order infinite impulse response (IIR)
+digital filter with z-plane pole at SMOO. The equivalent
+continuous-time filter time constant E<tau> is given by
+
+=over 4
+
+E<tau> = E<minus>T / ln(SMOO)
+
+=back
+
+where T is the time between record processing.
+
+=head3 Undefined Check
+
+If after applying the smoothing filter the VAL field contains a NaN
+(Not-a-Number) value, the UDF field is set to indicate that the
+record value is undefined, which triggers a C<UDF_ALARM> with
+severity C<INVALID_ALARM>.
+
+=fields UDF
+
+=head3 Operator Display Parameters
+
+These parameters are used to present meaningful data to the operator.
+
+=over 4
+
+=item *
+DESC is a string that is usually used to briefly describe the record.
+
+=item *
+EGU is a string of up to 16 characters giving the units that the
+analog input measures.
+
+=item *
+The HOPR and LOPR fields set the upper and lower display limits for
+the VAL, HIHI, HIGH, LOW, and LOLO fields.
+
+=item *
+The PREC field determines the floating point precision with which
+to display VAL.
+
+=back
+
+=fields DESC, EGU, HOPR, LOPR, PREC
+
+=head3 Alarm Parameters
+
+...
+
+=fields HIHI, HIGH, LOW, LOLO, HHSV, HSV, LSV, LLSV, HYST, AFTC
+
+=cut
+
 	include "dbCommon.dbd" 
 	field(VAL,DBF_DOUBLE) {
 		prompt("Current EGU Value")
diff --git a/src/std/rec/compressRecord.dbd b/src/std/rec/compressRecord.dbd
index 96190331c..54d1625e5 100644
--- a/src/std/rec/compressRecord.dbd
+++ b/src/std/rec/compressRecord.dbd
@@ -3,8 +3,7 @@
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 menu(compressALG) {
@@ -16,11 +15,13 @@ menu(compressALG) {
 	choice(compressALG_N_to_1_Median,"N to 1 Median")
 }
 recordtype(compress) {
-	#=head1 Compress Record (compress)
-	#
-	#=fields VAL
-	#
-	#=cut
+
+=head1 Compress Record (compress)
+
+=fields VAL
+
+=cut
+
 	include "dbCommon.dbd" 
 	field(VAL,DBF_NOACCESS) {
 		prompt("Value")

From eb908c6ebf8d6a46f18f2c0d547bba4509bbc031 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 1 Oct 2012 17:29:11 -0500
Subject: [PATCH 09/25] Make HTMLS_DIR default to . if not set.

Remove HTMLS_DIR setting for files generated from DBD/POD.
---
 configure/RULES_BUILD | 2 ++
 src/std/Makefile      | 1 -
 src/tools/Makefile    | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index a0699e5d2..0c6e7bd9e 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -68,6 +68,8 @@ else
 INSTALL_TEMPLATES_SUBDIR = $(INSTALL_TEMPLATES)
 endif
 
+HTMLS_DIR ?= .
+
 #---------------------------------------------------------------
 #	First target
 
diff --git a/src/std/Makefile b/src/std/Makefile
index 63ef02054..cde499d75 100644
--- a/src/std/Makefile
+++ b/src/std/Makefile
@@ -11,7 +11,6 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 
 STDDIR=$(TOP)/src/std
-HTMLS_DIR = std
 
 LIBRARY_IOC += dbRecStd
 dbRecStd_LIBS = dbCore ca Com
diff --git a/src/tools/Makefile b/src/tools/Makefile
index 88707df47..d62e4bba1 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -51,7 +51,6 @@ PERL_SCRIPTS += dbdExpand.pl
 PERL_SCRIPTS += dbdToHtml.pl
 PERL_SCRIPTS += registerRecordDeviceDriver.pl
 
-HTMLS_DIR = std
 HTMLS = style.css
 
 include $(TOP)/configure/RULES

From f519b63a6f0824488c8859fa19c700570a4c1604 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 1 Oct 2012 17:35:23 -0500
Subject: [PATCH 10/25] tools/DBD: Don't include =cut lines in the captured
 POD.

---
 src/tools/DBD/Parser.pm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/tools/DBD/Parser.pm b/src/tools/DBD/Parser.pm
index 90d02e866..a55fca20d 100644
--- a/src/tools/DBD/Parser.pm
+++ b/src/tools/DBD/Parser.pm
@@ -103,7 +103,6 @@ sub parsePod {
     my @pod;
     while (1) {
         if (m/\G ( =cut .* ) \n?/oxgc) {
-            push @pod, $1;
             popContext("Pod markup");
             return @pod;
         }

From a05f022e441d97dd008ced666309bf87d65005e4 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 1 Oct 2012 17:38:08 -0500
Subject: [PATCH 11/25] Reorganize where the POD should be placed

The converter now only handles POD from the root DBD object.
However there are commands that pull POD out of named sub-objects.
This also adds generating tables from menu choices.
---
 src/ioc/db/Makefile            |   1 +
 src/ioc/db/menuAlarmSevr.dbd   |  15 +-
 src/std/rec/aiRecord.dbd       | 809 +++++++++++++++++++++------------
 src/std/rec/subArrayRecord.dbd |   2 +-
 src/std/rec/waveformRecord.dbd |  34 +-
 src/tools/dbdToHtml.pl         | 138 ++++--
 6 files changed, 660 insertions(+), 339 deletions(-)

diff --git a/src/ioc/db/Makefile b/src/ioc/db/Makefile
index 8788207fe..b6ac6c0f1 100644
--- a/src/ioc/db/Makefile
+++ b/src/ioc/db/Makefile
@@ -57,6 +57,7 @@ menuGlobal_DBD += menuSimm.dbd
 DBDINC += $(basename $(menuGlobal_DBD))
 DBDINC += dbCommon
 
+HTMLS += $(patsubst %.dbd,%.html,$(menuGlobal_DBD))
 
 dbCore_SRCS += dbLock.c
 dbCore_SRCS += dbAccess.c
diff --git a/src/ioc/db/menuAlarmSevr.dbd b/src/ioc/db/menuAlarmSevr.dbd
index ae6661a9e..8287bf86e 100644
--- a/src/ioc/db/menuAlarmSevr.dbd
+++ b/src/ioc/db/menuAlarmSevr.dbd
@@ -1,12 +1,21 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+
+=head1 Menu menuAlarmSevr
+
+This menu defines the four possible alarm severities that EPICS records can
+exhibit.
+
+=menu menuAlarmSevr
+
+=cut
+
 menu(menuAlarmSevr) {
 	choice(menuAlarmSevrNO_ALARM,"NO_ALARM")
 	choice(menuAlarmSevrMINOR,"MINOR")
diff --git a/src/std/rec/aiRecord.dbd b/src/std/rec/aiRecord.dbd
index cc5171cf4..aa75cd3b6 100644
--- a/src/std/rec/aiRecord.dbd
+++ b/src/std/rec/aiRecord.dbd
@@ -6,101 +6,138 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
-recordtype(ai) {
 
-=head1 Analog Input (ai)
+=head1 Analog Input Record (ai)
 
-This record type is normally used to obtain an analog value from
-a hardware input and convert it to engineering units. The record
-supports linear and break-point conversion to engineering units,
-smoothing, alarm limits, alarm filtering, and graphics and control
-limits.
+This record type is normally used to obtain an analog value from a hardware
+input and convert it to engineering units.
+The record supports linear and break-point conversion to engineering units,
+smoothing, alarm limits, alarm filtering, and graphics and control limits.
 
 =head2 Parameter Fields
 
-The record fields are described below grouped by functionality.
+The record-specific fields are described below, grouped by functionality.
+
+=recordtype ai
+
+=cut
+
+recordtype(ai) {
 
 =head3 Input Specification
 
-These fields control where (if anywhere) the record reads data from
-when it is processed:
+These fields control where the record will read data from when it is processed:
 
-=fields INP, DTYP
+=fields DTYP, INP
 
-I<Description?>
+The DTYP field selects which device support layer should be responsible for
+providing input data to the record.
+The ai device support layers provided by EPICS Base are documented in the
+L<Device Support|devSoft> section.
+External support modules may provide additional device support for this record
+type.
+If not set explicitly, the DTYP value defaults to the first device support that
+is loaded for the record type, which will usually be the C<Soft Channel> support
+that comes with Base.
+
+The INP link field contains a database or channel access link or provides
+hardware address information that the device support uses to determine where the
+input data should come from.
+The format for the INP field value depends on the device support layer that is
+selected by the DTYP field.
+See L<Address Specification|...> for a description of the various hardware
+address formats supported.
 
 =head3 Units Conversion
 
-These fields control how the raw input value gets converted into
+These fields control if and how the raw input value gets converted into
 engineering units:
 
 =fields RVAL, ROFF, ASLO, AOFF, LINR, ESLO, EOFF, EGUL, EGUF
 
-These fields are not used if the device support layer reads its
-value in engineering units and puts it directly into the VAL field.
+These fields are not used if the device support layer reads its value in
+engineering units and puts it directly into the VAL field.
+This applies to Soft Channel and Async Soft Channel device support, and is also
+fairly common for GPIB and similar high-level device interfaces.
 
-If the device support sets the RVAL field, the LINR field controls
-how this gets converted into engineering units and placed in the
-VAL field as follows:
+If the device support sets the RVAL field, the LINR field controls how this gets
+converted into engineering units and placed in the VAL field as follows:
 
 =over 4
 
-=item 1. RVAL is converted to a double and ROFF is added to it
+=item 1.
 
-=item 2. If ASLO is non-zero the value is multiplied by ASLO
+RVAL is converted to a double and ROFF is added to it.
 
-=item 3. AOFF is added
+=item 2.
 
-=item 4. If LINR is C<NO CONVERSION> the units conversion is finished
-after the above steps
+If ASLO is non-zero the value is multiplied by ASLO.
 
-=item 5. If LINR is C<LINEAR> or C<SLOPE>, the value from step 3
-above is multiplied by ESLO and EOFF is added to complete the units
-conversion process
+=item 3.
 
-=item 6. Any other value for LINR selects a particular breakpoint
-table to be used on the value from step 3 above
+AOFF is added.
+
+=item 4.
+
+If LINR is C<NO CONVERSION> the units conversion is finished after the above
+steps.
+
+=item 5.
+
+If LINR is C<LINEAR> or C<SLOPE>, the value from step 3 above is multiplied by
+ESLO and EOFF is added to complete the units conversion process.
+
+=item 6.
+
+Any other value for LINR selects a particular breakpoint table to be used on the
+value from step 3 above.
 
 =back
 
-The distinction between the C<LINEAR> and C<SLOPE> settings for the
-LINR field are in how the conversion parameters are calculated:
+The distinction between the C<LINEAR> and C<SLOPE> settings for the LINR field
+are in how the conversion parameters are calculated:
 
 =over 4
 
 =item *
-With C<LINEAR> conversion the user must set EGUL and EGUF to the
-lowest and highest possible engineering units values respectively
-that can be converted by the hardware. The device support knows
-the range of the raw data and calculates ESLO and EOFF from them.
+With C<LINEAR> conversion the user must set EGUL and EGUF to the lowest and
+highest possible engineering units values respectively that can be converted by
+the hardware.
+The device support knows the range of the raw data and calculates ESLO and EOFF
+from them.
 
 =item *
-C<SLOPE> conversion requires the user to calculate the appropriate
-scaling and offset factors and put them directly in ESLO and EOFF.
+C<SLOPE> conversion requires the user to calculate the appropriate scaling and
+offset factors and put them directly in ESLO and EOFF.
 
 =back
 
 =head3 Smoothing Filter
 
-This filter is usually only used if the device support sets the RVAL
-field and the Units Conversion process is used. Device support that
-directly sets the VAL field may implement the filter if desired.
+This filter is usually only used if the device support sets the RVAL field and
+the Units Conversion process is used.
+Device support that directly sets the VAL field may implement the filter if
+desired.
 
 The filter is controlled with a single parameter field:
 
 =fields SMOO
 
-The SMOO field should be set to a number between 0 and 1. If set to
-zero the filter is not used (no smoothing), while if set to one the
-result is infinite smoothing (the VAL field will never change). The
-calculation performed is:
+The SMOO field should be set to a number between 0 and 1.
+If set to zero the filter is not used (no smoothing), while if set to one the
+result is infinite smoothing (the VAL field will never change).
+The calculation performed is:
 
- VAL = VAL * SMOO + (1 - SMOO) * New Data
+=over 4
+
+VAL = VAL * SMOO + (1 - SMOO) * New Data
+
+=back
 
 where C<New Data> was the result from the Units Conversion above.
-This implements a first-order infinite impulse response (IIR)
-digital filter with z-plane pole at SMOO. The equivalent
-continuous-time filter time constant E<tau> is given by
+This implements a first-order infinite impulse response (IIR) digital filter
+with z-plane pole at SMOO.
+The equivalent continuous-time filter time constant E<tau> is given by
 
 =over 4
 
@@ -113,15 +150,16 @@ where T is the time between record processing.
 =head3 Undefined Check
 
 If after applying the smoothing filter the VAL field contains a NaN
-(Not-a-Number) value, the UDF field is set to indicate that the
-record value is undefined, which triggers a C<UDF_ALARM> with
-severity C<INVALID_ALARM>.
+(Not-a-Number) value, the UDF field is set to a non-zero value, indicating that
+the record value is undefined, which will trigger a C<UDF_ALARM> with severity
+C<INVALID_ALARM>.
 
 =fields UDF
 
 =head3 Operator Display Parameters
 
 These parameters are used to present meaningful data to the operator.
+They do not affect the functioning of the record at all.
 
 =over 4
 
@@ -129,271 +167,464 @@ These parameters are used to present meaningful data to the operator.
 DESC is a string that is usually used to briefly describe the record.
 
 =item *
-EGU is a string of up to 16 characters giving the units that the
-analog input measures.
+EGU is a string of up to 16 characters naming the engineering units that the
+VAL field represents.
 
 =item *
 The HOPR and LOPR fields set the upper and lower display limits for
 the VAL, HIHI, HIGH, LOW, and LOLO fields.
 
 =item *
-The PREC field determines the floating point precision with which
-to display VAL.
+The PREC field determines the floating point precision (i.e. the number of
+digits to show after the decimal point) with which to display VAL and the other
+DOUBLE fields.
 
 =back
 
 =fields DESC, EGU, HOPR, LOPR, PREC
 
-=head3 Alarm Parameters
+=head3 Alarm Limits
 
-...
+The user configures limit alarms by putting numerical values into the HIHI,
+HIGH, LOW and LOLO fields, and by setting the associated alarm severity in the
+corresponding HHSV, HSV, LSV and LLSV menu fields.
+The HYST field controls hysteresis to prevent alarm chattering from an input
+signal that is close to one of the limits and suffers from significant readout
+noise.
+The AFTC field sets the time constant on a low-pass filter that delays the
+reporting of limit alarms until the signal has been within the alarm range for
+that number of seconds (the default AFTC value of zero retains the previous
+behavior).
 
-=fields HIHI, HIGH, LOW, LOLO, HHSV, HSV, LSV, LLSV, HYST, AFTC
+=fields HIHI, HIGH, LOW, LOLO, HHSV, HSV, LSV, LLSV, HYST, AFTC, LALM
+
+=head3 Monitor Parameters
+
+These parameters are used to determine when to send monitors placed on the VAL
+field.
+The monitors are sent when the current value exceeds the last transmitted value
+by the appropriate deadband.
+If these fields are set to zero, a monitor will be triggered every time the
+value changes; if set to -1, a monitor will be sent every time the record is
+processed.
+The ADEL field sets the deadband for archive monitors (C<DBE_LOG> events), while
+the MDEL field controls value monitors (C<DBE_VALUE> events).
+
+The remaining fields are used by the record at run-time to implement the record
+monitoring functionality.
+
+=fields ADEL, MDEL, ALST, MLST, ORAW
 
 =cut
 
-	include "dbCommon.dbd" 
-	field(VAL,DBF_DOUBLE) {
-		prompt("Current EGU Value")
-		promptgroup(GUI_INPUTS)
-		asl(ASL0)
-		pp(TRUE)
-	}
-	field(INP,DBF_INLINK) {
-		prompt("Input Specification")
-		promptgroup(GUI_INPUTS)
-		interest(1)
-	}
-	field(PREC,DBF_SHORT) {
-		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
+    include "dbCommon.dbd" 
+    field(VAL,DBF_DOUBLE) {
+        prompt("Current EGU Value")
+        promptgroup(GUI_INPUTS)
+        asl(ASL0)
+        pp(TRUE)
+    }
+    field(INP,DBF_INLINK) {
+        prompt("Input Specification")
+        promptgroup(GUI_INPUTS)
+        interest(1)
+    }
+    field(PREC,DBF_SHORT) {
+        prompt("Display Precision")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
 		prop(YES)
-	}
-	field(LINR,DBF_MENU) {
-		prompt("Linearization")
-		promptgroup(GUI_CONVERT)
-		special(SPC_LINCONV)
-		pp(TRUE)
-		interest(1)
-		menu(menuConvert)
-	}
-	field(EGUF,DBF_DOUBLE) {
-		prompt("Engineer Units Full")
-		promptgroup(GUI_CONVERT)
-		special(SPC_LINCONV)
-		pp(TRUE)
-		interest(1)
-	}
-	field(EGUL,DBF_DOUBLE) {
-		prompt("Engineer Units Low")
-		promptgroup(GUI_CONVERT)
-		special(SPC_LINCONV)
-		pp(TRUE)
-		interest(1)
-	}
-	field(EGU,DBF_STRING) {
-		prompt("Engineering Units")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
-		size(16)
+    }
+    field(LINR,DBF_MENU) {
+        prompt("Linearization")
+        promptgroup(GUI_CONVERT)
+        special(SPC_LINCONV)
+        pp(TRUE)
+        interest(1)
+        menu(menuConvert)
+    }
+    field(EGUF,DBF_DOUBLE) {
+        prompt("Engineer Units Full")
+        promptgroup(GUI_CONVERT)
+        special(SPC_LINCONV)
+        pp(TRUE)
+        interest(1)
+    }
+    field(EGUL,DBF_DOUBLE) {
+        prompt("Engineer Units Low")
+        promptgroup(GUI_CONVERT)
+        special(SPC_LINCONV)
+        pp(TRUE)
+        interest(1)
+    }
+    field(EGU,DBF_STRING) {
+        prompt("Engineering Units")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
+        size(16)
 		prop(YES)
-	}
-	field(HOPR,DBF_DOUBLE) {
-		prompt("High Operating Range")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
+    }
+    field(HOPR,DBF_DOUBLE) {
+        prompt("High Operating Range")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
 		prop(YES)
-	}
-	field(LOPR,DBF_DOUBLE) {
-		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
+    }
+    field(LOPR,DBF_DOUBLE) {
+        prompt("Low Operating Range")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
 		prop(YES)
-	}
-	field(AOFF,DBF_DOUBLE) {
-		prompt("Adjustment Offset")
-		promptgroup(GUI_CONVERT)
-		pp(TRUE)
-		interest(1)
-	}
-	field(ASLO,DBF_DOUBLE) {
-		prompt("Adjustment Slope")
-		promptgroup(GUI_CONVERT)
-		pp(TRUE)
-		interest(1)
-		initial("1")
-	}
-	field(SMOO,DBF_DOUBLE) {
-		prompt("Smoothing")
-		promptgroup(GUI_CONVERT)
-		interest(1)
-	}
-	field(HIHI,DBF_DOUBLE) {
-		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
+    }
+    field(AOFF,DBF_DOUBLE) {
+        prompt("Adjustment Offset")
+        promptgroup(GUI_CONVERT)
+        pp(TRUE)
+        interest(1)
+    }
+    field(ASLO,DBF_DOUBLE) {
+        prompt("Adjustment Slope")
+        promptgroup(GUI_CONVERT)
+        pp(TRUE)
+        interest(1)
+        initial("1")
+    }
+    field(SMOO,DBF_DOUBLE) {
+        prompt("Smoothing")
+        promptgroup(GUI_CONVERT)
+        interest(1)
+    }
+    field(HIHI,DBF_DOUBLE) {
+        prompt("Hihi Alarm Limit")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
 		prop(YES)
-	}
-	field(LOLO,DBF_DOUBLE) {
-		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
+    }
+    field(LOLO,DBF_DOUBLE) {
+        prompt("Lolo Alarm Limit")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
 		prop(YES)
-	}
-	field(HIGH,DBF_DOUBLE) {
-		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
+    }
+    field(HIGH,DBF_DOUBLE) {
+        prompt("High Alarm Limit")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
 		prop(YES)
-	}
-	field(LOW,DBF_DOUBLE) {
-		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
+    }
+    field(LOW,DBF_DOUBLE) {
+        prompt("Low Alarm Limit")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
 		prop(YES)
-	}
-	field(HHSV,DBF_MENU) {
-		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
+    }
+    field(HHSV,DBF_MENU) {
+        prompt("Hihi Severity")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
 		prop(YES)
-		menu(menuAlarmSevr)
-	}
-	field(LLSV,DBF_MENU) {
-		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
+        menu(menuAlarmSevr)
+    }
+    field(LLSV,DBF_MENU) {
+        prompt("Lolo Severity")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
 		prop(YES)
-		menu(menuAlarmSevr)
-	}
-	field(HSV,DBF_MENU) {
-		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
+        menu(menuAlarmSevr)
+    }
+    field(HSV,DBF_MENU) {
+        prompt("High Severity")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
 		prop(YES)
-		menu(menuAlarmSevr)
-	}
-	field(LSV,DBF_MENU) {
-		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
+        menu(menuAlarmSevr)
+    }
+    field(LSV,DBF_MENU) {
+        prompt("Low Severity")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
 		prop(YES)
-		menu(menuAlarmSevr)
-	}
-	field(HYST,DBF_DOUBLE) {
-		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
-		interest(1)
-	}
-	field(AFTC,DBF_DOUBLE) {
-		prompt("Alarm Filter Time Constant")
-		promptgroup(GUI_ALARMS)
-		interest(1)
-	}
-	field(ADEL,DBF_DOUBLE) {
-		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
-	}
-	field(MDEL,DBF_DOUBLE) {
-		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
-	}
-	field(LALM,DBF_DOUBLE) {
-		prompt("Last Value Alarmed")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(AFVL,DBF_DOUBLE) {
-		prompt("Alarm Filter Value")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(ALST,DBF_DOUBLE) {
-		prompt("Last Value Archived")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(MLST,DBF_DOUBLE) {
-		prompt("Last Val Monitored")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(ESLO,DBF_DOUBLE) {
-		prompt("Raw to EGU Slope")
-		promptgroup(GUI_CONVERT)
-		pp(TRUE)
-		interest(2)
-		initial("1")
-	}
-	field(EOFF,DBF_DOUBLE) {
-		prompt("Raw to EGU Offset")
-		promptgroup(GUI_CONVERT)
-		pp(TRUE)
-		interest(2)
-	}
-	field(ROFF,DBF_LONG) {
-		prompt("Raw Offset, obsolete")
-		pp(TRUE)
-		interest(2)
-	}
-	field(PBRK,DBF_NOACCESS) {
-		prompt("Ptrto brkTable")
-		special(SPC_NOMOD)
-		interest(4)
-		extra("void *	pbrk")
-	}
-	field(INIT,DBF_SHORT) {
-		prompt("Initialized?")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(LBRK,DBF_SHORT) {
-		prompt("LastBreak Point")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(RVAL,DBF_LONG) {
-		prompt("Current Raw Value")
-		pp(TRUE)
-	}
-	field(ORAW,DBF_LONG) {
-		prompt("Previous Raw Value")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(SIOL,DBF_INLINK) {
-		prompt("Sim Input Specifctn")
-		promptgroup(GUI_INPUTS)
-		interest(1)
-	}
-	field(SVAL,DBF_DOUBLE) {
-		prompt("Simulation Value")
-	}
-	field(SIML,DBF_INLINK) {
-		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
-		interest(1)
-	}
-	field(SIMM,DBF_MENU) {
-		prompt("Simulation Mode")
-		interest(1)
-		menu(menuSimm)
-	}
-	field(SIMS,DBF_MENU) {
-		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
-		interest(2)
-		menu(menuAlarmSevr)
-	}
+        menu(menuAlarmSevr)
+    }
+    field(HYST,DBF_DOUBLE) {
+        prompt("Alarm Deadband")
+        promptgroup(GUI_ALARMS)
+        interest(1)
+    }
+    field(AFTC,DBF_DOUBLE) {
+        prompt("Alarm Filter Time Constant")
+        promptgroup(GUI_ALARMS)
+        interest(1)
+    }
+    field(ADEL,DBF_DOUBLE) {
+        prompt("Archive Deadband")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
+    }
+    field(MDEL,DBF_DOUBLE) {
+        prompt("Monitor Deadband")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
+    }
+    field(LALM,DBF_DOUBLE) {
+        prompt("Last Value Alarmed")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(AFVL,DBF_DOUBLE) {
+        prompt("Alarm Filter Value")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(ALST,DBF_DOUBLE) {
+        prompt("Last Value Archived")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(MLST,DBF_DOUBLE) {
+        prompt("Last Val Monitored")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(ESLO,DBF_DOUBLE) {
+        prompt("Raw to EGU Slope")
+        promptgroup(GUI_CONVERT)
+        pp(TRUE)
+        interest(2)
+        initial("1")
+    }
+    field(EOFF,DBF_DOUBLE) {
+        prompt("Raw to EGU Offset")
+        promptgroup(GUI_CONVERT)
+        pp(TRUE)
+        interest(2)
+    }
+    field(ROFF,DBF_LONG) {
+        prompt("Raw Offset, obsolete")
+        pp(TRUE)
+        interest(2)
+    }
+    field(PBRK,DBF_NOACCESS) {
+        prompt("Ptrto brkTable")
+        special(SPC_NOMOD)
+        interest(4)
+        extra("void *   pbrk")
+    }
+    field(INIT,DBF_SHORT) {
+        prompt("Initialized?")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(LBRK,DBF_SHORT) {
+        prompt("LastBreak Point")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(RVAL,DBF_LONG) {
+        prompt("Current Raw Value")
+        pp(TRUE)
+    }
+    field(ORAW,DBF_LONG) {
+        prompt("Previous Raw Value")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+
+=head3 Simulation Mode
+
+The record provides several fields to support simulation of absent hardware.
+If the SIML field is set it is used to read a value into the SIMM field, which
+controls whether simulation is used or not:
+
+=over 4
+
+=item *
+SIMM must be zero (C<NO>) for the record to request a value from the device
+support.
+
+=item *
+If SIMM is C<YES> and the SIOL link field is set, a simlated value in
+engineering units is read using the link into the SVAL field, from where it will
+subsequently be copied into the VAL field.
+
+=item *
+If SIMM is C<RAW> the SIOL link is still read into SVAL, but is then truncated
+and copied into the RVAL field.
+The L</Units Conversion> process described above is then followed to transform
+the simulated raw value into engineering units.
+
+=back
+
+The SIMS field can be set to give the record an alarm severity while it is in
+simulation mode.
+
+=fields SIML, SIMM, SIOL, SVAL, SIMS
+
+=cut
+
+    field(SIOL,DBF_INLINK) {
+        prompt("Sim. Input Specification")
+        promptgroup(GUI_INPUTS)
+        interest(1)
+    }
+    field(SVAL,DBF_DOUBLE) {
+        prompt("Simulation Value")
+    }
+    field(SIML,DBF_INLINK) {
+        prompt("Sim. Mode Location")
+        promptgroup(GUI_INPUTS)
+        interest(1)
+    }
+    field(SIMM,DBF_MENU) {
+        prompt("Simulation Mode")
+        interest(1)
+        menu(menuSimm)
+    }
+    field(SIMS,DBF_MENU) {
+        prompt("Simulation Mode Severity")
+        promptgroup(GUI_INPUTS)
+        interest(2)
+        menu(menuAlarmSevr)
+    }
 }
+
+=head2 Device Support Interface
+
+The record requires device support to provide an entry table (dset) which
+defines the following members:
+
+ typedef struct {
+     long number;
+     long (*report)(int level);
+     long (*init)(int after);
+     long (*init_record)(aiRecord *prec);
+     long (*get_ioint_info)(int cmd, aiRecord *prec, IOSCANPVT *piosl);
+     long (*read_ai)(aiRecord *prec);
+     long (*special_linconv)(aiRecord *prec, int after);
+ } aidset;
+
+The module must set C<number> to at least 6, and provide a pointer to its
+C<read_ai()> routine; the other function pointers may be C<NULL> if their
+associated functionality is not required for this support layer.
+Most device supports also provide an C<init_record()> routine to configure the
+record instance and connect it to the hardware or driver support layer, and if
+using the record's L</Units Conversion> features they set C<special_linconv()>
+as well.
+The individual routines are described below.
+
+=head3 Device Support Routines
+
+=head4 long report(int level)
+
+This optional routine is called by the IOC command C<dbior> and is passed the
+report level that was requested by the user.
+It should print a report on the state of the device support to stdout.
+The C<level> parameter may be used to output increasingly more detailed
+information at higher levels, or to select different types of information with
+different levels.
+Level zero should print no more than a small summary.
+
+=head4 long init(int after)
+
+This optional routine is called twice at IOC initialization time.
+The first call happens before any of the C<init_record()> calls are made, with
+the integer parameter C<after> set to 0.
+The second call happens after all of the C<init_record()> calls have been made,
+with C<after> set to 1.
+
+=head4 long init_record(aiRecord *prec)
+
+This optional routine is called by the record initialization code for each ai
+record instance that has its DTYP field set to use this device support.
+It is normally used to check that the INP address is the expected type and that
+it points to a valid device; to allocate any record-specific buffer space and
+other memory; and to connect any communication channels needed for the
+C<read_ai()> routine to work properly.
+
+If the record type's unit conversion features are used, the C<init_record()>
+routine should calculate appropriate values for the ESLO and EOFF fields from
+the EGUL and EGUF field values.
+This calculation only has to be performed if the record's LINR field is set to
+C<LINEAR>, but it is not necessary to check that condition first.
+This same calculation takes place in the C<special_linconv()> routine, so the
+implementation can usually just call that routine to perform the task.
+
+=head4 long get_ioint_info(int cmd, aiRecord *prec, IOSCANPVT *piosl)
+
+This optional routine is called whenever the record's SCAN field is being
+changed to or from the value C<I/O Intr> to find out which I/O Interrupt Scan
+list the record should be added to or deleted from.
+If this routine is not provided, it will not be possible to set the SCAN field
+to the value C<I/O Intr> at all.
+
+The C<cmd> parameter is zero when the record is being added to the scan list,
+and one when it is being removed from the list.
+The routine must determine which interrupt source the record should be connected
+to, which it indicates by the scan list that it points the location at C<*piosl>
+to before returning.
+It can prevent the SCAN field from being changed at all by returning a non-zero
+value to its caller.
+
+In most cases the device support will create the I/O Interrupt Scan lists that
+it returns for itself, by calling C<void scanIoInit(IOSCANPVT *piosl)> once for
+each separate interrupt source.
+That API allocates memory and inializes the list, then passes back a pointer to
+the new list in the location at C<*piosl>.
+When the device support receives notification that the interrupt has occurred,
+it announces that to the IOC by calling C<void scanIoRequest(IOSCANPVT iosl)>
+which will arrange for the appropriate records to be processed in a suitable
+thread.
+The C<scanIoRequest()> routine is safe to call from an interrupt service routine
+on embedded architectures (vxWorks and RTEMS).
+
+=head4 long read_ai(aiRecord *prec)
+
+This essential routine is called whenever the record is processed, and is
+responsible for performing (or at least initiating) a read operation for the
+addressed device and (eventually) returning its value to the record.
+
+... PACT and asynchronous processing ...
+
+... return value ...
+
+=head4 long special_linconv(aiRecord *prec, int after)
+
+This optional routine should be provided if the record type's unit conversion
+features are used by the device support's C<read_ai()> routine returning a
+status value of zero.
+It is called by the record code whenever any of the the fields LINR, EGUL or
+EGUF are modified and LINR has the value C<LINEAR>.
+The routine must calculate and set the fields EOFF and ESLO appropriately based
+on the new values of EGUL and EGUF.
+
+These calculations can be expressed in terms of the minimum and maximum raw
+values that the C<read_ai()> routine can put in the RVAL field.
+When RVAL is set to I<RVAL_max> the VAL field will be set to EGUF, and when RVAL
+is set to I<RVAL_min> the VAL field will become EGUL.
+The fomulae to use are:
+
+=over 4
+
+EOFF = (I<RVAL_max> * EGUL E<minus> I<RVAL_min> * EGUF) /
+(I<RVAL_max> E<minus> I<RVAL_min>)
+
+ESLO = (EGUF E<minus> EGUL) / (I<RVAL_max> E<minus> I<RVAL_min>)
+
+=back
+
+Note that the record support sets EOFF to EGUL before calling this routine,
+which is a very common case (I<RVAL_min> is zero).
+
+=head3 Extended Device Support
+
+...
+
+=cut
diff --git a/src/std/rec/subArrayRecord.dbd b/src/std/rec/subArrayRecord.dbd
index 92c221c59..4a0bfe0c6 100644
--- a/src/std/rec/subArrayRecord.dbd
+++ b/src/std/rec/subArrayRecord.dbd
@@ -15,7 +15,7 @@ recordtype(subArray) {
 		special(SPC_DBADDR)
 		pp(TRUE)
 		extra("void *		val")
-		#=type See FTVL
+		#=type Set by FTVL
 		#=read Yes
 		#=write Yes
 	}
diff --git a/src/std/rec/waveformRecord.dbd b/src/std/rec/waveformRecord.dbd
index 32394971e..143855c22 100644
--- a/src/std/rec/waveformRecord.dbd
+++ b/src/std/rec/waveformRecord.dbd
@@ -6,11 +6,28 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+
+=head1 Waveform Record (waveform)
+
+...
+
+=recordtype waveform
+
+...
+
+=cut
+
 menu(waveformPOST) {
-        choice(waveformPOST_Always,"Always")
-        choice(waveformPOST_OnChange,"On Change")
+    choice(waveformPOST_Always,"Always")
+    choice(waveformPOST_OnChange,"On Change")
 }
+
 recordtype(waveform) {
+
+=fields VAL, FTVL, MPST, APST
+
+=cut
+
 	include "dbCommon.dbd" 
 	field(VAL,DBF_NOACCESS) {
 		prompt("Value")
@@ -18,7 +35,7 @@ recordtype(waveform) {
 		special(SPC_DBADDR)
 		pp(TRUE)
 		extra("void *		val")
-		#=type See FTVL
+		#=type Set by FTVL
 		#=read Yes
 		#=write Yes
 	}
@@ -107,6 +124,17 @@ recordtype(waveform) {
 		interest(2)
 		menu(menuAlarmSevr)
 	}
+
+=head3 Menu waveformPOST
+
+...
+
+=menu waveformPOST
+
+...
+
+=cut
+
 	field(MPST,DBF_MENU) {
                 prompt("Post Value Monitors")
                 promptgroup(GUI_DISPLAY)
diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl
index 42779a008..1678d3506 100644
--- a/src/tools/dbdToHtml.pl
+++ b/src/tools/dbdToHtml.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #*************************************************************************
-# Copyright (c) 2010 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution.
@@ -8,6 +8,8 @@
 
 # $Id$
 
+use strict;
+
 use FindBin qw($Bin);
 use lib "$Bin/../../lib/perl";
 
@@ -19,6 +21,8 @@ use EPICS::Readfile;
 use Pod::Simple::HTML;
 
 my $tool = 'dbdToHtml';
+
+use vars qw($opt_D @opt_I $opt_o);
 getopts('DI@o:') or
     die "Usage: $tool [-D] [-I dir] [-o file.html] file.dbd\n";
 
@@ -44,39 +48,31 @@ if ($opt_D) {   # Output dependencies only
     exit 0;
 }
 
-open my $out, '>', $opt_o or die "Can't create $opt_o: $!\n";
+open my $out, '>', $opt_o or
+    die "Can't create $opt_o: $!\n";
 
-# Grab the Pod text from the root DBD object
-my @pod = $dbd->pod;
-
-my $rtypes = $dbd->recordtypes;
-
-# Append the processed Pod text from any record types defined
-while (my ($rn, $rtyp) = each %{$rtypes}) {
-    foreach my $_ ($rtyp->pod) {
-        # Handle our 'fields' Pod directive
-        if (m/^=fields (.*)/) {
-            my @names = split /\s*,\s*/, $1;
-            # Look up every named field
-            my @fields = map {
-                    my $field = $rtyp->field($_);
-                    print STDERR "Unknown field name '$_' in $infile POD\n" unless $field;
-                    $field;
-                } @names;
-            my $html;
-            # Generate a HTML table row for each field
-            foreach $field (@fields) {
-                $html .= $field->htmlTableRow if $field;
-            }
-            # Add the complete table
-            push @pod, podTable($html);
-        }
-        else {
-            # Add other Pod text
-            push @pod, $_;
-        }
+# Parse the Pod text from the root DBD object
+my @pod = map {
+    # Handle a 'recordtype' Pod directive
+    if (m/^ =recordtype \s+ (.*)/x) {
+        my $rn = $1;
+        my $rtyp = $dbd->recordtype($rn);
+        die "Unknown recordtype '$rn' in $infile POD directive\n"
+            unless $rtyp;
+        rtypeToPod($rtyp, $dbd);
     }
-}
+    # Handle a 'menu' Pod directive
+    elsif (m/^ =menu \s+ (.*)/x) {
+        my $mn = $1;
+        my $menu = $dbd->menu($mn);
+        die "Unknown menu '$mn' in $infile POD directive\n"
+            unless $menu;
+        menuToPod($menu);
+    }
+    else {
+        $_;
+    }
+} $dbd->pod;
 
 my $podHtml = Pod::Simple::HTML->new();
 $podHtml->html_css('style.css');
@@ -90,18 +86,70 @@ print $out $html;
 close $out;
 
 
-sub podTable {
-    my $content = shift;
-    return ("=begin html\n", "\n",
+sub menuToPod {
+    my ($menu) = @_;
+    my $index = 0;
+    return "=begin html\n", "\n",
         "<blockquote><table border =\"1\"><tr>\n",
-        "<th>Field</th><th>Summary</th><th>Type</th><th>DCT</th>",
-        "<th>Default</th><th>Read</th><th>Write</th><th>CA PP</th></tr>\n",
-        $content, "</table></blockquote>\n",
-        "\n", "=end html\n");
+        "<th>Index</th><th>Identifier</th><th>Choice String</th>\n",
+        "</tr>\n",
+        map({choiceTableRow($_, $index++)} $menu->choices),
+        "</table></blockquote>\n",
+        "\n", "=end html\n";
 }
 
-sub DBD::Recfield::htmlTableRow {
-    my $fld = shift;
+sub choiceTableRow {
+    my ($ch, $index) = @_;
+    my ($id, $name) = @{$ch};
+    return '<tr><td class="cell">',
+        $index,
+        '</td><td class="cell">',
+        $id,
+        '</td><td class="cell">',
+        $name,
+        "</td></tr>\n";
+}
+
+sub rtypeToPod {
+    my ($rtyp, $dbd) = @_;
+    return map {
+        # Handle a 'fields' Pod directive
+        if (m/^ =fields \s+ (.*)/x) {
+            my @names = split /\s*,\s*/, $1;
+            # Look up the named fields
+            my @fields = map {
+                    my $field = $rtyp->field($_);
+                    die "Unknown field name '$_' in $infile POD\n"
+                        unless $field;
+                    $field;
+                } @names;
+            # Generate Pod for the table
+            "=begin html\n", "\n",
+            "<blockquote><table border =\"1\"><tr>\n",
+            "<th>Field</th><th>Summary</th><th>Type</th><th>DCT</th>",
+            "<th>Default</th><th>Read</th><th>Write</th><th>CA PP</th>",
+            "</tr>\n",
+            map({fieldTableRow($_, $dbd)} @fields),
+            "</table></blockquote>\n",
+            "\n", "=end html\n";
+        }
+        # Handle a 'menu' Pod directive
+        elsif (m/^ =menu \s+ (.*)/x) {
+            my $mn = $1;
+            my $menu = $dbd->menu($mn);
+            die "Unknown menu '$mn' in $infile POD directive\n"
+                unless $menu;
+            menuToPod($menu);
+        }
+        else {
+            # Raw text line
+            $_;
+        }
+    } $rtyp->pod;
+}
+
+sub fieldTableRow {
+    my ($fld, $dbd) = @_;
     my $html = '<tr><td class="cell">';
     $html .= $fld->name;
     $html .= '</td><td class="cell">';
@@ -111,8 +159,12 @@ sub DBD::Recfield::htmlTableRow {
     $html .= $type;
     $html .= ' [' . $fld->attribute('size') . ']'
         if $type eq 'STRING';
-    $html .= ' (' . $fld->attribute('menu') . ')'
-        if $type eq 'MENU';
+    if ($type eq 'MENU') {
+        my $mn = $fld->attribute('menu');
+        my $menu = $dbd->menu($mn);
+        my $url = $menu ? "#Menu_$mn" : "${mn}.html";
+        $html .= " (<a href='$url'>$mn</a>)";
+    }
     $html .= '</td><td class="cell">';
     $html .= $fld->attribute('promptgroup') ? 'Yes' : 'No';
     $html .= '</td><td class="cell">';

From 880d714a0f204c3894625ad80c223bf4367aa406 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Sat, 30 Mar 2013 23:49:18 -0500
Subject: [PATCH 12/25] tools/DBD: Include cdefs in DBD format output.

---
 src/tools/DBD/Output.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tools/DBD/Output.pm b/src/tools/DBD/Output.pm
index 99cb9e5ad..ff2c69404 100644
--- a/src/tools/DBD/Output.pm
+++ b/src/tools/DBD/Output.pm
@@ -42,6 +42,7 @@ sub OutputRecordtypes {
     my ($out, $recordtypes) = @_;
     while (my ($name, $recordtype) = each %{$recordtypes}) {
         printf $out "recordtype(%s) {\n", $name;
+	print $out "    %$_\n" foreach $recordtype->cdefs;
         foreach $field ($recordtype->fields) {
             printf $out "    field(%s, %s) {\n",
                 $field->name, $field->dbf_type;

From 53c5aaa9ee42d2612f464558c6c6d8cfbe85113f Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Sun, 31 Mar 2013 00:38:20 -0500
Subject: [PATCH 13/25] Introduce the .dbd.pod extension

Rules to convert to .html and .dbd
Rename existing files
Fix various build rules to match.
---
 configure/RULES.Db                             | 13 +++++++++----
 src/ioc/bpt/Makefile                           |  2 ++
 .../{menuConvert.dbd => menuConvert.dbd.pod}   | 18 +++++++++++++++---
 src/ioc/db/RULES                               | 17 ++++++++++++++---
 ...menuAlarmSevr.dbd => menuAlarmSevr.dbd.pod} |  3 ++-
 src/ioc/db/{menuSimm.dbd => menuSimm.dbd.pod}  | 15 ++++++++++++---
 .../filters/{filters.dbd => filters.dbd.pod}   |  0
 src/std/rec/Makefile                           |  2 +-
 .../rec/{aSubRecord.dbd => aSubRecord.dbd.pod} |  0
 src/std/rec/{aiRecord.dbd => aiRecord.dbd.pod} |  0
 ...mpressRecord.dbd => compressRecord.dbd.pod} |  0
 ...veformRecord.dbd => waveformRecord.dbd.pod} |  0
 src/std/softIoc/RULES                          |  4 ++--
 src/tools/dbdToHtml.pl                         |  8 ++++----
 14 files changed, 61 insertions(+), 21 deletions(-)
 rename src/ioc/bpt/{menuConvert.dbd => menuConvert.dbd.pod} (66%)
 rename src/ioc/db/{menuAlarmSevr.dbd => menuAlarmSevr.dbd.pod} (87%)
 rename src/ioc/db/{menuSimm.dbd => menuSimm.dbd.pod} (57%)
 rename src/std/filters/{filters.dbd => filters.dbd.pod} (100%)
 rename src/std/rec/{aSubRecord.dbd => aSubRecord.dbd.pod} (100%)
 rename src/std/rec/{aiRecord.dbd => aiRecord.dbd.pod} (100%)
 rename src/std/rec/{compressRecord.dbd => compressRecord.dbd.pod} (100%)
 rename src/std/rec/{waveformRecord.dbd => waveformRecord.dbd.pod} (100%)

diff --git a/configure/RULES.Db b/configure/RULES.Db
index 5d1e0622a..0cf703e5f 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -13,6 +13,7 @@ SUBST_SUFFIX ?= .substitutions
 
 #####################################################  vpath
 
+vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.db $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
 vpath %.vdb $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
@@ -216,7 +217,11 @@ menu%.h$(DEP): menu%.dbd
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-menu%.h$(DEP): ../menu%.dbd
+%.dbd$(DEP): %.dbd.pod
+	@$(RM) $@
+	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
+	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
+
 	@$(RM) $@
 	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
@@ -351,9 +356,9 @@ $(COMMON_DIR)/bpt%.dbd: bpt%.data
 	$(MAKEBPT) $< $(notdir $@)
 	@$(MV) $(notdir $@) $@
 
-$(COMMON_DIR)/bpt%.dbd: ../bpt%.data 
+$(COMMON_DIR)/%.dbd: %.dbd.pod
 	@$(RM) $(notdir $@)
-	$(MAKEBPT) $< $(notdir $@)
+	$(DBEXPAND) $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
 $(COMMON_DIR)/%.dbd: %Include.dbd
@@ -397,7 +402,7 @@ $(foreach file, $(DBD_INSTALLS), $(eval $(call DBD_INSTALLS_template, $(file))))
 
 ##################################################### HTML files
 
-$(COMMON_DIR)/%.html: %.dbd $(TOOLS)/dbdToHtml.pl
+$(COMMON_DIR)/%.html: %.dbd.pod $(TOOLS)/dbdToHtml.pl
 	@$(RM) $(notdir $@)
 	$(PERL) $(TOOLS)/dbdToHtml.pl $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
diff --git a/src/ioc/bpt/Makefile b/src/ioc/bpt/Makefile
index 7ed83ae9e..b8d73345f 100644
--- a/src/ioc/bpt/Makefile
+++ b/src/ioc/bpt/Makefile
@@ -25,3 +25,5 @@ PROD_HOST += makeBpt
 
 makeBpt_SRCS = makeBpt
 
+HTMLS += menuConvert.html
+
diff --git a/src/ioc/bpt/menuConvert.dbd b/src/ioc/bpt/menuConvert.dbd.pod
similarity index 66%
rename from src/ioc/bpt/menuConvert.dbd
rename to src/ioc/bpt/menuConvert.dbd.pod
index 1e1e16c4c..e81d4e6f2 100644
--- a/src/ioc/bpt/menuConvert.dbd
+++ b/src/ioc/bpt/menuConvert.dbd.pod
@@ -1,12 +1,24 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+
+=head1 Menu menuConvert
+
+This menu defines the standard analog conversions which are included with Base.
+IOC applications may add choices or replace the later choices in this menu,
+although the first three choices must not be renamed or moved to different
+positions. The breakpoint table name must exactly match the choice string
+listed here.
+
+=menu menuConvert
+
+=cut
+
 menu(menuConvert) {
 	choice(menuConvertNO_CONVERSION,"NO CONVERSION")
 	choice(menuConvertSLOPE,"SLOPE")
diff --git a/src/ioc/db/RULES b/src/ioc/db/RULES
index 36eee734a..8c8c4d7b9 100644
--- a/src/ioc/db/RULES
+++ b/src/ioc/db/RULES
@@ -11,12 +11,23 @@
 
 # This is a Makefile fragment, see src/ioc/Makefile.
 
-dbCommon.h$(DEP): $(IOCDIR)/db/dbCommonRecord.dbd
+dbCommon.h$(DEP): ../db/dbCommonRecord.dbd ../db/RULES
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D -I ../db -o $(COMMONDEP_TARGET) $< > $@
-	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
+	@echo "$(COMMONDEP_TARGET):" >> $@
 
-$(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd
+$(COMMON_DIR)/dbCommon.h: ../db/dbCommonRecord.dbd
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) -I ../db -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
+
+menuGlobal.dbd$(DEP): ../db/RULES
+	@$(RM) $@
+	@echo "$(COMMONDEP_TARGET):" > $@
+
+$(COMMON_DIR)/menuGlobal.dbd: ../db/Makefile
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/makeIncludeDbd.pl $(menuGlobal_DBD) $(notdir $@)
+	@$(MV) $(notdir $@) $@
+
+
diff --git a/src/ioc/db/menuAlarmSevr.dbd b/src/ioc/db/menuAlarmSevr.dbd.pod
similarity index 87%
rename from src/ioc/db/menuAlarmSevr.dbd
rename to src/ioc/db/menuAlarmSevr.dbd.pod
index 8287bf86e..1d86edba6 100644
--- a/src/ioc/db/menuAlarmSevr.dbd
+++ b/src/ioc/db/menuAlarmSevr.dbd.pod
@@ -10,7 +10,8 @@
 =head1 Menu menuAlarmSevr
 
 This menu defines the four possible alarm severities that EPICS records can
-exhibit.
+exhibit.  Note that it is not possible to add or remove severities just by
+changing the choices defined here.
 
 =menu menuAlarmSevr
 
diff --git a/src/ioc/db/menuSimm.dbd b/src/ioc/db/menuSimm.dbd.pod
similarity index 57%
rename from src/ioc/db/menuSimm.dbd
rename to src/ioc/db/menuSimm.dbd.pod
index 8021a9512..5df087ccc 100644
--- a/src/ioc/db/menuSimm.dbd
+++ b/src/ioc/db/menuSimm.dbd.pod
@@ -1,12 +1,21 @@
 #*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
+# Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
+# EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+
+=head1 Menu menuSimm
+
+This menu is used for Simulation Mode (SIMM) fields of input record types that
+can fetch either raw or engineering values through their SIOL link.
+
+=menu menuSimm
+
+=cut
+
 menu(menuSimm) {
 	choice(menuSimmNO,"NO")
 	choice(menuSimmYES,"YES")
diff --git a/src/std/filters/filters.dbd b/src/std/filters/filters.dbd.pod
similarity index 100%
rename from src/std/filters/filters.dbd
rename to src/std/filters/filters.dbd.pod
diff --git a/src/std/rec/Makefile b/src/std/rec/Makefile
index a5c6c4499..9213b551f 100644
--- a/src/std/rec/Makefile
+++ b/src/std/rec/Makefile
@@ -51,4 +51,4 @@ stdRecords_DBD = $(patsubst %,%.dbd,$(stdRecords))
 
 dbRecStd_SRCS += $(patsubst %,%.c,$(stdRecords))
 
-HTMLS = $(patsubst %,%.html,$(stdRecords))
+HTMLS += $(patsubst %.dbd.pod,%.html,$(notdir $(wildcard $(STDDIR)/rec/*Record.dbd.pod)))
diff --git a/src/std/rec/aSubRecord.dbd b/src/std/rec/aSubRecord.dbd.pod
similarity index 100%
rename from src/std/rec/aSubRecord.dbd
rename to src/std/rec/aSubRecord.dbd.pod
diff --git a/src/std/rec/aiRecord.dbd b/src/std/rec/aiRecord.dbd.pod
similarity index 100%
rename from src/std/rec/aiRecord.dbd
rename to src/std/rec/aiRecord.dbd.pod
diff --git a/src/std/rec/compressRecord.dbd b/src/std/rec/compressRecord.dbd.pod
similarity index 100%
rename from src/std/rec/compressRecord.dbd
rename to src/std/rec/compressRecord.dbd.pod
diff --git a/src/std/rec/waveformRecord.dbd b/src/std/rec/waveformRecord.dbd.pod
similarity index 100%
rename from src/std/rec/waveformRecord.dbd
rename to src/std/rec/waveformRecord.dbd.pod
diff --git a/src/std/softIoc/RULES b/src/std/softIoc/RULES
index 393afc36d..407b94c70 100644
--- a/src/std/softIoc/RULES
+++ b/src/std/softIoc/RULES
@@ -7,9 +7,9 @@
 
 # This is a Makefile fragment, see src/ioc/Makefile.
 
-base.dbd$(DEP): $(COMMON_DIR)/stdRecords.dbd
+base.dbd$(DEP): $(COMMON_DIR)/stdRecords.dbd $(COMMON_DIR)/filters.dbd
 softIoc.dbd$(DEP): $(COMMON_DIR)/base.dbd
-$(COMMON_DIR)/base.dbd: $(COMMON_DIR)/stdRecords.dbd
+$(COMMON_DIR)/base.dbd: $(COMMON_DIR)/stdRecords.dbd $(COMMON_DIR)/filters.dbd
 $(COMMON_DIR)/softIoc.dbd: $(COMMON_DIR)/base.dbd
 
 softMain$(DEP): epicsInstallDir.h
diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl
index 1678d3506..52772f525 100644
--- a/src/tools/dbdToHtml.pl
+++ b/src/tools/dbdToHtml.pl
@@ -24,18 +24,18 @@ my $tool = 'dbdToHtml';
 
 use vars qw($opt_D @opt_I $opt_o);
 getopts('DI@o:') or
-    die "Usage: $tool [-D] [-I dir] [-o file.html] file.dbd\n";
+    die "Usage: $tool [-D] [-I dir] [-o file.html] file.dbd.pod\n";
 
 my $dbd = DBD->new();
 
 my $infile = shift @ARGV;
-$infile =~ m/\.dbd$/ or
-    die "$tool: Input file '$infile' must have '.dbd' extension\n";
+$infile =~ m/\.dbd.pod$/ or
+    die "$tool: Input file '$infile' must have '.dbd.pod' extension\n";
 
 &ParseDBD($dbd, &Readfile($infile, 0, \@opt_I));
 
 if (!$opt_o) {
-    ($opt_o = $infile) =~ s/\.dbd$/.html/;
+    ($opt_o = $infile) =~ s/\.dbd.pod$/.html/;
     $opt_o =~ s/^.*\///;
     $opt_o =~ s/dbCommonRecord/dbCommon/;
 }

From b27439ce7baa06ee6294e06ea4a964fa68a4cc63 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Sun, 31 Mar 2013 00:49:19 -0500
Subject: [PATCH 14/25] Only try to generate .html files where the .dbd.pod
 exists

---
 src/ioc/db/Makefile  | 2 +-
 src/std/rec/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ioc/db/Makefile b/src/ioc/db/Makefile
index b6ac6c0f1..7bebb9061 100644
--- a/src/ioc/db/Makefile
+++ b/src/ioc/db/Makefile
@@ -57,7 +57,7 @@ menuGlobal_DBD += menuSimm.dbd
 DBDINC += $(basename $(menuGlobal_DBD))
 DBDINC += dbCommon
 
-HTMLS += $(patsubst %.dbd,%.html,$(menuGlobal_DBD))
+HTMLS += $(patsubst %.dbd.pod,%.html,$(notdir $(wildcard ../db/menu*.dbd.pod)))
 
 dbCore_SRCS += dbLock.c
 dbCore_SRCS += dbAccess.c
diff --git a/src/std/rec/Makefile b/src/std/rec/Makefile
index 9213b551f..cf2eba9f2 100644
--- a/src/std/rec/Makefile
+++ b/src/std/rec/Makefile
@@ -51,4 +51,4 @@ stdRecords_DBD = $(patsubst %,%.dbd,$(stdRecords))
 
 dbRecStd_SRCS += $(patsubst %,%.c,$(stdRecords))
 
-HTMLS += $(patsubst %.dbd.pod,%.html,$(notdir $(wildcard $(STDDIR)/rec/*Record.dbd.pod)))
+HTMLS += $(patsubst %.dbd.pod,%.html,$(notdir $(wildcard ../rec/*Record.dbd.pod)))

From 97c6d1a90315f5772bb2d50e9b53304ca557be4e Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Fri, 5 Apr 2013 13:13:52 -0500
Subject: [PATCH 15/25] Add podToHtml.pl script

New rules to use this for .pod and .pm conversions
Replace use of pod2html in ca/client/perl
---
 configure/RULES.Db          | 11 +++++++++
 src/ca/client/perl/Makefile |  4 ----
 src/tools/Makefile          |  1 +
 src/tools/podToHtml.pl      | 47 +++++++++++++++++++++++++++++++++++++
 src/tools/style.css         |  1 +
 5 files changed, 60 insertions(+), 4 deletions(-)
 create mode 100644 src/tools/podToHtml.pl

diff --git a/configure/RULES.Db b/configure/RULES.Db
index 0cf703e5f..e1b981851 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -13,6 +13,7 @@ SUBST_SUFFIX ?= .substitutions
 
 #####################################################  vpath
 
+vpath %.pm $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.pod $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.dbd $(USR_VPATH) $(SRC_DIRS) $(dir $(DBD))
 vpath %.db $(USR_VPATH) $(SRC_DIRS) $(dir $(DB))
@@ -407,6 +408,16 @@ $(COMMON_DIR)/%.html: %.dbd.pod $(TOOLS)/dbdToHtml.pl
 	$(PERL) $(TOOLS)/dbdToHtml.pl $(DBDFLAGS) -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
+$(COMMON_DIR)/%.html: %.pod $(TOOLS)/podToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
+$(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
 .PRECIOUS: $(COMMON_DIR)/%.html
 
 ##################################################### DB files
diff --git a/src/ca/client/perl/Makefile b/src/ca/client/perl/Makefile
index b3fe549c7..1fb8627fc 100644
--- a/src/ca/client/perl/Makefile
+++ b/src/ca/client/perl/Makefile
@@ -61,10 +61,6 @@ ifdef T_A
 	$(RM) $@ $@_new
 	$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap $< > $@_new && $(MV) $@_new $@
 
-  %.html: ../%.pm
-	$(RM) $@
-	podchecker $< && pod2html --infile=$< --outfile=$@
-
   $(INSTALL_PERL_MODULES)/$(PERL_ARCHPATH)/%: %
 	$(ECHO) "Installing loadable shared library $@"
 	@$(INSTALL_LIBRARY) -d -m $(LIB_PERMISSIONS) $< $(INSTALL_PERL_MODULES)/$(PERL_ARCHPATH)
diff --git a/src/tools/Makefile b/src/tools/Makefile
index d62e4bba1..60320b054 100644
--- a/src/tools/Makefile
+++ b/src/tools/Makefile
@@ -49,6 +49,7 @@ PERL_SCRIPTS += dbdToMenuH.pl
 PERL_SCRIPTS += dbdToRecordtypeH.pl
 PERL_SCRIPTS += dbdExpand.pl
 PERL_SCRIPTS += dbdToHtml.pl
+PERL_SCRIPTS += podToHtml.pl
 PERL_SCRIPTS += registerRecordDeviceDriver.pl
 
 HTMLS = style.css
diff --git a/src/tools/podToHtml.pl b/src/tools/podToHtml.pl
new file mode 100644
index 000000000..2baf9e80f
--- /dev/null
+++ b/src/tools/podToHtml.pl
@@ -0,0 +1,47 @@
+#!/usr/bin/env perl
+#*************************************************************************
+# Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution.
+#*************************************************************************
+
+# $Id$
+
+use strict;
+use warnings;
+
+use Getopt::Std;
+use Pod::Simple::HTML;
+
+our ($opt_o);
+
+$Getopt::Std::OUTPUT_HELP_VERSION = 1;
+&HELP_MESSAGE if !getopts('o:') || @ARGV != 1;
+
+my $infile = shift @ARGV;
+
+if (!$opt_o) {
+    ($opt_o = $infile) =~ s/\. \w+ $/.html/x;
+    $opt_o =~ s/^.*\///;
+}
+
+open my $out, '>', $opt_o or
+    die "Can't create $opt_o: $!\n";
+
+my $podHtml = Pod::Simple::HTML->new();
+
+$podHtml->html_css('style.css');
+$podHtml->perldoc_url_prefix('');
+$podHtml->perldoc_url_postfix('.html');
+$podHtml->set_source($infile);
+$podHtml->output_string(\my $html);
+$podHtml->run;
+
+print $out $html;
+close $out;
+
+sub HELP_MESSAGE {
+    print STDERR "Usage: podToHtml.pl [-o file.html] file.pod\n";
+    exit 2;
+}
diff --git a/src/tools/style.css b/src/tools/style.css
index fe0ad441c..905162a98 100644
--- a/src/tools/style.css
+++ b/src/tools/style.css
@@ -80,6 +80,7 @@ DIV {
 
 DT {
   margin-top: 1em;
+  font-weight: bold;
 }
 
 .credits TD {

From 38037f087366f4e850ac251efb50e58db8fe947e Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 30 Sep 2013 17:44:45 -0500
Subject: [PATCH 16/25] Use Pod::Simple::XHTML if available.

---
 src/tools/dbdToHtml.pl | 118 ++++++++++++++++++++++++-----------------
 src/tools/style.css    |  18 +++++--
 2 files changed, 81 insertions(+), 55 deletions(-)

diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl
index 52772f525..d64a38ea2 100644
--- a/src/tools/dbdToHtml.pl
+++ b/src/tools/dbdToHtml.pl
@@ -18,7 +18,14 @@ use DBD::Parser;
 use EPICS::Getopts;
 use EPICS::macLib;
 use EPICS::Readfile;
-use Pod::Simple::HTML;
+use HTML::Entities;
+
+BEGIN {
+    $::XHTML = eval "require Pod::Simple::XHTML; 1";
+    if (!$::XHTML) {
+        require Pod::Simple::HTML;
+    }
+}
 
 my $tool = 'dbdToHtml';
 
@@ -35,7 +42,7 @@ $infile =~ m/\.dbd.pod$/ or
 &ParseDBD($dbd, &Readfile($infile, 0, \@opt_I));
 
 if (!$opt_o) {
-    ($opt_o = $infile) =~ s/\.dbd.pod$/.html/;
+    ($opt_o = $infile) =~ s/\.dbd\.pod$/.html/;
     $opt_o =~ s/^.*\///;
     $opt_o =~ s/dbCommonRecord/dbCommon/;
 }
@@ -48,66 +55,79 @@ if ($opt_D) {   # Output dependencies only
     exit 0;
 }
 
+(my $title = $opt_o) =~ s/\.html$//;
+
 open my $out, '>', $opt_o or
     die "Can't create $opt_o: $!\n";
 
 # Parse the Pod text from the root DBD object
-my @pod = map {
-    # Handle a 'recordtype' Pod directive
-    if (m/^ =recordtype \s+ (.*)/x) {
-        my $rn = $1;
-        my $rtyp = $dbd->recordtype($rn);
-        die "Unknown recordtype '$rn' in $infile POD directive\n"
-            unless $rtyp;
-        rtypeToPod($rtyp, $dbd);
-    }
-    # Handle a 'menu' Pod directive
-    elsif (m/^ =menu \s+ (.*)/x) {
-        my $mn = $1;
-        my $menu = $dbd->menu($mn);
-        die "Unknown menu '$mn' in $infile POD directive\n"
-            unless $menu;
-        menuToPod($menu);
-    }
-    else {
-        $_;
-    }
-} $dbd->pod;
+my $pod = join "\n", '=for html <div class="pod">', '',
+    map {
+        # Handle a 'recordtype' Pod directive
+        if (m/^ =recordtype \s+ (.*)/x) {
+            my $rn = $1;
+            my $rtyp = $dbd->recordtype($rn);
+            die "Unknown recordtype '$rn' in $infile POD directive\n"
+                unless $rtyp;
+            rtypeToPod($rtyp, $dbd);
+        }
+        # Handle a 'menu' Pod directive
+        elsif (m/^ =menu \s+ (.*)/x) {
+            my $mn = $1;
+            my $menu = $dbd->menu($mn);
+            die "Unknown menu '$mn' in $infile POD directive\n"
+                unless $menu;
+            menuToPod($menu);
+        }
+        elsif (m/^ =title \s+ (.*)/x) {
+            $title = $1;
+            "=head1 $title";
+        }
+        else {
+            $_;
+        }
+    } $dbd->pod,
+    '=for html </div>', '';
+
+my $podHtml;
+
+if ($::XHTML) {
+    $podHtml = Pod::Simple::XHTML->new();
+    $podHtml->html_doctype(<< '__END_DOCTYPE');
+<?xml version='1.0' encoding='iso-8859-1'?>
+<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN'
+     'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
+__END_DOCTYPE
+} else { # Fall back to HTML
+    $podHtml = Pod::Simple::HTML->new();
+}
 
-my $podHtml = Pod::Simple::HTML->new();
 $podHtml->html_css('style.css');
+$podHtml->force_title(encode_entities($title));
 $podHtml->perldoc_url_prefix('');
 $podHtml->perldoc_url_postfix('.html');
-$podHtml->set_source(\@pod);
-# $podHtml->index(1);
-$podHtml->output_string(\my $html);
-$podHtml->run;
-print $out $html;
+$podHtml->output_fh($out);
+$podHtml->parse_string_document($pod);
 close $out;
 
 
 sub menuToPod {
     my ($menu) = @_;
     my $index = 0;
-    return "=begin html\n", "\n",
-        "<blockquote><table border =\"1\"><tr>\n",
-        "<th>Index</th><th>Identifier</th><th>Choice String</th>\n",
-        "</tr>\n",
+    return '=begin html', '', '<blockquote><table border="1"><tr>',
+        '<th>Index</th><th>Identifier</th><th>Choice String</th></tr>',
         map({choiceTableRow($_, $index++)} $menu->choices),
-        "</table></blockquote>\n",
-        "\n", "=end html\n";
+        '</table></blockquote>', '', '=end html';
 }
 
 sub choiceTableRow {
     my ($ch, $index) = @_;
     my ($id, $name) = @{$ch};
-    return '<tr><td class="cell">',
-        $index,
-        '</td><td class="cell">',
-        $id,
-        '</td><td class="cell">',
-        $name,
-        "</td></tr>\n";
+    return '<tr>',
+        "<td class='cell DBD_Menu index'>$index</td>",
+        "<td class='cell DBD_Menu identifier'>$id</td>",
+        "<td class='cell DBD_Menu choice'>$name</td>",
+        '</tr>';
 }
 
 sub rtypeToPod {
@@ -124,14 +144,12 @@ sub rtypeToPod {
                     $field;
                 } @names;
             # Generate Pod for the table
-            "=begin html\n", "\n",
-            "<blockquote><table border =\"1\"><tr>\n",
-            "<th>Field</th><th>Summary</th><th>Type</th><th>DCT</th>",
-            "<th>Default</th><th>Read</th><th>Write</th><th>CA PP</th>",
-            "</tr>\n",
+            '=begin html', '', '<blockquote><table border="1"><tr>',
+            '<th>Field</th><th>Summary</th><th>Type</th><th>DCT</th>',
+            '<th>Default</th><th>Read</th><th>Write</th><th>CA PP</th>',
+            '</tr>',
             map({fieldTableRow($_, $dbd)} @fields),
-            "</table></blockquote>\n",
-            "\n", "=end html\n";
+            '</table></blockquote>', '', '=end html';
         }
         # Handle a 'menu' Pod directive
         elsif (m/^ =menu \s+ (.*)/x) {
@@ -174,7 +192,7 @@ sub fieldTableRow {
     $html .= '</td><td class="cell">';
     $html .= $fld->writable;
     $html .= '</td><td class="cell">';
-    $html .= $fld->attribute('pp') eq "TRUE" ? 'Yes' : 'No';
+    $html .= $fld->attribute('pp') eq 'TRUE' ? 'Yes' : 'No';
     $html .= "</td></tr>\n";
     return $html;
 }
diff --git a/src/tools/style.css b/src/tools/style.css
index 905162a98..8253fb08f 100644
--- a/src/tools/style.css
+++ b/src/tools/style.css
@@ -80,7 +80,6 @@ DIV {
 
 DT {
   margin-top: 1em;
-  font-weight: bold;
 }
 
 .credits TD {
@@ -189,6 +188,15 @@ TH A:link, TH A:visited {
   text-align: left;
 }
 
+.DBD_Menu.index {
+  padding: 0.2ex 2ex;
+  text-align: right;
+}
+
+.DBD_Menu.choice {
+  font: 1.0em monospace;
+}
+
 .label {
   background: #aaaaaa;
   color: black;
@@ -307,7 +315,7 @@ table.dlsip     {
 .pod H1      {
   background: transparent;
   color: #006699;
-  font-size: large;
+  font-size: 1.4em;
 }
 
 .pod H1 A { text-decoration: none; }
@@ -318,20 +326,20 @@ table.dlsip     {
 .pod H2      {
   background: transparent;
   color: #006699;
-  font-size: medium;
+  font-size: 1.2em;
 }
 
 .pod H3      {
   background: transparent;
   color: #006699;
-  font-size: medium;
+  font-size: 1em;
   font-style: italic;
 }
 
 .pod H4      {
   background: transparent;
   color: #006699;
-  font-size: medium;
+  font-size: 1em;
   font-weight: normal;
 }
 

From 61cc341132e7c0775847cc3eaf7fae16e0bcdac2 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 30 Sep 2013 17:48:06 -0500
Subject: [PATCH 17/25] Various POD updates & experiments.

---
 src/std/rec/aSubRecord.dbd.pod     |  57 ++
 src/std/rec/aiRecord.dbd.pod       |  51 +-
 src/std/rec/aoRecord.dbd           | 308 ----------
 src/std/rec/aoRecord.dbd.pod       | 917 +++++++++++++++++++++++++++++
 src/std/rec/compressRecord.dbd.pod |  29 +-
 src/std/rec/waveformRecord.dbd.pod |  28 +-
 6 files changed, 1043 insertions(+), 347 deletions(-)
 delete mode 100644 src/std/rec/aoRecord.dbd
 create mode 100644 src/std/rec/aoRecord.dbd.pod

diff --git a/src/std/rec/aSubRecord.dbd.pod b/src/std/rec/aSubRecord.dbd.pod
index 918b36d3a..d188745f1 100644
--- a/src/std/rec/aSubRecord.dbd.pod
+++ b/src/std/rec/aSubRecord.dbd.pod
@@ -1,3 +1,42 @@
+#*************************************************************************
+# Copyright (c) 2012 The University of Chicago, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+=title Array Subroutine Record (aSub)
+
+...
+
+=head2 Record-specific Menus
+
+=head3 Menu aSubLFLG
+
+The LFLG field uses this menu to ...
+
+=menu aSubLFLG
+
+=head3 Menu aSubEFLG
+
+The EFLG field uses this menu to ...
+
+=menu aSubEFLG
+
+...
+
+=head2 Parameter Fields
+
+The record-specific fields are described below.
+
+=recordtype aSub
+
+...
+
+=cut
+
 menu(aSubLFLG) {
 	choice(aSubLFLG_IGNORE,"IGNORE")
 	choice(aSubLFLG_READ,"READ")
@@ -191,6 +230,15 @@ recordtype(aSub) {
 		promptgroup(GUI_INPUTS)
 		interest(1)
 	}
+
+=head3 Input Fields
+
+...
+
+=fields A, B, C, D, E, F, G, H, I, J, K, L, M, N, O, P, Q, R, S, T, U
+
+=cut
+
 	field(A,DBF_NOACCESS) {
 		prompt("Input value A")
 		asl(ASL0)
@@ -968,6 +1016,15 @@ recordtype(aSub) {
 		promptgroup(GUI_OUTPUT)
 		interest(1)
 	}
+
+=head3 Value Fields
+
+...
+
+=fields VALA, VALB, VALC, VALD, VALE, VALF, VALG, VALH, VALI, VALJ, VALK, VALL, VALM, VALN, VALO, VALP, VALQ, VALR, VALS, VALT, VALU
+
+=cut
+
 	field(VALA,DBF_NOACCESS) {
 		prompt("Output value A")
 		asl(ASL0)
diff --git a/src/std/rec/aiRecord.dbd.pod b/src/std/rec/aiRecord.dbd.pod
index aa75cd3b6..e3f1cfdae 100644
--- a/src/std/rec/aiRecord.dbd.pod
+++ b/src/std/rec/aiRecord.dbd.pod
@@ -1,5 +1,5 @@
 #*************************************************************************
-# Copyright (c) 2012 UChicago Argonne LLC, as Operator of Argonne
+# Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne
 #     National Laboratory.
 # Copyright (c) 2002 The Regents of the University of California, as
 #     Operator of Los Alamos National Laboratory.
@@ -7,7 +7,7 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-=head1 Analog Input Record (ai)
+=title Analog Input Record (ai)
 
 This record type is normally used to obtain an analog value from a hardware
 input and convert it to engineering units.
@@ -63,32 +63,26 @@ fairly common for GPIB and similar high-level device interfaces.
 If the device support sets the RVAL field, the LINR field controls how this gets
 converted into engineering units and placed in the VAL field as follows:
 
-=over 4
+=over
 
 =item 1.
-
 RVAL is converted to a double and ROFF is added to it.
 
 =item 2.
-
 If ASLO is non-zero the value is multiplied by ASLO.
 
 =item 3.
-
 AOFF is added.
 
 =item 4.
-
 If LINR is C<NO CONVERSION> the units conversion is finished after the above
 steps.
 
 =item 5.
-
 If LINR is C<LINEAR> or C<SLOPE>, the value from step 3 above is multiplied by
 ESLO and EOFF is added to complete the units conversion process.
 
 =item 6.
-
 Any other value for LINR selects a particular breakpoint table to be used on the
 value from step 3 above.
 
@@ -97,7 +91,7 @@ value from step 3 above.
 The distinction between the C<LINEAR> and C<SLOPE> settings for the LINR field
 are in how the conversion parameters are calculated:
 
-=over 4
+=over
 
 =item *
 With C<LINEAR> conversion the user must set EGUL and EGUF to the lowest and
@@ -128,7 +122,7 @@ If set to zero the filter is not used (no smoothing), while if set to one the
 result is infinite smoothing (the VAL field will never change).
 The calculation performed is:
 
-=over 4
+=over
 
 VAL = VAL * SMOO + (1 - SMOO) * New Data
 
@@ -139,7 +133,7 @@ This implements a first-order infinite impulse response (IIR) digital filter
 with z-plane pole at SMOO.
 The equivalent continuous-time filter time constant E<tau> is given by
 
-=over 4
+=over
 
 E<tau> = E<minus>T / ln(SMOO)
 
@@ -161,18 +155,18 @@ C<INVALID_ALARM>.
 These parameters are used to present meaningful data to the operator.
 They do not affect the functioning of the record at all.
 
-=over 4
+=over
 
 =item *
 DESC is a string that is usually used to briefly describe the record.
 
 =item *
-EGU is a string of up to 16 characters naming the engineering units that the
-VAL field represents.
+EGU is a string of up to 16 characters naming the engineering units that the VAL
+field represents.
 
 =item *
-The HOPR and LOPR fields set the upper and lower display limits for
-the VAL, HIHI, HIGH, LOW, and LOLO fields.
+The HOPR and LOPR fields set the upper and lower display limits for the VAL,
+HIHI, HIGH, LOW, and LOLO fields.
 
 =item *
 The PREC field determines the floating point precision (i.e. the number of
@@ -188,9 +182,11 @@ DOUBLE fields.
 The user configures limit alarms by putting numerical values into the HIHI,
 HIGH, LOW and LOLO fields, and by setting the associated alarm severity in the
 corresponding HHSV, HSV, LSV and LLSV menu fields.
+
 The HYST field controls hysteresis to prevent alarm chattering from an input
 signal that is close to one of the limits and suffers from significant readout
 noise.
+
 The AFTC field sets the time constant on a low-pass filter that delays the
 reporting of limit alarms until the signal has been within the alarm range for
 that number of seconds (the default AFTC value of zero retains the previous
@@ -207,6 +203,7 @@ by the appropriate deadband.
 If these fields are set to zero, a monitor will be triggered every time the
 value changes; if set to -1, a monitor will be sent every time the record is
 processed.
+
 The ADEL field sets the deadband for archive monitors (C<DBE_LOG> events), while
 the MDEL field controls value monitors (C<DBE_VALUE> events).
 
@@ -444,7 +441,7 @@ The record provides several fields to support simulation of absent hardware.
 If the SIML field is set it is used to read a value into the SIMM field, which
 controls whether simulation is used or not:
 
-=over 4
+=over
 
 =item *
 SIMM must be zero (C<NO>) for the record to request a value from the device
@@ -518,6 +515,7 @@ Most device supports also provide an C<init_record()> routine to configure the
 record instance and connect it to the hardware or driver support layer, and if
 using the record's L</Units Conversion> features they set C<special_linconv()>
 as well.
+
 The individual routines are described below.
 
 =head3 Device Support Routines
@@ -576,8 +574,9 @@ value to its caller.
 In most cases the device support will create the I/O Interrupt Scan lists that
 it returns for itself, by calling C<void scanIoInit(IOSCANPVT *piosl)> once for
 each separate interrupt source.
-That API allocates memory and inializes the list, then passes back a pointer to
-the new list in the location at C<*piosl>.
+That routine allocates memory and inializes the list, then passes back a pointer
+to the new list in the location at C<*piosl>.
+
 When the device support receives notification that the interrupt has occurred,
 it announces that to the IOC by calling C<void scanIoRequest(IOSCANPVT iosl)>
 which will arrange for the appropriate records to be processed in a suitable
@@ -587,9 +586,10 @@ on embedded architectures (vxWorks and RTEMS).
 
 =head4 long read_ai(aiRecord *prec)
 
-This essential routine is called whenever the record is processed, and is
-responsible for performing (or at least initiating) a read operation for the
-addressed device and (eventually) returning its value to the record.
+This essential routine is called when the record wants a new value from the
+addressed device.
+It is responsible for performing (or at least initiating) a read operation, and
+(eventually) returning its value to the record.
 
 ... PACT and asynchronous processing ...
 
@@ -609,9 +609,10 @@ These calculations can be expressed in terms of the minimum and maximum raw
 values that the C<read_ai()> routine can put in the RVAL field.
 When RVAL is set to I<RVAL_max> the VAL field will be set to EGUF, and when RVAL
 is set to I<RVAL_min> the VAL field will become EGUL.
+
 The fomulae to use are:
 
-=over 4
+=over
 
 EOFF = (I<RVAL_max> * EGUL E<minus> I<RVAL_min> * EGUF) /
 (I<RVAL_max> E<minus> I<RVAL_min>)
@@ -621,7 +622,7 @@ ESLO = (EGUF E<minus> EGUL) / (I<RVAL_max> E<minus> I<RVAL_min>)
 =back
 
 Note that the record support sets EOFF to EGUL before calling this routine,
-which is a very common case (I<RVAL_min> is zero).
+which is a very common case (when I<RVAL_min> is zero).
 
 =head3 Extended Device Support
 
diff --git a/src/std/rec/aoRecord.dbd b/src/std/rec/aoRecord.dbd
deleted file mode 100644
index 2d0f36450..000000000
--- a/src/std/rec/aoRecord.dbd
+++ /dev/null
@@ -1,308 +0,0 @@
-#*************************************************************************
-# Copyright (c) 2002 The University of Chicago, as Operator of Argonne
-#     National Laboratory.
-# Copyright (c) 2002 The Regents of the University of California, as
-#     Operator of Los Alamos National Laboratory.
-# EPICS BASE Versions 3.13.7
-# and higher are distributed subject to a Software License Agreement found
-# in file LICENSE that is included with this distribution. 
-#*************************************************************************
-menu(aoOIF) {
-	choice(aoOIF_Full,"Full")
-	choice(aoOIF_Incremental,"Incremental")
-}
-recordtype(ao) {
-	include "dbCommon.dbd" 
-	field(VAL,DBF_DOUBLE) {
-		prompt("Desired Output")
-                promptgroup(GUI_OUTPUT)
-		asl(ASL0)
-		pp(TRUE)
-	}
-	field(OVAL,DBF_DOUBLE) {
-		prompt("Output Value")
-	}
-	field(OUT,DBF_OUTLINK) {
-		prompt("Output Specification")
-		promptgroup(GUI_OUTPUT)
-		interest(1)
-	}
-	field(OROC,DBF_DOUBLE) {
-		prompt("Output Rate of Chang")
-		promptgroup(GUI_OUTPUT)
-		interest(1)
-	}
-	field(DOL,DBF_INLINK) {
-		prompt("Desired Output Loc")
-		promptgroup(GUI_OUTPUT)
-		interest(1)
-	}
-	field(OMSL,DBF_MENU) {
-		prompt("Output Mode Select")
-		promptgroup(GUI_OUTPUT)
-		interest(1)
-		menu(menuOmsl)
-	}
-	field(OIF,DBF_MENU) {
-		prompt("Out Full/Incremental")
-		promptgroup(GUI_OUTPUT)
-		interest(1)
-		menu(aoOIF)
-	}
-	field(PREC,DBF_SHORT) {
-		prompt("Display Precision")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
-		prop(YES)
-	}
-	field(LINR,DBF_MENU) {
-		prompt("Linearization")
-		promptgroup(GUI_CONVERT)
-		special(SPC_LINCONV)
-		pp(TRUE)
-		interest(1)
-		menu(menuConvert)
-	}
-	field(EGUF,DBF_DOUBLE) {
-		prompt("Eng Units Full")
-		promptgroup(GUI_CONVERT)
-		special(SPC_LINCONV)
-		pp(TRUE)
-		interest(1)
-	}
-	field(EGUL,DBF_DOUBLE) {
-		prompt("Eng Units Low")
-		promptgroup(GUI_CONVERT)
-		special(SPC_LINCONV)
-		pp(TRUE)
-		interest(1)
-	}
-	field(EGU,DBF_STRING) {
-		prompt("Engineering Units")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
-		size(16)
-		prop(YES)
-	}
-	field(ROFF,DBF_LONG) {
-		prompt("Raw Offset, obsolete")
-		pp(TRUE)
-		interest(2)
-	}
-	field(EOFF,DBF_DOUBLE) {
-		prompt("EGU to Raw Offset")
-		promptgroup(GUI_CONVERT)
-		pp(TRUE)
-		interest(2)
-	}
-	field(ESLO,DBF_DOUBLE) {
-		prompt("EGU to Raw Slope")
-		promptgroup(GUI_CONVERT)
-		pp(TRUE)
-		interest(2)
-		initial("1")
-	}
-	field(DRVH,DBF_DOUBLE) {
-		prompt("Drive High Limit")
-		promptgroup(GUI_OUTPUT)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-	}
-	field(DRVL,DBF_DOUBLE) {
-		prompt("Drive Low Limit")
-		promptgroup(GUI_OUTPUT)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-	}
-	field(HOPR,DBF_DOUBLE) {
-		prompt("High Operating Range")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
-		prop(YES)
-	}
-	field(LOPR,DBF_DOUBLE) {
-		prompt("Low Operating Range")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
-		prop(YES)
-	}
-	field(AOFF,DBF_DOUBLE) {
-		prompt("Adjustment Offset")
-		promptgroup(GUI_CONVERT)
-		pp(TRUE)
-		interest(1)
-	}
-	field(ASLO,DBF_DOUBLE) {
-		prompt("Adjustment Slope")
-		promptgroup(GUI_CONVERT)
-		pp(TRUE)
-		interest(1)
-	}
-	field(HIHI,DBF_DOUBLE) {
-		prompt("Hihi Alarm Limit")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-	}
-	field(LOLO,DBF_DOUBLE) {
-		prompt("Lolo Alarm Limit")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-	}
-	field(HIGH,DBF_DOUBLE) {
-		prompt("High Alarm Limit")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-	}
-	field(LOW,DBF_DOUBLE) {
-		prompt("Low Alarm Limit")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-	}
-	field(HHSV,DBF_MENU) {
-		prompt("Hihi Severity")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-		menu(menuAlarmSevr)
-	}
-	field(LLSV,DBF_MENU) {
-		prompt("Lolo Severity")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-		menu(menuAlarmSevr)
-	}
-	field(HSV,DBF_MENU) {
-		prompt("High Severity")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-		menu(menuAlarmSevr)
-	}
-	field(LSV,DBF_MENU) {
-		prompt("Low Severity")
-		promptgroup(GUI_ALARMS)
-		pp(TRUE)
-		interest(1)
-		prop(YES)
-		menu(menuAlarmSevr)
-	}
-	field(HYST,DBF_DOUBLE) {
-		prompt("Alarm Deadband")
-		promptgroup(GUI_ALARMS)
-		interest(1)
-	}
-	field(ADEL,DBF_DOUBLE) {
-		prompt("Archive Deadband")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
-	}
-	field(MDEL,DBF_DOUBLE) {
-		prompt("Monitor Deadband")
-		promptgroup(GUI_DISPLAY)
-		interest(1)
-	}
-	field(RVAL,DBF_LONG) {
-		prompt("Current Raw Value")
-		pp(TRUE)
-	}
-	field(ORAW,DBF_LONG) {
-		prompt("Previous Raw Value")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(RBV,DBF_LONG) {
-		prompt("Readback Value")
-		special(SPC_NOMOD)
-	}
-	field(ORBV,DBF_LONG) {
-		prompt("Prev Readback Value")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(PVAL,DBF_DOUBLE) {
-		prompt("Previous value")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(LALM,DBF_DOUBLE) {
-		prompt("Last Value Alarmed")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(ALST,DBF_DOUBLE) {
-		prompt("Last Value Archived")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(MLST,DBF_DOUBLE) {
-		prompt("Last Val Monitored")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(PBRK,DBF_NOACCESS) {
-		prompt("Ptrto brkTable")
-		special(SPC_NOMOD)
-		interest(4)
-		extra("void *	pbrk")
-	}
-	field(INIT,DBF_SHORT) {
-		prompt("Initialized?")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(LBRK,DBF_SHORT) {
-		prompt("LastBreak Point")
-		special(SPC_NOMOD)
-		interest(3)
-	}
-	field(SIOL,DBF_OUTLINK) {
-		prompt("Sim Output Specifctn")
-		promptgroup(GUI_INPUTS)
-		interest(1)
-	}
-	field(SIML,DBF_INLINK) {
-		prompt("Sim Mode Location")
-		promptgroup(GUI_INPUTS)
-		interest(1)
-	}
-	field(SIMM,DBF_MENU) {
-		prompt("Simulation Mode")
-		interest(1)
-		menu(menuYesNo)
-	}
-	field(SIMS,DBF_MENU) {
-		prompt("Sim mode Alarm Svrty")
-		promptgroup(GUI_INPUTS)
-		interest(2)
-		menu(menuAlarmSevr)
-	}
-	field(IVOA,DBF_MENU) {
-		prompt("INVALID output action")
-		promptgroup(GUI_OUTPUT)
-		interest(2)
-		menu(menuIvoa)
-	}
-	field(IVOV,DBF_DOUBLE) {
-		prompt("INVALID output value")
-		promptgroup(GUI_OUTPUT)
-		interest(2)
-	}
-	field(OMOD,DBF_UCHAR) {
-		prompt("Was OVAL modified?")
-		special(SPC_NOMOD)
-	}
-}
diff --git a/src/std/rec/aoRecord.dbd.pod b/src/std/rec/aoRecord.dbd.pod
new file mode 100644
index 000000000..f9be97452
--- /dev/null
+++ b/src/std/rec/aoRecord.dbd.pod
@@ -0,0 +1,917 @@
+#*************************************************************************
+# Copyright (c) 2013 UChicago Argonne LLC, as Operator of Argonne
+#     National Laboratory.
+# Copyright (c) 2002 The Regents of the University of California, as
+#     Operator of Los Alamos National Laboratory.
+# EPICS BASE is distributed subject to a Software License Agreement found
+# in file LICENSE that is included with this distribution. 
+#*************************************************************************
+
+=title Analog Output Record (ao)
+
+This record type is normally used to send an analog value to an output device,
+converting it from engineering units into an integer value if necessary.
+The record supports alarm and drive limits, rate-of-change limiting, output
+value integration, linear and break-point conversion from engineering units, and
+graphics and control limits.
+
+=head2 Record-specific Menus
+
+=head3 Menu aoOIF
+
+The OIF field which uses this menu controls whether the record acts as an
+integrator (C<Incremental>) or not (C<Full>).
+
+=menu aoOIF
+
+=head2 Parameter Fields
+
+The record-specific fields are described below.
+
+=recordtype ao
+
+=cut
+
+menu(aoOIF) {
+    choice(aoOIF_Full,"Full")
+    choice(aoOIF_Incremental,"Incremental")
+}
+
+recordtype(ao) {
+
+=head3 Output Value Determination
+
+These fields control how the record determines the value to be output when it
+gets processed:
+
+=fields OMSL, DOL, OIF, PVAL, DRVH, DRVL, VAL, OROC, OVAL
+
+The following steps are performed in order during record processing.
+
+=head4 Fetch Value, Integrate
+
+The OMSL menu field is used to determine whether the DOL link and OIF menu
+fields should be used during processing or not:
+
+=over
+
+=item *
+If OMSL is C<supervisory> the DOL and OIF fields are not used.
+The new output value is taken from the VAL field, which may have been set from
+elsewhere.
+
+=item *
+If OMSL is C<closed_loop> the DOL link field is read to obtain a value; if OIF
+is C<Incremental> and the DOL link was read successfully, the record's previous
+output value PVAL is added to it.
+
+=back
+
+=head4 Drive Limits
+
+The output value is now clipped to the range DRVL to DRVH inclusive, provided
+that DRVH > DRVL.
+The result is copied into both the VAL and PVAL fields.
+
+=head4 Limit Rate of Change
+
+If the OROC field is not zero, the VAL field is now adjusted so it is no more
+than OROC different to the previous output value given in OVAL.
+OROC thus determines the maximum change in the output value that can occur each
+time the record gets processed.
+The result is copied into the OVAL field, which is used as the input to the
+following Units Conversion processing stage.
+
+=head3 Units Conversion
+
+...
+
+
+For analog output records that do not use the Soft Channel device support
+routine, the specified conversions (if any) are performed on the OVAL field and
+the resulting value in the RVAL field is sent to the address contained in the
+output link after it is adjusted by the values in the AOFF and ASLO fields.
+
+=fields LINR, RVAL, ROFF, EGUF, EGUL, AOFF, ASLO, ESLO, EOFF
+
+=head4 Conversion Related Fields and the Conversion Process
+
+Except for analog outputs that use Soft Channel device support, the LINR field
+determines if a conversion is performed and which conversion algorithm is used
+to convert OVAL to RVAL.
+
+The LINR field can specify C<LINEAR> or C<SLOPE> for linear conversions,
+C<NO CONVERSION> for no conversions at all, or the name of a breakpoint table
+such as C<typeKdegC> for breakpoint conversions.
+
+Note that the ESLO, EOFF, EGUF, and EGUL fields are only used for linear
+conversions.
+Also note that none of these fields have any significance for records that use
+the Soft Channel device support module.
+
+=over
+
+=item EGUF, EGUF
+
+The user must calculate these fields when configuring the database for records
+that use C<LINEAR> conversions.
+They are used to calculate the values for ESLO and EOFF.
+See Conversion Specification for more information on how to calculate these
+fields.
+
+=item AOFF, ASLO
+
+These fields are adjustment parameters for the raw output values.
+They are applied to the raw output value after conversion from engineering
+units.
+
+=item ESLO, EOFF
+
+Computed by device support using EGUF and EGUL when LINR specifies C<LINEAR>.
+These values must be supplied by the user when LINR specifies C<SLOPE>.
+Used only when LINR is C<LINEAR> or C<SLOPE>.
+
+=item ROFF
+
+This field can be used to offset the raw value generated by the conversion
+process, which is needed for some kinds of hardware.
+
+=back
+
+Conversion proceeds as follows:
+
+=over
+
+=item 1. If LINR==LINEAR or LINR==SLOPE, then X = (VAL - EOFF) / ESLO,
+else if LINR==NO_CONVERSION, then X = VAL,
+else X is obtained via breakpoint table.
+
+=item 2. X = (X - AOFF) / ASLO
+
+=item 3. RVAL = round(X) - ROFF
+
+=back
+
+To see how the Raw Soft Channel device support routine uses these
+fields, see L</Device Support For Soft Records> below for more
+information.
+
+=head3 Output Specification
+
+The analog output record sends its desired output to the address in the
+OUT field. For analog outputs that write their values to devices, the
+OUT field must specify the address of the I/O card. In addition, the
+DTYP field must contain the name of the device support module. Be aware
+that the address format differs according to the I/O bus used. See
+Address Specification for information on the format of hardware
+addresses. The user can see a list of the device support modules
+currently supported at the user's local site by using the dbst utility
+in R3.13.
+
+For soft records the output link can be a database link, a channel
+access link, or a constant value. If the link is a constant, no output
+is sent. See Address Specification for information on the format of
+database and channel access addresses.
+
+=fields DTYP, OUT
+
+=head3 Operator Display Parameters
+
+These parameters are used to present meaningful data to the operator.
+They display the value and other parameters of the analog output either
+textually or graphically.
+
+EGU is a string of up to 16 characters describing the units that the
+analog output measures. It is retrieved by the get_units record support
+routine.
+
+The HOPR and LOPR fields set the upper and lower display limits for the
+VAL, OVAL, PVAL, HIHI, HIGH, LOW, and LOLO fields. Both the
+get_graphic_double and get_control_double record support routines
+retrieve these fields. If these values are defined, they must be in the
+range: DRVL E<lt>= LOPR E<lt>= HOPR E<lt>= DRVH.
+
+The PREC field determines the floating point precision with which to
+display VAL, OVAL and PVAL. It is used whenever the get_precision
+record support routine is called.
+
+See Fields Common to All Record Types for more on the record name
+(NAME) and description (DESC) fields.
+
+=fields EGU, HOPR, LOPR, PREC, NAME, DESC
+
+=head3 Alarm Parameters
+
+The possible alarm conditions for analog outputs are the SCAN, READ,
+INVALID and limit alarms. The SCAN, READ, and INVALID alarms are called
+by the record or device support routines.
+
+The limit alarms are configured by the user in the HIHI, LOLO, HIGH,
+and LOW fields, which must be floating-point values. For each of these
+fields, there is a corresponding severity field which can be either
+NO_ALARM, MINOR, or MAJOR.
+
+See Alarm Specification for a complete explanation of alarms and these
+fields. See Invalid Alarm Output Action for more information on the
+IVOA and IVOV fields. Alarm Fields lists other fields related to a
+alarms that are common to all record types.
+
+=fields HIHI, HIGH, LOW, LOLO, HHSV, HSV, LSV, LLSV, HYST, IVOA, IVOV
+
+=head3 Monitor Parameters
+
+These parameters are used to specify deadbands for monitors on the VAL
+field. The monitors are sent when the value field exceeds the last
+monitored field by the specified deadband. If these fields have a value
+of zero, everytime the value changes, a monitor will be triggered; if
+they have a value of -1, everytime the record is processed, monitors
+are triggered. ADEL is the deadband for archive monitors, and MDEL the
+deadband for all other types of monitors. See Monitor Specification for
+a complete explanation of monitors.
+
+=fields ADEL, MDEL
+
+=head3 Run-time and Simulation Mode Parameters
+
+These parameters are used by the run-time code for processing the
+analog output. They are not configurable. They represent the current
+state of the record. The record support routines use some of them for
+more efficient processing.
+
+The ORAW field is used to decide if monitors should be triggered for
+RVAL when monitors are triggered for VAL. The RBV field is the actual
+read back value obtained from the hardware itself or from the
+associated device driver. It is the responsibility of the device
+support routine to give this field a value.
+
+ORBV is used to decide if monitors should be triggered for RBV at the
+same time monitors are triggered for changes in VAL.
+
+The LALM, MLST, and ALST fields are used to implement the hysteresis
+factors for monitor callbacks.
+
+The INIT field is used to initialize the LBRK field and for smoothing.
+
+The PBRK field contains a pointer to the current breakpoint table (if
+any), and LBRK contains a pointer to the last breakpoint table used.
+
+The OMOD field indicates whether OVAL differs from VAL. It will be
+different if VAL or OVAL have changed since the last time the record
+was processed, or if VAL has been adjusted by OROC during the current
+processing.
+
+=fields ORAW, RBV, ORBV, LALM, ALST, MLST, INIT, PBRK, LBRK, PVAL, OMOD
+
+The following fields are used to operate the analog output in the
+simulation mode. See Fields Common to Many Record Types for more
+information on these fields.
+
+=fields SIOL, SIML, SIMM, SIMS
+
+=cut
+
+    include "dbCommon.dbd" 
+    field(VAL,DBF_DOUBLE) {
+        prompt("Desired Output")
+        promptgroup(GUI_OUTPUT)
+        asl(ASL0)
+        pp(TRUE)
+    }
+    field(OVAL,DBF_DOUBLE) {
+        prompt("Output Value")
+    }
+    field(OUT,DBF_OUTLINK) {
+        prompt("Output Specification")
+        promptgroup(GUI_OUTPUT)
+        interest(1)
+    }
+    field(OROC,DBF_DOUBLE) {
+        prompt("Output Rate of Change")
+        promptgroup(GUI_OUTPUT)
+        interest(1)
+    }
+    field(DOL,DBF_INLINK) {
+        prompt("Desired Output Loc")
+        promptgroup(GUI_OUTPUT)
+        interest(1)
+    }
+    field(OMSL,DBF_MENU) {
+        prompt("Output Mode Select")
+        promptgroup(GUI_OUTPUT)
+        interest(1)
+        menu(menuOmsl)
+    }
+    field(OIF,DBF_MENU) {
+        prompt("Out Full/Incremental")
+        promptgroup(GUI_OUTPUT)
+        interest(1)
+        menu(aoOIF)
+    }
+    field(PREC,DBF_SHORT) {
+        prompt("Display Precision")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
+		prop(YES)
+    }
+    field(LINR,DBF_MENU) {
+        prompt("Linearization")
+        promptgroup(GUI_CONVERT)
+        special(SPC_LINCONV)
+        pp(TRUE)
+        interest(1)
+        menu(menuConvert)
+    }
+    field(EGUF,DBF_DOUBLE) {
+        prompt("Eng Units Full")
+        promptgroup(GUI_CONVERT)
+        special(SPC_LINCONV)
+        pp(TRUE)
+        interest(1)
+    }
+    field(EGUL,DBF_DOUBLE) {
+        prompt("Eng Units Low")
+        promptgroup(GUI_CONVERT)
+        special(SPC_LINCONV)
+        pp(TRUE)
+        interest(1)
+    }
+    field(EGU,DBF_STRING) {
+        prompt("Engineering Units")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
+        size(16)
+		prop(YES)
+    }
+    field(ROFF,DBF_LONG) {
+        prompt("Raw Offset, obsolete")
+        pp(TRUE)
+        interest(2)
+    }
+    field(EOFF,DBF_DOUBLE) {
+        prompt("EGU to Raw Offset")
+        promptgroup(GUI_CONVERT)
+        pp(TRUE)
+        interest(2)
+    }
+    field(ESLO,DBF_DOUBLE) {
+        prompt("EGU to Raw Slope")
+        promptgroup(GUI_CONVERT)
+        pp(TRUE)
+        interest(2)
+        initial("1")
+    }
+    field(DRVH,DBF_DOUBLE) {
+        prompt("Drive High Limit")
+        promptgroup(GUI_OUTPUT)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+    }
+    field(DRVL,DBF_DOUBLE) {
+        prompt("Drive Low Limit")
+        promptgroup(GUI_OUTPUT)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+    }
+    field(HOPR,DBF_DOUBLE) {
+        prompt("High Operating Range")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
+		prop(YES)
+    }
+    field(LOPR,DBF_DOUBLE) {
+        prompt("Low Operating Range")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
+		prop(YES)
+    }
+    field(AOFF,DBF_DOUBLE) {
+        prompt("Adjustment Offset")
+        promptgroup(GUI_CONVERT)
+        pp(TRUE)
+        interest(1)
+    }
+    field(ASLO,DBF_DOUBLE) {
+        prompt("Adjustment Slope")
+        promptgroup(GUI_CONVERT)
+        pp(TRUE)
+        interest(1)
+    }
+    field(HIHI,DBF_DOUBLE) {
+        prompt("Hihi Alarm Limit")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+    }
+    field(LOLO,DBF_DOUBLE) {
+        prompt("Lolo Alarm Limit")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+    }
+    field(HIGH,DBF_DOUBLE) {
+        prompt("High Alarm Limit")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+    }
+    field(LOW,DBF_DOUBLE) {
+        prompt("Low Alarm Limit")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+    }
+    field(HHSV,DBF_MENU) {
+        prompt("Hihi Severity")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+        menu(menuAlarmSevr)
+    }
+    field(LLSV,DBF_MENU) {
+        prompt("Lolo Severity")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+        menu(menuAlarmSevr)
+    }
+    field(HSV,DBF_MENU) {
+        prompt("High Severity")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+        menu(menuAlarmSevr)
+    }
+    field(LSV,DBF_MENU) {
+        prompt("Low Severity")
+        promptgroup(GUI_ALARMS)
+        pp(TRUE)
+        interest(1)
+		prop(YES)
+        menu(menuAlarmSevr)
+    }
+    field(HYST,DBF_DOUBLE) {
+        prompt("Alarm Deadband")
+        promptgroup(GUI_ALARMS)
+        interest(1)
+    }
+    field(ADEL,DBF_DOUBLE) {
+        prompt("Archive Deadband")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
+    }
+    field(MDEL,DBF_DOUBLE) {
+        prompt("Monitor Deadband")
+        promptgroup(GUI_DISPLAY)
+        interest(1)
+    }
+    field(RVAL,DBF_LONG) {
+        prompt("Current Raw Value")
+        pp(TRUE)
+    }
+    field(ORAW,DBF_LONG) {
+        prompt("Previous Raw Value")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(RBV,DBF_LONG) {
+        prompt("Readback Value")
+        special(SPC_NOMOD)
+    }
+    field(ORBV,DBF_LONG) {
+        prompt("Prev Readback Value")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(PVAL,DBF_DOUBLE) {
+        prompt("Previous value")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(LALM,DBF_DOUBLE) {
+        prompt("Last Value Alarmed")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(ALST,DBF_DOUBLE) {
+        prompt("Last Value Archived")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(MLST,DBF_DOUBLE) {
+        prompt("Last Val Monitored")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(PBRK,DBF_NOACCESS) {
+        prompt("Ptrto brkTable")
+        special(SPC_NOMOD)
+        interest(4)
+        extra("void *   pbrk")
+    }
+    field(INIT,DBF_SHORT) {
+        prompt("Initialized?")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(LBRK,DBF_SHORT) {
+        prompt("LastBreak Point")
+        special(SPC_NOMOD)
+        interest(3)
+    }
+    field(SIOL,DBF_OUTLINK) {
+        prompt("Sim Output Specifctn")
+        promptgroup(GUI_INPUTS)
+        interest(1)
+    }
+    field(SIML,DBF_INLINK) {
+        prompt("Sim Mode Location")
+        promptgroup(GUI_INPUTS)
+        interest(1)
+    }
+    field(SIMM,DBF_MENU) {
+        prompt("Simulation Mode")
+        interest(1)
+        menu(menuYesNo)
+    }
+    field(SIMS,DBF_MENU) {
+        prompt("Sim mode Alarm Svrty")
+        promptgroup(GUI_INPUTS)
+        interest(2)
+        menu(menuAlarmSevr)
+    }
+    field(IVOA,DBF_MENU) {
+        prompt("INVALID output action")
+        promptgroup(GUI_OUTPUT)
+        interest(2)
+        menu(menuIvoa)
+    }
+    field(IVOV,DBF_DOUBLE) {
+        prompt("INVALID output value")
+        promptgroup(GUI_OUTPUT)
+        interest(2)
+    }
+    field(OMOD,DBF_UCHAR) {
+        prompt("Was OVAL modified?")
+        special(SPC_NOMOD)
+    }
+}
+
+=head2 Record Support
+
+=head3 Record Support Routines
+
+The following are the record support routines that would be of interest
+to an application developer. Other routines are the get_units,
+get_precision, get_graphic_double, and get_control_double routines.
+
+=over
+
+=item init_record
+
+This routine initializes SIMM if SIML is a constant or creates a
+channel access link if SIML is PV_LINK. If SIOL is PV_LINK a channel
+access link is created.
+
+This routine next checks to see that device support is available. If
+DOL is a constant, then VAL is initialized with its value and UDF is
+set to FALSE.
+
+The routine next checks to see if the device support write routine is
+defined. If either device support or the device support write routine
+does not exist, an error message is issued and processing is
+terminated.
+
+For compatibility with old device supports that don't know EOFF, if
+both EOFF and ESLO have their default value, EOFF is set to EGUL.
+
+If device support includes init_record, it is called.
+
+INIT is set TRUE. This causes PBRK, LBRK, and smoothing to be
+re-initialized. If "backwards" linear conversion is requested, then VAL
+is computed from RVAL using the algorithm:
+
+ VAL = ((RVAL+ROFF) * ASLO + AOFF) * ESLO + EOFF
+
+and UDF is set to FALSE.
+
+For breakpoint conversion, a call is made to cvtEngToRawBpt and UDF is
+then set to FALSE. PVAL is set to VAL.
+
+=item process
+
+See next section.
+
+=item special
+
+The only special processing for analog output records is SPC_LINCONV
+which is invoked whenever either of the fields LINR, EGUF, EGUL or ROFF
+is changed If the device support routine special_linconv exists it is
+called.
+
+INIT is set TRUE. This causes PBRK, LBRK, and smoothing to be
+re-initialized.
+
+=item get_value
+
+Fills in the values of struct valueDes so that they refer to VAL.
+
+=item get_alarm_double
+
+Sets the following values:
+
+ upper_alarm_limit = HIHI
+ upper_warning_limit = HIGH
+ lower_warning_limit = LOW
+ lower_alarm_limit = LOLO
+
+=back
+
+=head3 Record Processing
+
+Routine process implements the following algorithm:
+
+=over
+
+=item 1. Check to see that the appropriate device support module
+exists. If it doesn't, an error message is issued and processing is
+terminated with the PACT field set to TRUE. This ensures that processes
+will no longer be called for this record. Thus error storms will not
+occur.
+
+=item 2. Check PACT: If PACT is FALSE call fetch_values and convert
+which perform the following steps:
+
+=over
+
+=item * fetch_values:
+
+=over
+
+=item * if DOL is DB_LINK and OMSL is CLOSED_LOOP then get value from
+DOL
+
+=item * if OIF is INCREMENTAL then set value = value + VAL else value =
+VAL
+
+=back
+
+=item * convert:
+
+=over
+
+=item * If Drive limits are defined force value to be within limits
+
+=item * Set VAL equal to value
+
+=item * Set UDF to FALSE.
+
+=item * If OVAL is undefined set it equal to value
+
+=item * If OROC is defined and not 0 make |value-OVAL| E<lt>=OROC
+
+=item * Set OVAL equal to value
+
+=item * Compute RVAL from OVAL. using linear or break point table
+conversion. For linear conversions the algorithm is RVAL =
+(OVAL-EOFF)/ESLO.
+
+=item * For break point table conversion a call is made to
+cvtEngToRawBpt.
+
+=item * After that, for all conversion types AOFF, ASLO, and ROFF are
+calculated in, using the formula RVAL = (RVAL -AOFF) / ASLO - ROFF.
+
+=back
+
+=back
+
+=item 3. Check alarms: This routine checks to see if the new VAL causes
+the alarm status and severity to change. If so, NSEV, NSTA and y are
+set. It also honors the alarm hysteresis factor (HYST). Thus the value
+must change by at least HYST before the alarm status and severity is
+reduced.
+
+=item 4. Check severity and write the new value. See Invalid Alarm
+Output Action for details on how invalid alarms affect output records.
+
+=item 5. If PACT has been changed to TRUE, the device support write
+output routine has started but has not completed writing the new value.
+In this case, the processing routine merely returns, leaving PACT TRUE.
+
+=item 6. Check to see if monitors should be invoked:
+
+=over
+
+=item * Alarm monitors are invoked if the alarm status or severity has
+changed.
+
+=item * Archive and value change monitors are invoked if ADEL and MDEL
+conditions are met.
+
+=item * Monitors for RVAL and for RBV are checked whenever other
+monitors are invoked.
+
+=item * NSEV and NSTA are reset to 0.
+
+=back
+
+=item 7. Scan forward link if necessary, set PACT and INIT FALSE, and
+return.
+
+=back
+
+=head2 Device Support
+
+=head3 Fields Of Interest To Device Support
+
+Each analog output record must have an associated set of device support
+routines. The primary responsibility of the device support routines is
+to output a new value whenever write_ao is called. The device support
+routines are primarily interested in the following fields:
+
+=over
+
+=item *
+PACT E<mdash> Process Active, used to indicate asynchronous completion
+
+=item *
+DPVT E<mdash> Device Private, reserved for device support to use
+
+=item *
+OUT E<mdash> Output Link, provides addressing information
+
+=item *
+EGUF E<mdash> Engineering Units Full
+
+=item *
+EGUL E<mdash> Engineering Units Low
+
+=item *
+ESLO E<mdash> Engineering Unit Slope
+
+=item *
+EOFF E<mdash> Engineering Unit Offset
+
+=item *
+OVAL E<mdash> Output Value, in Engineering units
+
+=item *
+RVAL E<mdash> Raw Output Value, after conversion
+
+=back
+
+=head3 Device Support routines
+
+Device support consists of the following routines:
+
+=over
+
+=item C<long report(int level)>
+
+This optional routine is called by the IOC command C<dbior> and is passed the
+report level that was requested by the user.
+It should print a report on the state of the device support to stdout.
+The C<level> parameter may be used to output increasingly more detailed
+information at higher levels, or to select different types of information with
+different levels.
+Level zero should print no more than a small summary.
+
+=item C<long init(int after)>
+
+This optional routine is called twice at IOC initialization time.
+The first call happens before any of the C<init_record()> calls are made, with
+the integer parameter C<after> set to 0.
+The second call happens after all of the C<init_record()> calls have been made,
+with C<after> set to 1.
+
+=item C<long init_record(aoRecord *prec)>
+
+This optional routine is called by the record initialization code for each ao
+record instance that has its DTYP field set to use this device support.
+It is normally used to check that the OUT address has the expected type and
+points to a valid device; to allocate any record-specific buffer space and
+other memory; and to connect any communication channels needed for the
+C<write_ao()> routine to work properly.
+
+If the record type's unit conversion features are used, the C<init_record()>
+routine should calculate appropriate values for the ESLO and EOFF fields from
+the EGUL and EGUF field values.
+This calculation only has to be performed if the record's LINR field is set to
+C<LINEAR>, but it is not necessary to check that condition first.
+This same calculation takes place in the C<special_linconv()> routine, so the
+implementation can usually just call that routine to perform the task.
+
+If the the last output value can be read back from the hardware, this routine
+should also fetch that value and put it into the record's RVAL or VAL field. The
+return value should be zero if the RVAL field has been set, or 2 if either the
+VAL field has been set or if the last output value cannot be retrieved.
+
+=item C<long get_ioint_info(int cmd, aoRecord *prec, IOSCANPVT *piosl)>
+
+This optional routine is called whenever the record's SCAN field is being
+changed to or from the value C<I/O Intr> to find out which I/O Interrupt Scan
+list the record should be added to or deleted from.
+If this routine is not provided, it will not be possible to set the SCAN field
+to the value C<I/O Intr> at all.
+
+The C<cmd> parameter is zero when the record is being added to the scan list,
+and one when it is being removed from the list.
+The routine must determine which interrupt source the record should be connected
+to, which it indicates by the scan list that it points the location at C<*piosl>
+to before returning.
+It can prevent the SCAN field from being changed at all by returning a non-zero
+value to its caller.
+
+In most cases the device support will create the I/O Interrupt Scan lists that
+it returns for itself, by calling C<void scanIoInit(IOSCANPVT *piosl)> once for
+each separate interrupt source.
+That API allocates memory and inializes the list, then passes back a pointer to
+the new list in the location at C<*piosl>.
+When the device support receives notification that the interrupt has occurred,
+it announces that to the IOC by calling C<void scanIoRequest(IOSCANPVT iosl)>
+which will arrange for the appropriate records to be processed in a suitable
+thread.
+The C<scanIoRequest()> routine is safe to call from an interrupt service routine
+on embedded architectures (vxWorks and RTEMS).
+
+=item C<long write_ao(aoRecord *prec)>
+
+This essential routine is called whenever the record has a new output value to
+send to the device. It is responsible for performing the write operation, using
+either the engineering units value found in the record's OVAL field, or the raw
+value from the record's RVAL field if the record type's unit conversion
+facilities are used. A return value of zero indicates success, any other value
+indicates that an error occurred.
+
+This routine must not block (busy-wait) if the device takes more than a few
+microseconds to accept the new value. In that case the routine must use
+asynchronous completion to tell the record when the write operation eventually
+completes. It signals that this is an asynchronous operation by setting the
+record's PACT field to TRUE before it returns, having arranged for the record's
+C<process()> routine to be called later once the write operation is over. When
+that happens the C<write_ao()> routine will be called again with PACT still set
+to TRUE; it should then set it to FALSE to indicate the write has completed, and
+return.
+
+=item C<long special_linconv(aoRecord *prec, int after)>
+
+This optional routine should be provided if the record type's unit conversion
+features are used by the device support's C<write_ao()> routine utilizing the
+RVAL field rather than OVAL or VAL.
+It is called by the record code whenever any of the the fields LINR, EGUL or
+EGUF are modified and LINR has the value C<LINEAR>.
+The routine must calculate and set the fields EOFF and ESLO appropriately based
+on the new values of EGUL and EGUF.
+
+These calculations can be expressed in terms of the minimum and maximum raw
+values that the C<write_ao()> routine can accept in the RVAL field.
+When VAL is EGUF the RVAL field will be set to I<RVAL_max>, and when VAL is
+EGUL the RVAL field will become I<RVAL_min>.
+The fomulae to use are:
+
+=over 4
+
+EOFF = (I<RVAL_max> * EGUL E<minus> I<RVAL_min> * EGUF) /
+(I<RVAL_max> E<minus> I<RVAL_min>)
+
+ESLO = (EGUF E<minus> EGUL) / (I<RVAL_max> E<minus> I<RVAL_min>)
+
+=back
+
+Note that the record support sets EOFF to EGUL before calling this routine,
+which is a very common case (I<RVAL_min> is zero).
+
+=back
+
+=head2 Device Support For Soft Records
+
+Two soft device support modules Soft Channel and Raw Soft Channel are
+provided for output records not related to actual hardware devices. The
+OUT link type must be either a CONSTANT, DB_LINK, or CA_LINK.
+
+=head3 Soft Channel
+
+This module writes the current value of OVAL.
+
+If the OUT link type is PV_LINK, then dbCaAddInlink is called by
+init_record. init_record always returns a value of 2, which means that
+no conversion will ever be attempted.
+
+write_ao calls recGblPutLinkValue to write the current value of VAL.
+See Soft Output for details.
+
+=head3 Raw Soft Channel
+
+This module is like the previous except that it writes the current
+value of RVAL.
+
+=cut
diff --git a/src/std/rec/compressRecord.dbd.pod b/src/std/rec/compressRecord.dbd.pod
index 54d1625e5..97b84a9a0 100644
--- a/src/std/rec/compressRecord.dbd.pod
+++ b/src/std/rec/compressRecord.dbd.pod
@@ -6,6 +6,33 @@
 # EPICS BASE is distributed subject to a Software License Agreement found
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
+
+=title Compress Record (compress)
+
+...
+
+=head2 Record-specific Menus
+
+=head3 Menu compressALG
+
+The ALG field which uses this menu controls the compression algorithm used.
+
+...
+
+=menu compressALG
+
+...
+
+=head2 Parameter Fields
+
+The record-specific fields are described below.
+
+=recordtype compress
+
+...
+
+=cut
+
 menu(compressALG) {
 	choice(compressALG_N_to_1_Low_Value,"N to 1 Low Value")
 	choice(compressALG_N_to_1_High_Value,"N to 1 High Value")
@@ -16,8 +43,6 @@ menu(compressALG) {
 }
 recordtype(compress) {
 
-=head1 Compress Record (compress)
-
 =fields VAL
 
 =cut
diff --git a/src/std/rec/waveformRecord.dbd.pod b/src/std/rec/waveformRecord.dbd.pod
index 143855c22..d28302801 100644
--- a/src/std/rec/waveformRecord.dbd.pod
+++ b/src/std/rec/waveformRecord.dbd.pod
@@ -7,10 +7,25 @@
 # in file LICENSE that is included with this distribution. 
 #*************************************************************************
 
-=head1 Waveform Record (waveform)
+=title Waveform Record (waveform)
 
 ...
 
+=head2 Record-specific Menus
+
+=head3 Menu waveformPOST
+
+The MPST and APST fields use this menu to determine when to post new value
+and archive monitors respectively.
+
+=menu waveformPOST
+
+...
+
+=head2 Parameter Fields
+
+The record-specific fields are described below.
+
 =recordtype waveform
 
 ...
@@ -124,17 +139,6 @@ recordtype(waveform) {
 		interest(2)
 		menu(menuAlarmSevr)
 	}
-
-=head3 Menu waveformPOST
-
-...
-
-=menu waveformPOST
-
-...
-
-=cut
-
 	field(MPST,DBF_MENU) {
                 prompt("Post Value Monitors")
                 promptgroup(GUI_DISPLAY)

From 5b9bee82a55e31b3e5fbe93a001e9a957b9f2958 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 23 Jun 2014 22:11:52 -0600
Subject: [PATCH 18/25] Document the sync filter.

Also, use enum values where we have them.
---
 src/std/filters/filters.dbd.pod | 54 +++++++++++++++++++++++++++++++--
 src/std/filters/sync.c          | 16 +++++++---
 2 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/src/std/filters/filters.dbd.pod b/src/std/filters/filters.dbd.pod
index 9dbc97feb..afa63978d 100644
--- a/src/std/filters/filters.dbd.pod
+++ b/src/std/filters/filters.dbd.pod
@@ -4,7 +4,7 @@ Channel Filters can be applied to Channel Access channels by a client, using
 a JSON Field Modifier to select the filter and any parameters.
 The following filters are available in this release:
 
-=over 4
+=over
 
 =item * L<TimeStamp|/"TimeStamp Filter "ts"">
 
@@ -88,7 +88,7 @@ percentage.
 
 =head4 Parameters
 
-=over 4
+=over
 
 =item Deadband C<"d">
 
@@ -136,6 +136,54 @@ registrar(syncInitialize)
 
 =head3 Synchronize Filter C<"sync">
 
-...
+This filter is used to dynamically enable or disable monitors according
+to a condition and a state variable declared by the IOC.
+
+State variables have a boolean value and can be set by a binary output
+record, an iocsh command or by other software running in the IOC calling
+C<dbStateSet()>.
+
+=head4 Parameters
+
+=over
+
+=item Mode C<"m">
+
+A single word from the list below, enclosed in double quotes C<">.
+This controls how the state value should affect the monitor stream. 
+
+=over
+
+=item C<"before"> E<mdash> only the last value received before the state
+changes from false to true is forwarded to the client.
+
+=item C<"first"> E<mdash> only the first value received after the state
+changes from true to false is forwarded to the client.
+
+=item C<"while"> E<mdash> values are forwarded to the client as long as
+the state is true.
+
+=item C<"last"> E<mdash> only the last value received before the state
+changes from true to false is forwarded to the client.
+
+=item C<"after"> E<mdash> only the first value received after the state
+changes from true to false is forwarded to the client.
+
+=item C<"unless"> E<mdash> values are forwarded to the client as long
+as the state is false.
+
+=back
+
+=item State C<"s">
+
+The name of a state variable, enclosed in double quotes C<">.
+
+=back
+
+=head4 Example
+
+ Woz$ camonitor 'test:channel'
+ ...
 
 =cut
+
diff --git a/src/std/filters/sync.c b/src/std/filters/sync.c
index 9dfd47197..07876b4cb 100644
--- a/src/std/filters/sync.c
+++ b/src/std/filters/sync.c
@@ -21,11 +21,6 @@
 
 #define STATE_NAME_LENGTH 20
 
-static const
-chfPluginEnumType modeEnum[] = { {"before", 0}, {"first", 1},
-                                 {"last", 2}, {"after", 3},
-                                 {"while", 4}, {"unless", 5},
-                                 {NULL,0} };
 typedef enum syncMode {
     syncModeBefore=0,
     syncModeFirst=1,
@@ -35,6 +30,17 @@ typedef enum syncMode {
     syncModeUnless=5
 } syncMode;
 
+static const
+chfPluginEnumType modeEnum[] = {
+    {"before", syncModeBefore},
+    {"first", syncModeFirst},
+    {"last", syncModeLast},
+    {"after", syncModeAfter},
+    {"while", syncModeWhile},
+    {"unless", syncModeUnless},
+    {NULL, 0}
+};
+
 typedef struct myStruct {
     syncMode mode;
     char state[STATE_NAME_LENGTH];

From 3c91c1736989668eb2c31e957e4cee41db19b179 Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Mon, 23 Jun 2014 22:14:35 -0600
Subject: [PATCH 19/25] Changes for newer version of Pod::Simple::HTML

---
 src/std/rec/aoRecord.dbd.pod | 2 +-
 src/tools/dbdToHtml.pl       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/std/rec/aoRecord.dbd.pod b/src/std/rec/aoRecord.dbd.pod
index f9be97452..27e156ae1 100644
--- a/src/std/rec/aoRecord.dbd.pod
+++ b/src/std/rec/aoRecord.dbd.pod
@@ -878,7 +878,7 @@ When VAL is EGUF the RVAL field will be set to I<RVAL_max>, and when VAL is
 EGUL the RVAL field will become I<RVAL_min>.
 The fomulae to use are:
 
-=over 4
+=over
 
 EOFF = (I<RVAL_max> * EGUL E<minus> I<RVAL_min> * EGUF) /
 (I<RVAL_max> E<minus> I<RVAL_min>)
diff --git a/src/tools/dbdToHtml.pl b/src/tools/dbdToHtml.pl
index d64a38ea2..f5f470f26 100644
--- a/src/tools/dbdToHtml.pl
+++ b/src/tools/dbdToHtml.pl
@@ -102,7 +102,7 @@ __END_DOCTYPE
     $podHtml = Pod::Simple::HTML->new();
 }
 
-$podHtml->html_css('style.css');
+$podHtml->html_css('<link rel="stylesheet" href="style.css" type="text/css" />');
 $podHtml->force_title(encode_entities($title));
 $podHtml->perldoc_url_prefix('');
 $podHtml->perldoc_url_postfix('.html');

From eb91f6701c7f2a03df3e1d0aca18f2fd2be816de Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@gmx.de>
Date: Thu, 28 Aug 2014 15:41:40 -0700
Subject: [PATCH 20/25] src/std/filters: Complete documentation for standard
 filters

---
 src/std/filters/filters.dbd.pod | 69 ++++++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 6 deletions(-)

diff --git a/src/std/filters/filters.dbd.pod b/src/std/filters/filters.dbd.pod
index afa63978d..a4be38998 100644
--- a/src/std/filters/filters.dbd.pod
+++ b/src/std/filters/filters.dbd.pod
@@ -57,8 +57,9 @@ registrar(tsInitialize)
 
 =head3 TimeStamp Filter C<"ts">
 
-This filter is used to set the timestamp of the (first) value fetched through
-the channel to the connection time, rather than the time the record last
+This filter is used to set the timestamp of the value fetched through
+the channel to the time the value was fetched (or an update was sent),
+rather than the time the record last
 processed which could have been days or even weeks ago for some records, or set
 to the EPICS epoch if the record has never processed.
 
@@ -102,6 +103,12 @@ A string (enclosed in double-quotes C<">), which should contain either
 C<abs> or C<rel>.
 The default mode is absolute if no mode parameter is included.
 
+=item Mode+Deadband C<"abs">/C<"rel"> (shorthand)
+
+As a shorthand, mode and deadband can be specified in one definition. In this case,
+the desired mode is given as parameter name (C<"abs"> or C<"rel">), with the numeric
+size of the deadband (absolute value or numeric percentage) as value.
+
 =back
 
 =head4 Example
@@ -114,7 +121,7 @@ The default mode is absolute if no mode parameter is included.
  test:channel                    2012-09-01 22:10:23.601023 5  
  test:channel                    2012-09-01 22:10:24.601136 6 HIGH MINOR
  ^C
- Hal$ camonitor 'test:channel.{"dbnd":{"d":1.5}}'
+ Hal$ camonitor 'test:channel.{"dbnd":{"abs":1.5}}'
  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:49.613341 1 LOLO MAJOR
  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:51.613615 3 LOW MINOR
  test:channel.{"dbnd":{"d":1.5}} 2012-09-01 22:11:53.613804 5  
@@ -128,7 +135,47 @@ registrar(arrInitialize)
 
 =head3 Array Filter C<"arr">
 
-...
+This filter is used to retrieve parts of an array (subarrays and strided
+subarrays).
+
+=head4 Parameters
+
+Note: Negative index numbers address from the end of the array, with C<-1> being the last element.
+
+=over
+
+=item Start index C<"s">
+
+Index of the first original array element to retrieve.
+
+=item Increment C<"i">
+
+Increment between retrieved elements of the original array.
+
+=item End index C<"e">
+
+Index of the last original array element to retrieve.
+
+=item Shorthand notation C<[s:i:e]>
+
+As a shorthand, the C<[s:i:e]> notation with square brackets can be used.
+
+=back
+
+Negative index numbers address from the end of the array,
+with C<-1> being the last element.
+
+Defaults (when parameters are omitted) are:
+C<s=0> (first element), C<i=1> (fetch all elements), C<e=-1>
+(last element)
+
+=head4 Example
+
+ Hal$ caget test:channel 'test:channel.{"arr":{"s":2,"i":2,"e":8}}' test:channel.[3:5] test:channel.[3:2:-3]
+ test:channel 10 0 1 2 3 4 5 6 7 8 9
+ test:channel.{"arr":{"s":2,"i":2,"e":8}} 4 2 4 6 8
+ test:channel.[3:5] 3 3 4 5
+ test:channel.[3:2:-3] 3 3 5 7
 
 =cut
 
@@ -178,12 +225,22 @@ as the state is false.
 
 The name of a state variable, enclosed in double quotes C<">.
 
+=item Mode+State (shorthand)
+
+As a shorthand, mode and state can be specified in one definition. In this case,
+the desired mode is given as parameter name (C<"before"> / C<"first"> /
+C<"while"> / C<"last"> / C<"after"> / C<"unless">), with the state name (enclosed
+in double quotes C<">) as value.
+
 =back
 
 =head4 Example
 
- Woz$ camonitor 'test:channel'
+Assuming there is a system state called "blue", that is being set true or false
+by some other facility, e.g. the timing system support, updates could be restricted
+to the "blue" periods using
+
+ Hal$ camonitor 'test:channel' 'test:channel.{"while":"blue"}'
  ...
 
 =cut
-

From 1bb4293967fc3eed72524c8fc021c217c965d6ae Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@gmx.de>
Date: Thu, 28 Aug 2014 15:42:46 -0700
Subject: [PATCH 21/25] src/tools: Set right margin to 0 in style sheet used
 for html docs created from pod

---
 src/tools/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tools/style.css b/src/tools/style.css
index 8253fb08f..09647403b 100644
--- a/src/tools/style.css
+++ b/src/tools/style.css
@@ -302,7 +302,7 @@ table.dlsip     {
   border: 0.4ex solid #dddddd;
 }
 
-.pod, .manifest { margin-right: 20ex; }
+.pod, .manifest { margin-right: 0; }
 
 .pod PRE     {
   background: #eeeeee;

From 127af22c34c4dc3c8a61204466947bf47ba48f12 Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@gmx.de>
Date: Fri, 29 Aug 2014 16:30:27 -0700
Subject: [PATCH 22/25] configure: improve log output for generated html

---
 configure/RULES_BUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD
index 0c6e7bd9e..0cc1a31fd 100644
--- a/configure/RULES_BUILD
+++ b/configure/RULES_BUILD
@@ -477,7 +477,7 @@ $(INSTALL_HTML)/$(HTMLS_DIR)/%: ../%
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_HTML)/$(HTMLS_DIR)/%: $(COMMON_DIR)/%
-	$(ECHO) "Installing html $@"
+	$(ECHO) "Installing generated html $@"
 	@$(INSTALL) -d -m $(INSTALL_PERMISSIONS) $< $(@D)
 
 $(INSTALL_TEMPLATES_SUBDIR)/%: ../%

From f88cc071fcbbf372d41bf0f5465e3a405804df9c Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@gmx.de>
Date: Fri, 29 Aug 2014 16:33:11 -0700
Subject: [PATCH 23/25] configure, ioc/db: remove clutter left by rebase, add
 rule for pm to html generation (include pm in ..)

---
 configure/RULES.Db | 11 ++++++-----
 src/ioc/db/RULES   | 17 +++--------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/configure/RULES.Db b/configure/RULES.Db
index e1b981851..f95582e70 100644
--- a/configure/RULES.Db
+++ b/configure/RULES.Db
@@ -223,10 +223,6 @@ menu%.h$(DEP): menu%.dbd
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
 	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-	@$(RM) $@
-	@$(DBTOMENUH) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
-	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
-
 %.dbd$(DEP): %Include.dbd
 	@$(RM) $@
 	@$(DBEXPAND) -D $(DBDFLAGS) -o $(COMMONDEP_TARGET) $< > $@
@@ -352,7 +348,7 @@ $(COMMON_DIR)/menu%.h: ../menu%.dbd
 
 ##################################################### DBD files
 
-$(COMMON_DIR)/bpt%.dbd: bpt%.data 
+$(COMMON_DIR)/bpt%.dbd: bpt%.data
 	@$(RM) $(notdir $@)
 	$(MAKEBPT) $< $(notdir $@)
 	@$(MV) $(notdir $@) $@
@@ -418,6 +414,11 @@ $(COMMON_DIR)/%.html: %.pm $(TOOLS)/podToHtml.pl
 	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
 
+$(COMMON_DIR)/%.html: ../%.pm $(TOOLS)/podToHtml.pl
+	@$(RM) $(notdir $@)
+	$(PERL) $(TOOLS)/podToHtml.pl -o $(notdir $@) $<
+	@$(MV) $(notdir $@) $@
+
 .PRECIOUS: $(COMMON_DIR)/%.html
 
 ##################################################### DB files
diff --git a/src/ioc/db/RULES b/src/ioc/db/RULES
index 8c8c4d7b9..b89e2711c 100644
--- a/src/ioc/db/RULES
+++ b/src/ioc/db/RULES
@@ -11,23 +11,12 @@
 
 # This is a Makefile fragment, see src/ioc/Makefile.
 
-dbCommon.h$(DEP): ../db/dbCommonRecord.dbd ../db/RULES
+dbCommon.h$(DEP): $(IOCDIR)/db/dbCommonRecord.dbd $(IOCDIR)/db/RULES
 	@$(RM) $@
 	@$(DBTORECORDTYPEH) -D -I ../db -o $(COMMONDEP_TARGET) $< > $@
-	@echo "$(COMMONDEP_TARGET):" >> $@
+	@echo "$(COMMONDEP_TARGET): ../Makefile" >> $@
 
-$(COMMON_DIR)/dbCommon.h: ../db/dbCommonRecord.dbd
+$(COMMON_DIR)/dbCommon.h: $(IOCDIR)/db/dbCommonRecord.dbd
 	@$(RM) $(notdir $@)
 	$(DBTORECORDTYPEH) -I ../db -o $(notdir $@) $<
 	@$(MV) $(notdir $@) $@
-
-menuGlobal.dbd$(DEP): ../db/RULES
-	@$(RM) $@
-	@echo "$(COMMONDEP_TARGET):" > $@
-
-$(COMMON_DIR)/menuGlobal.dbd: ../db/Makefile
-	@$(RM) $(notdir $@)
-	$(PERL) $(TOOLS)/makeIncludeDbd.pl $(menuGlobal_DBD) $(notdir $@)
-	@$(MV) $(notdir $@) $@
-
-

From 4081935904ebb6d15939b2a545304d5f90fc43b7 Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@gmx.de>
Date: Fri, 29 Aug 2014 16:33:47 -0700
Subject: [PATCH 24/25] std/filters: fix bug in Makefile (showed up on Windows,
 not on Linux)

---
 src/std/filters/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/std/filters/Makefile b/src/std/filters/Makefile
index 09ed25f12..d4539898f 100644
--- a/src/std/filters/Makefile
+++ b/src/std/filters/Makefile
@@ -9,7 +9,7 @@
 
 SRC_DIRS += $(STDDIR)/filters
 
-DBD_INSTALLS += filters.dbd
+DBD += filters.dbd
 
 dbRecStd_SRCS += ts.c
 dbRecStd_SRCS += dbnd.c

From 9b73fd1730bb549fa87966a0dcf28ae5fc42df92 Mon Sep 17 00:00:00 2001
From: Ralph Lange <Ralph.Lange@gmx.de>
Date: Tue, 30 Sep 2014 11:46:17 +0200
Subject: [PATCH 25/25] std/filters: make shorthand notation more prominent in
 filter documentation

---
 src/std/filters/filters.dbd.pod | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/std/filters/filters.dbd.pod b/src/std/filters/filters.dbd.pod
index a4be38998..435ab1390 100644
--- a/src/std/filters/filters.dbd.pod
+++ b/src/std/filters/filters.dbd.pod
@@ -91,6 +91,12 @@ percentage.
 
 =over
 
+=item Mode+Deadband C<"abs">/C<"rel"> (shorthand)
+
+Mode and deadband can be specified in one definition (shorthand).
+The desired mode is given as parameter name (C<"abs"> or C<"rel">), with the numeric
+size of the deadband (absolute value or numeric percentage) as value.
+
 =item Deadband C<"d">
 
 The size of the deadband to use.
@@ -101,13 +107,7 @@ trailing percent character.
 
 A string (enclosed in double-quotes C<">), which should contain either
 C<abs> or C<rel>.
-The default mode is absolute if no mode parameter is included.
-
-=item Mode+Deadband C<"abs">/C<"rel"> (shorthand)
-
-As a shorthand, mode and deadband can be specified in one definition. In this case,
-the desired mode is given as parameter name (C<"abs"> or C<"rel">), with the numeric
-size of the deadband (absolute value or numeric percentage) as value.
+The default mode is C<abs> if no mode parameter is included.
 
 =back
 
@@ -144,6 +144,10 @@ Note: Negative index numbers address from the end of the array, with C<-1> being
 
 =over
 
+=item Square bracket notation C<[s:i:e]> (shorthand)
+
+The familiar C<[s:i:e]> notation with square brackets can be used (shorthand).
+
 =item Start index C<"s">
 
 Index of the first original array element to retrieve.
@@ -156,10 +160,6 @@ Increment between retrieved elements of the original array.
 
 Index of the last original array element to retrieve.
 
-=item Shorthand notation C<[s:i:e]>
-
-As a shorthand, the C<[s:i:e]> notation with square brackets can be used.
-
 =back
 
 Negative index numbers address from the end of the array,
@@ -194,6 +194,13 @@ C<dbStateSet()>.
 
 =over
 
+=item Mode+State
+
+Mode and state can be specified in one definition (shorthand).
+The desired mode is given as parameter name (C<"before"> / C<"first"> /
+C<"while"> / C<"last"> / C<"after"> / C<"unless">), with the state name (enclosed
+in double quotes C<">) as value.
+
 =item Mode C<"m">
 
 A single word from the list below, enclosed in double quotes C<">.
@@ -225,13 +232,6 @@ as the state is false.
 
 The name of a state variable, enclosed in double quotes C<">.
 
-=item Mode+State (shorthand)
-
-As a shorthand, mode and state can be specified in one definition. In this case,
-the desired mode is given as parameter name (C<"before"> / C<"first"> /
-C<"while"> / C<"last"> / C<"after"> / C<"unless">), with the state name (enclosed
-in double quotes C<">) as value.
-
 =back
 
 =head4 Example