Fix style paths

diff --git a/cli/Textphile/CLI/Compile.hs b/cli/Textphile/CLI/Compile.hs
index 49437717be173425d785726fd7651400d08bcd0e..74931ee7c30b816bde26c60d3a0eb25ae21d1bab 100644 (file)
--- a/cli/Textphile/CLI/Compile.hs
+++ b/cli/Textphile/CLI/Compile.hs
@@ -22,7 +22,7 @@ import Data.Semigroup (Semigroup(..))
 import Data.Text (Text)
 import Prelude (error)
 import Symantic.CLI as CLI
-import System.FilePath ((-<.>))
+import System.FilePath ((-<.>), (</>))
 import System.IO (IO, FilePath)
 import Text.Show (Show(..))
 import qualified Data.ByteString as BS
@@ -148,8 +148,8 @@ run_command_compile
        run_compile_html5 Cfg_Compile_HTML5{..} cfg_compile_input = do
                let cfg_compile_output = cfg_compile_input-<.>"html5"
                dtc <- run_compile_dtc cfg_compile_input cfg_compile_output
-               config_css <- installFile cfg_compile_html5_output_css $ "style" FilePath.</>"dtc-html5.css"
-               config_js  <- installFile cfg_compile_html5_output_js  $ "style" FilePath.</>"dtc-html5.js"
+               config_css <- installFile cfg_compile_html5_output_css $ "src"</>"style"</>"dtc-html5.css"
+               config_js  <- installFile cfg_compile_html5_output_js  $ "src"</>"style"</>"dtc-html5.js"
                let conf = DTC.Config
                         { DTC.config_css
                         , DTC.config_js
@@ -165,7 +165,7 @@ run_command_compile
                where
                installFile out name = do
                        dataDir <- Textphile.getDataDir
-                       let src = dataDir FilePath.</>name
+                       let src = dataDir</>name
                        case out of
                         Nothing -> Right <$> FS.readFile src
                         Just "" -> return $ Left ""
@@ -185,5 +185,5 @@ writeDependencies Cfg_Compile{..} cfg_compile_input tct =
        let dir = FilePath.takeDirectory cfg_compile_input in
        FS.writeFile (cfg_compile_input-<.>"deps") $
                foldMap (TL.pack . (("\n" <>) . FilePath.normalise))
-                ((dir FilePath.</>) <$> TCT.dependencies tct) <>
+                ((dir </>) <$> TCT.dependencies tct) <>
                "\n"

diff --git a/src/Textphile/DTC/Write/HTML5.hs b/src/Textphile/DTC/Write/HTML5.hs
index 1c9b63696765386dcffae6afaa1d9a50df92c31a..285e1218a0265bd153e4bdc6ca4d5dbdba28d316 100644 (file)
--- a/src/Textphile/DTC/Write/HTML5.hs
+++ b/src/Textphile/DTC/Write/HTML5.hs
@@ -132,7 +132,7 @@ writeHTML5Head Config{..} Reader{..} Writer{..} Document{..} = do
                -- unless (any (\DTC.Link{..} -> link_rel == "stylesheet" && link_url /= URL "") links) $ do
                (`foldMap` writer_styles) $ \case
                 Left css -> do
-                       content <- FS.readFile =<< Textphile.getDataFileName ("style"</>css)
+                       content <- FS.readFile =<< Textphile.getDataFileName ("src"</>"style"</>css)
                        return $ H.style ! HA.type_ "text/css" $
                                H.toMarkup content
                 Right content -> return $ do