removed obsolete mkLabelRA

JacquesCarette · Aug 4, 2018 · eacf853 · eacf853
1 parent b7bff25
commit eacf853
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 14 deletions.
diff --git a/code/drasil-example/Drasil/NoPCM/IMods.hs b/code/drasil-example/Drasil/NoPCM/IMods.hs
@@ -48,8 +48,8 @@ balWtrDesc = foldlSent [(E $ sy temp_W) `isThe` phrase temp_W +:+.
   sParen (unwrap $ getUnit temp_W), S "where", E 0,
   sParen (unwrap $ getUnit temp_W) `sAnd` (E 100),
   sParen (unwrap $ getUnit temp_W), S "are the", phrase melting `sAnd`
-  plural boil_pt, S "of", phrase water `sC` S "respectively",
-  sParen (makeRef assump10Label)]
+  plural boil_pt, S "of", phrase water `sC` S "respectively"
+  {-, sParen (makeRef assump10Label)-}]
 
 ----------------------------------------------
 --    Derivation of eBalanceOnWtr           --

diff --git a/code/drasil-lang/Language/Drasil.hs b/code/drasil-lang/Language/Drasil.hs
@@ -200,7 +200,7 @@ module Language.Drasil (
   , RefAdd, RefType(Cite, Tab, EqnB, LCh, UnCh, Req, Def)
   -- Label
   , Label 
-  , mkLabelRA, mkLabelRA', mkLabelSame, mkEmptyLabel
+  , mkLabelRA', mkLabelSame, mkEmptyLabel
   , mkLabelRAAssump', mkLabelRAFig, mkLabelRASec
   -- Document.getChunk
   , vars, combine', ccss
@@ -340,7 +340,7 @@ import Language.Drasil.People (People, Person, person, HasName(..), manyNames
   rendPersLFM', rendPersLFM'')
 import Language.Drasil.RefTypes(RefAdd, RefType(Cite, EqnB, Tab, LCh, UnCh, Req, Def),
   DType(..))
-import Language.Drasil.Label (mkLabelRA, mkLabelRA', mkLabelSame, 
+import Language.Drasil.Label (mkLabelRA', mkLabelSame, 
   mkEmptyLabel, mkLabelRAAssump', mkLabelRAFig, mkLabelRASec)
 import Language.Drasil.Label.Core (getAdd)
 --Should be in lang-dev package?
diff --git a/code/drasil-lang/Language/Drasil/Document.hs b/code/drasil-lang/Language/Drasil/Document.hs
@@ -14,7 +14,7 @@ import Language.Drasil.Chunk.ShortName (HasShortName(shortname), getStringSN, Sh
 import Language.Drasil.Classes (HasUID(uid), HasRefAddress(getRefAdd),
   MayHaveLabel(getMaybeLabel), HasLabel(getLabel))
 
-import Language.Drasil.Label (Label, getAdd, mkLabelRA, mkLabelRA', mkEmptyLabel)
+import Language.Drasil.Label (Label, getAdd, mkEmptyLabel)
 import Language.Drasil.RefTypes (RefAdd, DType(..))
 import Language.Drasil.Spec (Sentence(..))
 

diff --git a/code/drasil-lang/Language/Drasil/Label.hs b/code/drasil-lang/Language/Drasil/Label.hs
@@ -1,4 +1,4 @@
-module Language.Drasil.Label (Label, mkLabelRA, mkLabelRA',
+module Language.Drasil.Label (Label, mkLabelRA',
  mkLabelSame, mkEmptyLabel, getAdd, mkLabelRAAssump', 
  mkLabelRAFig, mkLabelRASec) where
 
@@ -13,6 +13,10 @@ import Control.Lens((^.))
 instance HasUID        Label where uid       = uniqueID
 instance HasRefAddress Label where getRefAdd = lblType
 
+-- multiple mkLabel constructors for label creation
+-- id     ==> unique ID for Drasil referencing (i.e. internal)
+-- ref    ==> pure ASCII used for referencing
+-- shortn ==> the shortname - what a person/user will see (can include spaces, accents, etc. (unicode))
 mkLabel :: String -> String -> String -> RefType -> Label
 mkLabel lblUID ra sn rtype = Lbl lblUID 
   (RefAdd $ concatMap repUnd $ getAcc rtype ++ ensureASCII ra)
@@ -51,14 +55,6 @@ repUnd :: Char -> String
 repUnd '_' = "."
 repUnd c = c : []
 
--- multiple mkLabel constructors for label creation
--- id     ==> unique ID for Drasil referencing (i.e. internal)
--- ref    ==> pure ASCII used for referencing
--- shortn ==> the shortname - what a person/import Language.Drasil.RefTypes (RefType(..))user will see (can include spaces, accents, etc. (unicode))
--- RefTypes are Sect by default
-mkLabelRA :: String -> String -> String -> RefType -> Label
-mkLabelRA = mkLabel
-
 -- for when reference address and the display should be the different
 mkLabelRA' :: String -> String -> RefType -> Label
 mkLabelRA' ref shortn rt = mkLabel (ref ++ "Label") ref shortn rt