From f5e33e0dce8a4f08e23a59a8b270d3dad94601e0 Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
Date: Sat, 19 Sep 2015 19:12:35 +0800
Subject: Set the template variable $hyphenate$ to true by default

* src/Text/Pandoc/Writers/Man.hs: Set $hyphenate$ to be true.
---
 src/Text/Pandoc/Writers/Man.hs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Text')

diff --git a/src/Text/Pandoc/Writers/Man.hs b/src/Text/Pandoc/Writers/Man.hs
index f91367eb9..08d1ee189 100644
--- a/src/Text/Pandoc/Writers/Man.hs
+++ b/src/Text/Pandoc/Writers/Man.hs
@@ -85,6 +85,7 @@ pandocToMan opts (Pandoc meta blocks) = do
   let context = defField "body" main
               $ setFieldsFromTitle
               $ defField "has-tables" hasTables
+              $ defField "hyphenate" True
               $ metadata
   if writerStandalone opts
      then return $ renderTemplate' (writerTemplate opts) context
-- 
cgit v1.2.3


From d7a19c22be073854ea3e2d677913c1d81991b182 Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
Date: Fri, 25 Sep 2015 03:54:41 +0800
Subject: Move the variable pandocVersion from `src/Text/Pandoc.hs` to
 `src/Text/Pandoc/Shared.hs`, so that all Writers can access this variable
 without importing `src/Text/Pandoc.hs`, preventing circular import.

* pandoc.hs: Import pandocVersion from `Text.Pandoc.Shared`.
* src/Text/Pandoc.hs: Remove the definition of pandocVersion
 and relevant import.
* src/Text/Pandoc/Shared.hs: Add the definition of pandocVersion
 and relevant import.
---
 pandoc.hs                 |  2 +-
 src/Text/Pandoc.hs        |  8 --------
 src/Text/Pandoc/Shared.hs | 10 +++++++++-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/Text')

diff --git a/pandoc.hs b/pandoc.hs
index 7d26dde39..b357754e2 100644
--- a/pandoc.hs
+++ b/pandoc.hs
@@ -37,7 +37,7 @@ import Text.Pandoc.Walk (walk)
 import Text.Pandoc.Readers.LaTeX (handleIncludes)
 import Text.Pandoc.Shared ( tabFilter, readDataFileUTF8, readDataFile,
                             safeRead, headerShift, normalize, err, warn,
-                            openURL )
+                            openURL, pandocVersion )
 import Text.Pandoc.MediaBag ( mediaDirectory, extractMediaBag, MediaBag )
 import Text.Pandoc.XML ( toEntities )
 import Text.Pandoc.SelfContained ( makeSelfContained )
diff --git a/src/Text/Pandoc.hs b/src/Text/Pandoc.hs
index d7311d978..842128124 100644
--- a/src/Text/Pandoc.hs
+++ b/src/Text/Pandoc.hs
@@ -117,8 +117,6 @@ module Text.Pandoc
                , writeCustom
                -- * Rendering templates and default templates
                , module Text.Pandoc.Templates
-               -- * Version
-               , pandocVersion
                -- * Miscellaneous
                , getReader
                , getWriter
@@ -178,17 +176,11 @@ import Text.Pandoc.Error
 import Data.Aeson
 import qualified Data.ByteString.Lazy as BL
 import Data.List (intercalate)
-import Data.Version (showVersion)
 import Data.Set (Set)
 import qualified Data.Set as Set
 import Text.Parsec
 import Text.Parsec.Error
 import qualified Text.Pandoc.UTF8 as UTF8
-import Paths_pandoc (version)
-
--- | Version number of pandoc library.
-pandocVersion :: String
-pandocVersion = showVersion version
 
 parseFormatSpec :: String
                 -> Either ParseError (String, Set Extension -> Set Extension)
diff --git a/src/Text/Pandoc/Shared.hs b/src/Text/Pandoc/Shared.hs
index 9bea0a65e..1fe3db5f7 100644
--- a/src/Text/Pandoc/Shared.hs
+++ b/src/Text/Pandoc/Shared.hs
@@ -92,7 +92,9 @@ module Text.Pandoc.Shared (
                      -- * Safe read
                      safeRead,
                      -- * Temp directory
-                     withTempDir
+                     withTempDir,
+                     -- * Version
+                     pandocVersion
                     ) where
 
 import Text.Pandoc.Definition
@@ -106,6 +108,7 @@ import System.Exit (exitWith, ExitCode(..))
 import Data.Char ( toLower, isLower, isUpper, isAlpha,
                    isLetter, isDigit, isSpace )
 import Data.List ( find, stripPrefix, intercalate )
+import Data.Version ( showVersion )
 import qualified Data.Map as M
 import Network.URI ( escapeURIString, isURI, nonStrictRelativeTo,
                      unEscapeString, parseURIReference, isAllowedInURI )
@@ -136,6 +139,7 @@ import Data.Sequence (ViewR(..), ViewL(..), viewl, viewr)
 import qualified Data.Text as T (toUpper, pack, unpack)
 import Data.ByteString.Lazy (toChunks, fromChunks)
 import qualified Data.ByteString.Lazy as BL
+import Paths_pandoc (version)
 
 import Codec.Archive.Zip
 
@@ -165,6 +169,10 @@ import Network.HTTP (findHeader, rspBody,
 import Network.Browser (browse, setAllowRedirects, setOutHandler, request)
 #endif
 
+-- | Version number of pandoc library.
+pandocVersion :: String
+pandocVersion = showVersion version
+
 --
 -- List processing
 --
-- 
cgit v1.2.3


From 319832cc195ea8ae19ab757bacc401c031f75f20 Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
Date: Fri, 25 Sep 2015 04:05:58 +0800
Subject: Set the template variable $pandoc-version$ to pandocVersion by
 default.

* src/Text/Pandoc/Writers/Man.hs: Set $pandoc-version$ to be pandocVersion.
---
 src/Text/Pandoc/Writers/Man.hs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/Text')

diff --git a/src/Text/Pandoc/Writers/Man.hs b/src/Text/Pandoc/Writers/Man.hs
index 08d1ee189..6b1e42394 100644
--- a/src/Text/Pandoc/Writers/Man.hs
+++ b/src/Text/Pandoc/Writers/Man.hs
@@ -86,6 +86,7 @@ pandocToMan opts (Pandoc meta blocks) = do
               $ setFieldsFromTitle
               $ defField "has-tables" hasTables
               $ defField "hyphenate" True
+              $ defField "pandoc-version" pandocVersion
               $ metadata
   if writerStandalone opts
      then return $ renderTemplate' (writerTemplate opts) context
-- 
cgit v1.2.3