Use Swift Markup language for writing watermarks, remove 'note' from watermark text and Makefile

code/drasil-code/lib/Language/Drasil/Code/Imperative/Build/Import.hs

@@ -18,7 +18,7 @@ import Data.List (nub)
 import System.FilePath.Posix (takeExtension, takeBaseName)
 import Text.PrettyPrint.HughesPJ (Doc)
 import Utils.Drasil (capitalize)
-import Metadata.Drasil.DrasilMetaCall (drasilMeta, DrasilMeta(..), watermark)
+import Metadata.Drasil.DrasilMetaCall (watermark)
 
 -- | Holds all the needed information to run a program.
 data CodeHarness = Ch {
@@ -50,7 +50,7 @@ instance RuleTransformer CodeHarness where
       buildTarget = makeS "build"
 
 openingComments :: ProgData -> Annotation
-openingComments m = [watermark ++ version drasilMeta,"Project Name: " ++ progName m, progPurpAdd m]
+openingComments m = [watermark,"Project Name: " ++ progName m, progPurpAdd m]
 
 -- | Helper that renders project purpose into a string if there is one.
 progPurpAdd :: ProgData -> String

code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer.hs

@@ -46,7 +46,7 @@ import Prelude hiding (break,print,last,sqrt,abs,log,exp,sin,cos,tan,asin,acos,
 import Text.PrettyPrint.HughesPJ (Doc, text, empty, render, (<>), (<+>), ($+$),
   space, brackets, parens, isEmpty, rbrace, lbrace, vcat, semi, equals, colon,
   comma)
-import Metadata.Drasil.DrasilMetaCall(drasilMeta, DrasilMeta(..), watermark)
+import Metadata.Drasil.DrasilMetaCall(watermark)
 
 ----------------------------------------
 -- Syntax common to several renderers --
@@ -416,7 +416,7 @@ moduleDox desc as date m = (doxFile ++ m) :
   [doxAuthor ++ stringList as | not (null as)] ++
   [doxDate ++ date | not (null date)] ++ 
   [doxBrief ++ desc | not (null desc)] ++ 
-  [doxCommand ++ watermark ++ version drasilMeta]
+  [doxNote ++ watermark]
 
 commentedMod :: FileData -> Doc -> FileData
 commentedMod m cmt = updateFileMod (updateMod (commentedItem cmt) (fileMod m)) m
@@ -458,11 +458,12 @@ intValue i = i >>= intValue' . getType . valueType
   where intValue' Integer = i
         intValue' _ = error "Value passed to intValue must be Integer"
 
-doxCommand, doxBrief, doxParam, doxReturn, doxFile, doxAuthor, doxDate :: String
+doxCommand, doxBrief, doxParam, doxReturn, doxFile, doxAuthor, doxDate, doxNote :: String
 doxCommand = "\\"
 doxBrief = doxCommand ++ "brief "
 doxParam = doxCommand ++ "param "
 doxReturn = doxCommand ++ "return "
 doxFile = doxCommand  ++ "file "
 doxAuthor = doxCommand ++ "author "
 doxDate = doxCommand ++ "date "
+doxNote = doxCommand ++ "note "

code/drasil-gool/lib/GOOL/Drasil/LanguageRenderer/SwiftRenderer.hs

@@ -105,7 +105,7 @@ import Data.Maybe (fromMaybe)
 import Text.PrettyPrint.HughesPJ (Doc, text, (<>), (<+>), parens, empty, equals,
   vcat, lbrace, rbrace, braces, brackets, colon, space, doubleQuotes)
 import qualified Text.PrettyPrint.HughesPJ as D (float)
-import Metadata.Drasil.DrasilMetaCall (drasilMeta, DrasilMeta(..), watermark)
+import Metadata.Drasil.DrasilMetaCall (watermark)
 
 swiftExt :: String
 swiftExt = "swift"
@@ -1159,19 +1159,25 @@ swiftClassDoc desc = [desc | not (null desc)]
 
 swiftModDoc :: ModuleDocRenderer
 swiftModDoc desc as date m = m : [desc | not (null desc)] ++ 
-  [swiftDocCommandInit ++ swiftAuthorDoc ++ swiftDocCommandSep ++ stringList as 
-    | not (null as)]
-  ++ [swiftDocCommandInit ++ swiftDateDoc ++ swiftDocCommandSep ++ date 
-    | not (null date)] ++ [swiftDocCommandInit ++ watermark ++ version drasilMeta]
+     [swiftDocField swiftAuthorDoc (stringList as) | not (null as)]
+  ++ [swiftDocField swiftDateDoc date | not (null date)]
+  ++ [swiftDocField swiftNoteDoc watermark]
 
 swiftDocCommandInit, swiftDocCommandSep, swiftParamDoc, swiftRetDoc,
-  swiftAuthorDoc, swiftDateDoc :: String
+  swiftAuthorDoc, swiftDateDoc, swiftNoteDoc :: String
 swiftDocCommandInit = "- "
 swiftDocCommandSep = ": "
 swiftParamDoc = "Parameter"
 swiftRetDoc = "Returns"
 swiftAuthorDoc = "Authors"
 swiftDateDoc = "Date"
+swiftNoteDoc = "Note"
+
+-- | Create an arbitrary Swift-DocC Markup field for documentation. Takes two
+-- strings, one for the field type ('ty'), and another for the field information
+-- ('info').
+swiftDocField :: String -> String -> String
+swiftDocField ty info = swiftDocCommandInit ++ ty ++ swiftDocCommandSep ++ info
 
 typeDfltVal :: (RenderSym r) => CodeType -> SValue r
 typeDfltVal Boolean = litFalse

code/drasil-metadata/lib/Metadata/Drasil/DrasilMetaCall.hs

@@ -10,4 +10,4 @@ drasilMeta :: DrasilMeta
 drasilMeta = $drasilMetaCfg
 
 watermark :: String
-watermark = "note Generated by Drasil "
+watermark = "Generated by Drasil " ++ version drasilMeta