Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
935 commits 2 branches 0 tags 65 MiB
Commit graph

935 commits

This branch
This branch
All branches
Author SHA1 Message Date
fiddlosopher
c55ac7cd84 CABALOPTS may now be specified with 'make'. 
For example:  CABALOPTS=-fhighlighting make


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1222 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:21:39 +00:00
fiddlosopher
04b32451be Added build option for syntax highlighting, with *optional* dependency on highlighting-kate. 
+ pandoc.cabal includes a flag, 'highlighting', that causes a dependency
  on highlighting-kate.
+ if Setup.hs detects this dependency, it copies templates/Highlighting.yes.hs
  to Text/Pandoc/Highlighting.hs.  Otherwise, it copies templates/Highlighting.no.hs.
+ The HTML writer imports this new module instead of Text.Highlighting.Kate.
  The new module exports highlightHtml, which either uses highlighting-kate to
  perform syntax highlighting or automatically returns a failure code, depending
  on whether highlighting support was selected.
+ --version now prints information about whether syntax highlighting support is compiled in.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1221 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:21:19 +00:00
fiddlosopher
427c2e484d Modified Setup.hs with new location for DefaultHeaders.hs. 
Print template notice on top of autogenerated source files.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1220 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:21:09 +00:00
fiddlosopher
ba6981a4a1 Removed Text.Regex dependencies by rewriting using plain Haskell: 
+ from Text.Pandoc.Writers.RTF
+ from Text.Pandoc.Writers.HTML
+ from Main
+ from pandoc.cabal


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1219 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:21:04 +00:00
fiddlosopher
087739ad7a Moved Text.Pandoc.Writers.DefaultHeaders -> Text.Pandoc.DefaultHeaders. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1218 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:20:55 +00:00
fiddlosopher
e361c5883d Makefile: only use --with-hc-pkg if GHC_PKG is defined. 
Note that Cabal will automatically choose the ghc-pkg appropriate
for the compiler selected, so normally specifying GHC by itself
is sufficient.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1217 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:20:48 +00:00
fiddlosopher
446a964a19 Incorporated templates phase into Setup.hs and improved templates. 
+ Removed templates/Makefile and fillTemplates.pl.
+ Removed 'templates' Makefile target.
+ Added postConf hook to Setup.hs that fills the templates.
+ Use compressed javascripts for S5 and ASCIIMathML templates.
+ Revised test suite.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1216 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:20:42 +00:00
fiddlosopher
c150e84d3c Add default CSS to document header if syntax highlighting used. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1215 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:20:25 +00:00
fiddlosopher
c492787647 Added code.txt to web/ for demos. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1214 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:20:18 +00:00
fiddlosopher
b3709022ef Added preliminary support for syntax highlighting to HTML writer. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1213 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:20:13 +00:00
fiddlosopher
6bd25a10a2 Included highlighting-kate in build-depends. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1212 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:20:06 +00:00
fiddlosopher
06b544360e Factored codeBlock into separate codeBlockIndented and codeBlockDelimited. 
Do not use codeBlockDelimited in strict mode.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1211 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:20:02 +00:00
fiddlosopher
db0d658e9c Updated test suite to new baseline (but no tests yet for new code block syntax). 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1210 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:19:54 +00:00
fiddlosopher
614547b38e Use generic attributes type, not a string, for CodeBlocks. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1209 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:19:43 +00:00
fiddlosopher
705340824d Documentation for delimited code blocks. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1208 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:19:29 +00:00
fiddlosopher
f2354590f9 Put language class information in pre tag, not code tag, in HTML code blocks. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1207 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:19:24 +00:00
fiddlosopher
2e683e8b53 Fixed delimited code blocks: eat blank lines afterwards, and allow end line 
to contain more tildes than beginning line.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1206 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:19:17 +00:00
fiddlosopher
24f22ee7ac Added a needed try to {} attribute parser. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1205 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:19:10 +00:00
fiddlosopher
046c6b0d0d Added support for multiple classes in delimited code block. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1204 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:19:01 +00:00
fiddlosopher
b06ddad4bc Initial support for delimited code blocks in markdown reader. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1203 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:18:54 +00:00
fiddlosopher
769e2f3cf5 HTML writer: if language specified for code block, print as <code> class. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1202 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:18:47 +00:00
fiddlosopher
fa0ab8617a Modified tests for new argument in CodeBlock. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1201 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:18:38 +00:00
fiddlosopher
2c13782fdf Modified writers for new argument place in CodeBlock. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1200 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:18:22 +00:00
fiddlosopher
9f7a14c210 Modified readers for new parameter in CodeBlock. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1199 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:18:03 +00:00
fiddlosopher
6a921f0966 Added parameter for class to CodeBlock (for syntax highlighting). 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1198 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:17:49 +00:00
roktas
1a80813009 * Debian packaging changes: 
+ Migrate to GHC 6.8.2.  Closes: #461606
  + Add new dependencies libghc6-regex-compat-dev and libghc6-uulib-dev.
  + Remove the code in debian/rules which attempts to remove empty ghc6.6
    include directory.  This code may cause an installation failure for the
    -dev package.  Closes: #460658
  + Fix doc-base to prevent a lintian warning.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1197 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-02-09 03:12:03 +00:00
fiddlosopher
76c49ebc63 Added note in INSTALL about doing 'make templates' if installing using Cabal from svn. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1196 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-24 23:05:23 +00:00
fiddlosopher
d3a179cdfc Added \setupitemize[autointro] to ConTeXt header, to prevent orphaned 
list introduction lines.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1195 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-23 02:17:59 +00:00
fiddlosopher
6da5be1d0f website: Added math.text to dependencies for examples.html in Makefile. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1194 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-23 02:17:47 +00:00
fiddlosopher
17f516fc15 Moved math.txt -> math.text on web page, so it won't be confused with page source. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1193 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-23 02:17:42 +00:00
fiddlosopher
790fd4612b Changed names of HTML man pages to *.1.html on website. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1192 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-23 02:17:35 +00:00
fiddlosopher
42359e63c9 Fixed bug in RST reader, which would choke on: "p. one\ntwo\n". 
Added some try's in ordered list parsers.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1191 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-17 02:14:20 +00:00
fiddlosopher
8f8888df2e Updated INSTALL with instructions for getting GHC + libraries using apt-get. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1190 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-16 18:22:18 +00:00
fiddlosopher
d474852f56 Removed unnecessary imports. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1189 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-16 02:18:23 +00:00
fiddlosopher
155ef838d7 Added Arch linux instructions to INSTALL. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1188 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-14 05:12:16 +00:00
fiddlosopher
6795ffd93f Bumped version to 0.47. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1187 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 20:25:46 +00:00
fiddlosopher
c453e2f7d5 Made -c/--css option repeatable on the command line (like -H, -A, -B). 
Documented repeatability of these options in README.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1186 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 20:21:28 +00:00
fiddlosopher
936465ade0 Updated website with news of version 0.46 release. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1185 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 19:57:27 +00:00
fiddlosopher
690677e443 Added some details to RELEASE-CHECKLIST. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1184 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 19:42:09 +00:00
fiddlosopher
93079002dc Removed redundant DISTNAME field from freebsd Makefile template. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1183 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 19:42:06 +00:00
fiddlosopher
8fca649d05 Changed copyright dates where appropriate to include 2008. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1181 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 17:26:16 +00:00
fiddlosopher
a7a519e04c Changed dates on documentation. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1180 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 17:25:57 +00:00
fiddlosopher
3c7498455e Removed unneeded link reference from website index.txt.in. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1179 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 17:09:14 +00:00
fiddlosopher
2df432dc60 Changed comment used to replace unsafe HTML if sanitize-html option 
selected.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1178 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 04:53:01 +00:00
roktas
71e508f98a * Debian packaging changes: 
+ Remove the empty 'include' directory in -dev package, which lintian
    complains about.
  + Bump Standarts-Version to 3.7.3.
  + Use new 'Homepage:' field to specify the upstream URL on suggestion of
    lintian.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1177 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-08 04:00:35 +00:00
fiddlosopher
65e118ec58 Updated changelog. 
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1176 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-07 18:44:52 +00:00
fiddlosopher
b9e30ca8b7 RST reader: Fixed bug in parsing explicit links (resolves Issue #44). 
The problem was that we were looking for inlines until a '<' character
signaled the start of the URL.  So if you hit a reference-style link,
it would keep looking til the end of the document.  Fix:  change
inline => (notFollowedBy (char '`') >> inline).  Note that this won't
allow code inlines in links, but these aren't allowed in resT anyway.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1175 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-06 19:46:55 +00:00
fiddlosopher
85657add6a RST reader: cleaned up parsing of reference names in key blocks and links. 
Allow nonquoted reference links to contain isolated '.', '-', '_', so
so that strings like 'a_b_' count as links.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1174 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-06 19:46:43 +00:00
fiddlosopher
e4837c140c RST reader: Removed unnecessary check for following link in str. 
This is unnecessary now that link is above str in the definition of
'inline'.


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1173 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-06 19:46:38 +00:00
fiddlosopher
d271473044 Fixed markdown reader to handle "*hi **there***" as a strong nested in an emph. 
(A '*' is only recognized as the end of the emphasis if it's not the beginning
of a strong emphasis.)


git-svn-id: https://pandoc.googlecode.com/svn/trunk@1172 788f1e2b-df1e-0410-8736-df70ead52e1b
 2008-01-06 19:46:31 +00:00