Commit graph

797 commits

Author SHA1 Message Date
Alexey Kreshchuk
e0f45b29b3 added gloabl metadata parsing 2013-10-11 02:41:27 +04:00
Jasper Van der Jeugt
808353bce4 Enable Pandoc highlighting by default 2013-09-29 17:52:58 +02:00
Jorge Israel Peña
a590a9a57f updated to work with pandoc 1.12
Pandoc 1.12 decouples citeproc-hs from itself, so there is no longer a
Text.Pandoc.Biblio module in Pandoc. Further, citeproc-hs depends on
pandoc-types 1.10 but Pandoc 1.12 depends on pandoc-types 1.12. To
alleviate these issues, pandoc-citeproc was created which includes a
copy of the citeproc-hs source made to be compatible, since the
developer of citeproc-hs is apparently MIA.

pandoc-citeproc is a separate module that handles the mixture of
citeproc-hs and Pandoc. It includes `processCites` in Text.CSL.Pandoc,
which is the new name of what used to be `processBiblio` from
Text.Pandoc.Biblio

Most of these changes are seamless, consisting of simple name changes in
both functions and modules. However, a more direct change in the
Hakyll API itself is that `readPandocBiblio`'s second parameter, the
CSL, is now mandatory, i.e. not of type Maybe. This is to reflect the
same change in the underlying processing function from Text.CSL.Pandoc,
`processCites`, where the Style argument is now mandatory, and the style
is derived from the CSL.

See the old function:

    processBiblio :: Maybe Style -> [Reference] -> Pandoc -> Pandoc

Compared to the new one:

    processCites :: Style -> [Reference] -> Pandoc -> Pandoc

Sources:

* http://hackage.haskell.org/packages/archive/pandoc/1.11.1/doc/html/Text-Pandoc-Biblio.html
* http://hackage.haskell.org/packages/archive/pandoc-citeproc/0.1/doc/html/Text-CSL-Pandoc.html

Similarly, there is no longer a `readerReferences` field in the reader
options structure.
2013-09-18 22:38:54 +02:00
Saeid Al-Wazzan
a796988a16 Fix incorrect output of toSiteRoot on Windows.
toSiteRoot uses splitPath, joinPath, and takeDirectory from the
System.FilePath module. On Windows systems, the implementation of
joinPath will build up a path using the Windows path separator "\\".

We don't want this behavior since the paths we are working with
are always URLs, so we force POSIX behavior for System.FilePath.
2013-09-16 01:17:38 +03:00
Jorge Israel Peña
999252ece1 add preview port Configuration field
Make it possible to specify the default port to listen on when the
preview server is run. This is useful if another service on the system
already runs on port 8000 (the default), since it's a hassle to keep
providing the port overriding option. For example: ./site preview vs.
./site preview -p 4000
2013-08-29 22:43:57 -07:00
Eric Stolten
866a282f19 * Preview now shows the deprecation message and calls watch.
* Details on how to disable the server in the command description.
2013-08-28 13:11:44 -04:00
Eric Stolten
f01b641649 1. Added the WATCH_SERVER flag that is enabled by default
1. Added an argument to watch, --no-server which will disable the embedded server.
1. Added a deprecation message to the preview mode
2013-08-25 22:49:50 -04:00
Eric Stolten
fbc43b3a04 Merge branch 'upstream-master' 2013-08-20 22:03:04 -04:00
Eric Stolten
f14f52040a Added a watch command that will continually poll for changes and rebuild them. 2013-08-20 21:59:39 -04:00
Jasper Van der Jeugt
5679681ac1 Change type: metadataField :: Context a
Closes #175
2013-08-16 11:48:26 +02:00
Jasper Van der Jeugt
64569d7b72 Fix versions & metadata loading issue
Closes #171
2013-08-14 00:18:31 +02:00
Jasper Van der Jeugt
faa90283bf Explode when using mapContext over ListField 2013-08-13 01:38:18 +02:00
Jasper Van der Jeugt
fad9134fd4 Add functionField again 2013-08-10 16:19:23 +02:00
Jasper Van der Jeugt
ab0aebb3c3 Add mapContext again 2013-08-05 12:25:55 +02:00
Marc-Antoine Perennou
82a38a742a check: unescape internal uris
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
2013-07-07 19:02:21 +02:00
uu1101
b5803bc7b6 Correct example code: parseGlob ==> fromGlob 2013-06-30 19:21:17 +02:00
Jasper Van der Jeugt
a3c4d06ff9 Merge pull request #162 from uu1101/seq-stderr
Deepseq stderr before closing the handle
2013-06-17 04:43:06 -07:00
Jasper Van der Jeugt
6814ff2e9b Only add teaser when <!--more--> is there 2013-06-17 12:01:22 +02:00
Simonas Kazlauskas
72ed15e174 Make toUri sanitise all characters needed 2013-06-16 15:11:04 +03:00
Jasper Van der Jeugt
537e72333f Sanitize URLs in toUrl
Closes #163
2013-06-15 20:15:33 +02:00
uu1101
a1e778d1e5 Set handle encoding as per locale 2013-06-14 01:02:14 +02:00
uu1101
cf501485b1 Deepseq stderr before closing the handle
Otherwise laziness allows for the handle to be closed withouth receiving the
input. This caused that no error messages were printed when `unixFilter`s
failed.
2013-06-14 00:32:45 +02:00
Jasper Van der Jeugt
e687662ba0 teaserContext -> teaserField 2013-06-06 10:21:18 +02:00
Jasper Van der Jeugt
0409d6110c Merge pull request #155 from blaenk/win32-preview-fix
fix preview functionality on windows
2013-05-24 00:47:06 -07:00
Jorge Israel Peña
294c48ea48 finish incomplete comment 2013-05-22 17:28:32 -07:00
Jorge Israel Peña
e987485e2d add max-retries to waitOpen and gracefully handle remove/delete events 2013-05-22 17:06:17 -07:00
Simonas Kazlauskas
0a818d0725 Deploy should propagate error code
And return 1 if neither deployCommand and deploySite is set.
2013-05-22 15:24:26 +03:00
Jorge Israel Peña
2fba64c5ad fix preview functionality on windows 2013-05-22 01:20:43 -07:00
Evan Cofsky
8c73820abc Clean up type declarations, use fst and <$>. 2013-05-21 09:01:00 -07:00
Evan Cofsky
c236cda401 Have Build and Rebuild exit with a status to the shell. 2013-05-20 21:17:31 -07:00
Jasper Van der Jeugt
d32307aa1c Add partials to template system 2013-05-07 09:28:09 +02:00
Jasper Van der Jeugt
cf138a415b Implement foreach structure 2013-05-06 23:32:25 +02:00
Jasper Van der Jeugt
738fd3d1ad Paginate simplification 2013-05-06 22:34:07 +02:00
Anton Dubovik
1966163c55 Added pagination support. 2013-05-05 17:05:15 +03:00
Ivan N. Veselov
946723dc9d Logged dependencies adding for debugging purposes. 2013-05-05 12:58:31 +03:00
Ivan N. Veselov
0e6441885c Changed the teaser separator to "more" to use the same format as WordPress does. 2013-05-04 17:57:51 +03:00
Ivan N. Veselov
9ad0d38f43 Added a comment explaining "teaserContext" function. 2013-05-04 17:48:51 +03:00
Ivan N. Veselov
2651627189 Added "teasers" support to be used in posts index.
Just add "<!-- teaser_end -->" to separate the teaser and the rest of the article and use "$teaser$" key in the template!

Closes issue #35.
2013-05-04 17:26:22 +03:00
Jasper Van der Jeugt
ca80171caf Minor style changes 2013-05-04 15:18:26 +02:00
noxx
f4ee3e7fcb Created tests and fixed isMember function 2013-05-04 15:42:28 +03:00
noxx
0f779a8c53 Added isMember to load function 2013-05-04 13:05:47 +03:00
noxx
a3021bc703 Added isMember functions for Store 2013-05-04 12:51:58 +03:00
Jasper Van der Jeugt
4100083709 Style changes, move stuff to common parser module 2013-05-04 11:36:58 +02:00
Jasper Van der Jeugt
28bc3f1f3b Merge remote-tracking branch 'sphynx/master' 2013-05-04 11:14:35 +02:00
Ivan N. Veselov
9c5300440e Removed unnecessary import. 2013-05-03 19:28:19 +03:00
Ivan N. Veselov
f86b9c5b0c Added support for "$if$" statement in templates. 2013-05-03 19:10:57 +03:00
Ivan N. Veselov
617322ae8c Added MonadError's instance for Compiler. 2013-05-03 19:10:11 +03:00
Jasper Van der Jeugt
ec1f961c4e Close open cache files as soon as possible
See #124
2013-05-03 16:21:14 +02:00
Jasper Van der Jeugt
8f534400be More granular dependencies for routes
See #121
2013-05-03 11:03:49 +02:00
Jasper Van der Jeugt
553350a5c8 Merge pull request #138 from christopheryoung/master
Documentation tweaks: two small typos and $PATH variable documentation for OS X
2013-04-29 06:48:38 -07:00
Parnell Springmeyer
625c73feb2 Adding in the short form date parsing 2013-04-23 17:33:25 -05:00
Jasper Van der Jeugt
2895a05a19 Micro cleanup 2013-04-22 20:24:19 +02:00
Jasper Van der Jeugt
79215f71eb Merge pull request #133 from simukis/scheme-relative
Account for scheme-relative URLs
2013-04-22 11:16:54 -07:00
Ian Ross
fa7f0fe001 Fix indent 2013-04-21 15:14:38 +02:00
Ian Ross
ef9c610d3c Improve tag handling API
Expose function tagsFieldWith and renderTagCloudWith to provide more
flexible tag rendering APIs; add tagCloudField and tagCloudFieldWith
to provide context-based facility for tag cloud rendering.
2013-04-21 13:24:06 +02:00
Ian Ross
ce745bcfe4 Add "data" as a URL attribute 2013-04-21 13:20:13 +02:00
Christopher Young
8bbb8d4221 Fix typo 2013-04-12 07:22:43 -04:00
Simonas Kazlauskas
63a3000f9c Account for scheme-relative URLs
http://url.spec.whatwg.org/#concept-scheme-relative-url
2013-04-04 13:29:57 +03:00
Jasper Van der Jeugt
cf98381508 Add event filtering based on pattern 2013-04-04 11:47:50 +02:00
Jasper Van der Jeugt
5f6035b8e9 Merge pull request #131 from simukis/fsnotify
Migrate to filesystem notification
2013-04-04 01:43:33 -07:00
Jasper Van der Jeugt
cbfc7c18e1 Debug info for Alternative instances
See #126
2013-04-04 00:26:05 +02:00
Simonas Kazlauskas
5a9a869e58 Update patch for 5e4adaecb 2013-04-03 13:31:27 +03:00
Simonas Kazlauskas
b5e34c64a7 Merge github.com:jaspervdj/hakyll into fsnotify 2013-04-03 13:11:15 +03:00
Jasper Van der Jeugt
c40cf286af Add getResourceFilePath
See #130
2013-04-03 12:07:03 +02:00
Jasper Van der Jeugt
5e4adaecb2 Account for absolute paths in shouldIgnoreFile 2013-04-03 12:02:06 +02:00
Jasper Van der Jeugt
2cb444f250 Fix issue where: hasProtocol "foo" == True
See #129
2013-04-01 17:31:13 +02:00
Simonas Kazlauskas
128f10deb8 Properly implement protocol skipping in checker
Network.HTTP can only check if http:// and https:// links resolve,
however there is much more scheme names than just `mail:`, `http://` and
`https://`.
They would be handed off to internal URI checker and would fail.
2013-04-01 15:10:46 +03:00
Simonas Kazlauskas
259190e30b Refine code
This patch includes several smaller changes, namely:
1. We don't use result of `update` function and likely never will, so
   don't bother generating it.
2. Rename watch function to better reflect what it does.
3. Never exit preview server in case of failed update.
2013-03-31 14:47:47 +03:00
Simonas Kazlauskas
bcc0ef828e Prefer relative directories instead of absolute
This allows us to fully utilise shouldIgnoreFile
2013-03-30 18:39:02 +02:00
Simonas Kazlauskas
7677bb4a77 Use shouldIgnoreFile 2013-03-30 18:07:16 +02:00
Simonas Kazlauskas
fdfbf3dd34 Run server in main thread 2013-03-30 17:48:36 +02:00
Simonas Kazlauskas
42cdd649db Migrating from polling to notification: First shot
Using system file notification APIs it is much more efficient than
polling files every second.
2013-03-30 16:28:23 +02:00
Jasper Van der Jeugt
bf496c2f55 We'll do it ourselves 2013-03-30 11:31:14 +01:00
Jasper Van der Jeugt
5d7e252d27 UnixFilter improvements
Closes #128
2013-03-30 10:58:02 +01:00
Jasper Van der Jeugt
dbffc5ef10 Check for mailto: URLs
Closes #127
2013-03-27 14:02:56 +01:00
Samuel Tardieu
543cba90f6 Allow overriding the deploy command with Haskell code
By overriding `deploySite` with a `Configuration -> IO ()` code,
the user can execute Haskell code to deploy the site rather than
shell code.

The default behaviour honors the `deployCommand` configuration
field and is backward compatible.
2013-03-24 21:52:21 +01:00
Jasper Van der Jeugt
6c8fda2c00 Fix issue in Compiler Alternative instance 2013-03-24 19:21:33 +01:00
Jasper Van der Jeugt
cce87f08e5 Merge pull request #123 from simukis/utc-update
Support timezones
2013-03-16 13:52:21 -07:00
Simonas Kazlauskas
cacc7a4f18 Support timezones as well 2013-03-16 13:02:41 +02:00
Simonas Kazlauskas
0c2b429ae0 renderDateField does not exist 2013-03-16 13:01:17 +02:00
Simonas Kazlauskas
4a3aac547a chronological docs update
`chronological` now respects metadata too and uses same method as
dateField to get date for sorting.
2013-03-16 12:53:54 +02:00
Jasper Van der Jeugt
d840363bf0 Merge remote-tracking branch 'piyush-kurur/master'
Conflicts:
	hakyll.cabal
2013-03-11 15:53:00 +01:00
Jasper Van der Jeugt
5241e87f16 Make http-conduit dependency optional 2013-03-09 17:54:08 +01:00
Jasper Van der Jeugt
9b305229be Use resourceFilePath for copyFileCompiler
Closes #117
2013-03-07 18:48:11 +01:00
Piyush P Kurur
d6f6657c28 refactored the Default instance of Configuration 2013-03-07 18:04:21 +05:30
Piyush P Kurur
7fc2f677d9 fixing the coding style 2013-03-07 17:56:56 +05:30
Piyush P Kurur
439847eb6f added a default instance for Configuration 2013-03-07 16:46:17 +05:30
Jasper Van der Jeugt
a48b53c385 Add utility getMetadataField 2013-03-07 11:18:34 +01:00
Jasper Van der Jeugt
9bd35cd755 Add makePatternDependency 2013-03-05 12:51:27 +01:00
Jasper Van der Jeugt
3b9b11c636 Fix broken test case for #115 2013-02-26 19:24:54 +01:00
Jasper Van der Jeugt
d993ebce58 Add testcase for #115 2013-02-26 19:20:55 +01:00
Peter Jones
4d244168a7 Ignore initial whitespace in a continuation line for a metadata field
When parsing a metadata field that spans several lines skip over the
initial whitespace on each line.  This allows alignment of metadata
fields:

    ---
    description: A long description that would look better if it
                 spanned multiple lines and was indented
    ---
2013-02-26 10:41:03 -07:00
Jasper Van der Jeugt
151c142960 Merge branch 'dev-metadata-route' 2013-02-24 11:37:24 +01:00
Jasper Van der Jeugt
9b603587de Fix unused imports warnings 2013-02-23 12:55:35 +01:00
Jasper Van der Jeugt
14fc440511 Merge pull request #112 from simukis/sorting
Make chronological and recentFirst to respect metadata
2013-02-23 03:52:45 -08:00
Simonas Kazlauskas
6b680c9887 Fix code style 2013-02-23 13:38:34 +02:00
Simonas Kazlauskas
45c618b413 Generalize getTimeUTC, chronological, recentFirst 2013-02-23 13:34:54 +02:00
Simonas Kazlauskas
718388495b chronological, recentFirst now respects metadata
Solves #111
2013-02-23 12:47:01 +02:00
Jasper Van der Jeugt
f4f837595d Send user agent in ./site check
Closes #110
2013-02-19 13:11:51 +01:00
Jasper Van der Jeugt
4c40cea9e1 Merge branch 'master' into dev-metadata-route
Conflicts:
	tests/Hakyll/Core/Rules/Tests.hs
2013-02-16 13:01:57 +01:00