Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-27 Thread Natacha Porté
Hello,

on Thursday 26 April 2012 at 00:53, Ivan Vilata i Balaguer wrote:
 chris (2012-04-22 17:09:45 +0200) wrote:
 
  Please check out
 
  https://server.ac-drexler.de/fossil/fossil/doc/tip/addons/markdown.md
 
  for an integration proposal of the discount library with the build
  system of fossil.
 
  ---
  ## Markdown support for fossil
 
  after looking for additional markup support for fossil I found [this
  thread][1].  With the references and some afternoon work I managed to
  integrate Markdown as an additional mime-type .md that the doc
  interface handles in a similar way to .wiki .txt.
 
 Looks nice!  You may also be interested in my enhanced version of Bill
 Burdick's Fossil pagedown software which does client-side rendering of
 wiki pages and embedded `.wiki` and `.txt` docs starting with
 `@pagedown` and (similarly to your solution) all embedded docs ending in
 `.md.txt` (of course with no changes at all to Fossil and keeping repos
 portable).

Since we are talking about alternatives for markdown-in-fossil, you
might remember my repeated mentions about integrating my [markdown
library][libupskirt] into fossil.

To be perfectly honest, I lost interest in the idea, and went for the
generated embedded docs idea (same as what was previously said with
AsciiDoc). Even though I still don't like putting generated stuff into
the SCM, I find it to be a lesser evil compared to the risk of
spectacular failure when embedding such complex code into fossil,
especially with regard to security (since it's the same binary, a
vulnerability in the markdown code can mean read/write access to at
least the whole sqlite database).

So my question is now, is there anybody willing to take it over, or do I
just send it to the heaven for bits?

For the record, I think the main pros my library still has over discount
is legal stuff (I can hand over copyright of fossil's fork any time) and
direct support from me. However these are probably not worth much if
merge into official release is still not going to happen.


Natacha

[libupskirt]: http://fossil.instinctive.eu/libupskirt/index


pgp4fgiQSUNjf.pgp
Description: PGP signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-27 Thread Lluís Batlle i Rossell
On Fri, Apr 27, 2012 at 12:14:47PM +0200, Natacha Porté wrote:
  Looks nice!  You may also be interested in my enhanced version of Bill
  Burdick's Fossil pagedown software which does client-side rendering of
  wiki pages and embedded `.wiki` and `.txt` docs starting with
  `@pagedown` and (similarly to your solution) all embedded docs ending in
  `.md.txt` (of course with no changes at all to Fossil and keeping repos
  portable).
 
 So my question is now, is there anybody willing to take it over, or do I
 just send it to the heaven for bits?

If you have a fossil branch with those changes, it would be great to have the
branch in the main fossil repository.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-27 Thread Baptiste Daroussin
Le 27 avril 2012 12:14, Natacha Porté nata...@instinctive.eu a écrit :
 Hello,

 on Thursday 26 April 2012 at 00:53, Ivan Vilata i Balaguer wrote:
 chris (2012-04-22 17:09:45 +0200) wrote:

  Please check out
 
      https://server.ac-drexler.de/fossil/fossil/doc/tip/addons/markdown.md
 
  for an integration proposal of the discount library with the build
  system of fossil.
 
  ---
  ## Markdown support for fossil
 
  after looking for additional markup support for fossil I found [this
  thread][1].  With the references and some afternoon work I managed to
  integrate Markdown as an additional mime-type .md that the doc
  interface handles in a similar way to .wiki .txt.

 Looks nice!  You may also be interested in my enhanced version of Bill
 Burdick's Fossil pagedown software which does client-side rendering of
 wiki pages and embedded `.wiki` and `.txt` docs starting with
 `@pagedown` and (similarly to your solution) all embedded docs ending in
 `.md.txt` (of course with no changes at all to Fossil and keeping repos
 portable).

 Since we are talking about alternatives for markdown-in-fossil, you
 might remember my repeated mentions about integrating my [markdown
 library][libupskirt] into fossil.

 To be perfectly honest, I lost interest in the idea, and went for the
 generated embedded docs idea (same as what was previously said with
 AsciiDoc). Even though I still don't like putting generated stuff into
 the SCM, I find it to be a lesser evil compared to the risk of
 spectacular failure when embedding such complex code into fossil,
 especially with regard to security (since it's the same binary, a
 vulnerability in the markdown code can mean read/write access to at
 least the whole sqlite database).

 So my question is now, is there anybody willing to take it over, or do I
 just send it to the heaven for bits?

 For the record, I think the main pros my library still has over discount
 is legal stuff (I can hand over copyright of fossil's fork any time) and
 direct support from me. However these are probably not worth much if
 merge into official release is still not going to happen.


Well performance is also very good point for your library, it out
performs discount by far and consumes far less memory.

regards,
Bapt
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-27 Thread chris

Hi all,

I have a personal need (better interest)
in having markdown integrated and looked into what other people did 
before. I have found
many discussions but no realization (i missed out on the cline-side 
rendering solution
with pagedown at that time). So I was looking into whether markdown 
should be integrated

at all and if so,how can it be done minimally invasive.

Let me give you some detail on my experiences/opinions:

On 27.04.2012 12:38, Baptiste Daroussin wrote:

Le 27 avril 2012 12:14, Natacha Porténata...@instinctive.eu  a écrit :

Hello,
Since we are talking about alternatives for markdown-in-fossil, you
might remember my repeated mentions about integrating my [markdown
library][libupskirt] into fossil.


I've chosen discount because it was readily available for linux  win 
and with
that I could explore integration possibilities. Since then I looked at 
client side

rendering and also at libupskirt and sundown as well.

To be perfectly honest, I lost interest in the idea, and went for the
generated embedded docs idea (same as what was previously said with
AsciiDoc). Even though I still don't like putting generated stuff into
the SCM, I find it to be a lesser evil compared to the risk of
spectacular failure when embedding such complex code into fossil,
especially with regard to security (since it's the same binary, a
vulnerability in the markdown code can mean read/write access to at
least the whole sqlite database)
I also don't like checking in generated code/doc at all. Right now I'm 
also exploring
something like a python service that pulls the markdown/reStructureText 
documents
from fossil and renders them. But I don't really like that I've to have 
two services installed,

configures  up-and-running for this.

So I looked into integrating markdown more tightly.

So my question is now, is there anybody willing to take it over, or do I
just send it to the heaven for bits?

For the record, I think the main pros my library still has over discount
is legal stuff (I can hand over copyright of fossil's fork any time) and
direct support from me. However these are probably not worth much if
merge into official release is still not going to happen.

Here my, as always subjective, summary:
 - discount is heavy with everything around it but was easily 
compilable/avail for
   linux  win. Under win I only compiled lib markdown and the 
integration was

   done quite quickly (from a technical perspective).
 - client side rendering lacks IMHO seemless link integration with 
fossil artifact
   links. some glue code helped to this with discount and can be done 
easily with
   any other server side library. I'm not sure how this can be achieved 
with client

   side rendering (any ideas here?)
 - server side I tried libupskirt today but it was difficult to get it 
to compile under
   win. finally I created a makefile for nmake but then header parsing 
or better
   the rendering part caused issues (h234523534 header tags instead 
of h2).
   The vprintbuf function has/had a problem. The I borrowed the code 
from sundown

   only for this function and it worked fine.

I don't want to cause a flame war and I appreciate all the work people 
did to support
markdown as a wider used markup language. But right now I'm looking into 
integrating
sundown as the smaller / faster (?) library compared to discount and the 
one easier

avail under win AND linux compared to libupskirt.

I did not look at the legal stuff (yet) and it's definitely a point to 
consider. If I'd still
be a candidate for the tooth fairy my wish would be to bring libupskirt 
 sundown back

together and use both under linux  win together with fossil

I haven't dove into the details of both implementations, so there might 
be details that

prevent this.


Well performance is also very good point for your library, it out
performs discount by far and consumes far less memory.


Performance with larger markdown file was not evaluated as I don't expect
to have huge document to be displayed. Still that might be an adv of
libupskirt/sundown.

Besides: I like the libupskirt approach on how to integrate the 
renderer. I want

to createy S5 HTML slide output from some markdown files and that approach
woulk make it quite easy to implement it.

Here I want to thank everyone who made it possible for me to explore all 
these
things in such a short time (Richard, Natascha, Tin-Pot, ). And if 
we don't get
consensus, then maybe I'll create a branch in the fossil repository and 
people

can pull it if they are interested in my markdown integration.

Chris


___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-27 Thread chris

Hi all,

I've integrated sundown and found two problems that it shares with 
libupskirt:
1. both have their own buffer concept and do not allow to hand in a 
string that
   makes it necessary to copy from Fossils Blob blob_str  output into 
the input

   buffer = needs twice the input docs size :-(
2. discount (somewhat) supports the markdown header extension of pandoc: 
three
   % lines at the beginning of the file denote title, author and date. 
I used this
   to differentiate between real markdown (if title parsing was 
successful) and

   normal text for .txt files. That's not possible anymore.


Any thoughts on both topics?

checkin link: 
http://server.ac-drexler.de/fossil/fossil/info/b4715c17bca42209


Chris


___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-27 Thread Chris Drexler

@Natacha,

no offence intended and none taken :-). Email is such a bad medium when 
it comes
to discussions with people you don't know. The personal/emotional/visual 
part

is completely missing.

BTW: yes, it was a compliment :-)

@all
Back to the topic from below regarding integration: I wanted to be able 
to identify
the *content* of a txt file independently of its extension. With that I 
can write md
in .txt files. Normal fossil will render it as pre-formatted text. 
MD-enhanced fossil

renders it as html.
Therefore pure mime-type based integration would  not work.

Find attached a proposal to extend sundown with at least the detection of
Pandoc style header lines similar to discount. I'd intend to integrate 
callbacks
for the header into the callback structure if this is something of 
interest here.


And one more on the licensing issue: is sundown under the same license as
libupskirt or do the differ? From the license info in the source it 
should both

be OK. Am I wrong here?

Chris

On 27.04.2012 23:07, Natacha Porté wrote:

Hello,

just to be clear, I had no intention either to start a flamewar or
anything, and no intention to specifically advertise my solution (or
rather, my library).

The only point of my previous message was to make clear what I could
offer, which has changed since last time I posted here. And bottom line
is I DON'T have an integration to offer anymore, though copyright
assignmnet and support offers still stand.

I answer to specific points below.


on Friday 27 April 2012 at 21:06, chris wrote:

   - server side I tried libupskirt today but it was difficult to get it
to compile under
 win. finally I created a makefile for nmake but then header parsing
or better
 the rendering part caused issues (h234523534 header tags instead
of h2).
 The vprintbuf function has/had a problem. The I borrowed the code
from sundown
 only for this function and it worked fine.

This is a known issue, primarily due to the lack of C99 support in
windows. I don't have access to any windows machine, so I can't make any
meaningful development or testing. However I seem to remember some
people on this ML have already solved it or worked around it. Anyway,
the whole dynamic buffer code should go IMHO.


I did not look at the legal stuff (yet) and it's definitely a point to
consider. If I'd still
be a candidate for the tooth fairy my wish would be to bring libupskirt
  sundown back
together and use both under linux  win together with fossil

I haven't dove into the details of both implementations, so there might
be details that
prevent this.

There isn't. The crux of the matter is the dynamic buffer code (and to a
lesser extend the dynamic array code). See below.


Besides: I like the libupskirt approach on how to integrate the
renderer. I want
to createy S5 HTML slide output from some markdown files and that approach
woulk make it quite easy to implement it.

Thanks a lot :-)  (I took it as a compliment on my design)


on Friday 27 April 2012 at 22:14, chris wrote:

Hi all,

I've integrated sundown and found two problems that it shares with
libupskirt:
1. both have their own buffer concept and do not allow to hand in a
string that
 makes it necessary to copy from Fossils Blob blob_str  output into
the input
 buffer =  needs twice the input docs size :-(

That's where I spent most of the time in my attempt to integrate
libupskirt into fossil. The idea was to remove libupskirt's dynamic
buffers completely and replace them with fossil blobs (which are
dynamic buffers too).

I didn't finish it, however from the part I did I'd say it's tedious but
not difficult.


2. discount (somewhat) supports the markdown header extension of pandoc:
three
 % lines at the beginning of the file denote title, author and date.
I used this
 to differentiate between real markdown (if title parsing was
successful) and
 normal text for .txt files. That's not possible anymore.

My solution for that point was to use a dedicated extension for markdown
files (actually two, .mkd and .markdown), and then simply add them in
doc.c with text/x-markdown MIME type, along with a special handler for
text/x-markdown in doc_page() function from doc.c, besides the handling
of application/x-fossil-wiki and text/plain.

It seemed to be the least intrusive way of introducing markdown support
(but only as an embedded doc rendered into HMTL on-the-fly). That's the
only modification of fossil's current code that is needed, everything
else is integrating the markdown library into the binary.


Hoping this helps,
Natasha
diff --git a/src/markdown.c b/src/markdown.c
index 260483d..46c0dac 100644
--- a/src/markdown.c
+++ b/src/markdown.c
@@ -2447,6 +2447,38 @@ sd_markdown_new(
 
 	return md;
 }
+static size_t 
+sd_markdown_hdridx(size_t start, const uint8_t *document, size_t doc_size)
+{
+int hdrlines = 0;
+size_t i = start;
+while (i  doc_size) /* iterating over lines */
+{
+/* stop at first 

Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-26 Thread chris

Hi Ivan,

On 26.04.2012 00:53, Ivan Vilata i Balaguer wrote:

chris (2012-04-22 17:09:45 +0200) wrote:


Please check out

https://server.ac-drexler.de/fossil/fossil/doc/tip/addons/markdown.md

## Markdown support for fossil


Looks nice!  You may also be interested in my enhanced version of Bill
Burdick's Fossil pagedown software which does client-side rendering of
wiki pages and embedded `.wiki` and `.txt` docs starting with
`@pagedown` and (similarly to your solution) all embedded docs ending in
`.md.txt` (of course with no changes at all to Fossil and keeping repos
portable)


obviously your solution is much less intrusive, looks great! Are there 
any markdown extensions
supported by pagedown? I couldn't find any references so I assume pure 
Markdown, right?


Thanks for the reference!
Chris
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-26 Thread Bill Burdick
On Thu, Apr 26, 2012 at 2:41 PM, chris ch...@ac-drexler.de wrote:

 Hi Ivan,


 On 26.04.2012 00:53, Ivan Vilata i Balaguer wrote:

 chris (2012-04-22 17:09:45 +0200) wrote:

  Please check out

https://server.ac-drexler.de/**fossil/fossil/doc/tip/addons/**
 markdown.mdhttps://server.ac-drexler.de/fossil/fossil/doc/tip/addons/markdown.md

 ## Markdown support for fossil


 Looks nice!  You may also be interested in my enhanced version of Bill
 Burdick's Fossil pagedown software which does client-side rendering of
 wiki pages and embedded `.wiki` and `.txt` docs starting with
 `@pagedown` and (similarly to your solution) all embedded docs ending in
 `.md.txt` (of course with no changes at all to Fossil and keeping repos
 portable)


 obviously your solution is much less intrusive, looks great! Are there any
 markdown extensions
 supported by pagedown? I couldn't find any references so I assume pure
 Markdown, right?


Actually, I don't really know that much about Pagedown -- I just integrated
it as kind of a black box :).


Bill
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-25 Thread Ivan Vilata i Balaguer
chris (2012-04-22 17:09:45 +0200) wrote:

 Please check out

   https://server.ac-drexler.de/fossil/fossil/doc/tip/addons/markdown.md

 for an integration proposal of the discount library with the build
 system of fossil.

 ---
 ## Markdown support for fossil

 after looking for additional markup support for fossil I found [this
 thread][1].  With the references and some afternoon work I managed to
 integrate Markdown as an additional mime-type .md that the doc
 interface handles in a similar way to .wiki .txt.

Looks nice!  You may also be interested in my enhanced version of Bill
Burdick's Fossil pagedown software which does client-side rendering of
wiki pages and embedded `.wiki` and `.txt` docs starting with
`@pagedown` and (similarly to your solution) all embedded docs ending in
`.md.txt` (of course with no changes at all to Fossil and keeping repos
portable).

Announcement and rationale:
http://article.gmane.org/gmane.comp.version-control.fossil-scm.user/8832/

The repo:
https://elvil.net/fossil/fossil-pagedown/doc/pagedown/README.md.txt

Cheers,

-- 
Ivan Vilata i Balaguer -- https://elvil.net/

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-04-22 Thread chris

Hi all,
I followed the thread reagarding markdown support and gave it a try on my own.

Please check out

https://server.ac-drexler.de/fossil/fossil/doc/tip/addons/markdown.md

for an integration proposal of the discount library with the build system of 
fossil.


## Markdown support for fossil

after looking for additional markup support for fossil I found [this thread][1].
With the references and some afternoon work I managed to integrate
Markdown as an additional mime-type .md that the doc interface handles in a
similar way to .wiki  .txt.

No full wiki integration into fossils wiki system  is planned because I
understand and agree with the [point of Richard Hipp][5] that the repositories
themselves should be portable and not break backward compatibility. But the
rendering of .md files from within a repo should be fine.

If configured ('configure --with-md' is  supported) .md files are run
through the [discount version of tin-pot][3]. In addition the page title
is set according to the supported pandoc header format (three lines starting
with '%' at the beginning of the .md document: title, author, date. All three
must be present for the detection to work).

Please feel free to look at the
[doc-markdown-support](/timeline?r=doc-markdown-support) branch in [this
repository](https://server.ac-drexler.de/fossil/fossil/).


### Installation

Here are the installation instructions for Linux. Windows is not yet tested.

  1.  git clone git://github.com/tin-pot/discount.git
  2.  cd discount; ./configure.sh; make; sudo make install
  3.  cd  ..
  4.  fossil clone http://server.ac-drexler.de/fossil/fossil fossil.fossil
  5.  mkdir fossil-md
  6.  cd fossil-md
  7.  fossil open ../fossil.fossil doc-markdown-support
  8.  ./configure --with-md
  9.  make



[1]: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg07297.html 
Mail Thread
[2]: http://www.pell.portland.or.us/~orc/Code/discount Original Discount
[3]: https://github.com/tin-pot/discount Discount with Win support
[4]: http://dl.dropbox.com/u/13455033/wikiformat.c first wikiformat.c patch by 
tin-pot
[5]: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg01915.html 
Thread from R. Hipp regarding another markup




___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread tin-pot
Jan Danielsson jan.m.danielsson@... writes:

 
 On 05/24/11 08:08, Baptiste Daroussin wrote:
 [---]
  Markdown is a really simple format that would imho greatly improve the
  embed wiki of fossil.
 
Agreed. I'd love to see markdown support in fossil.
 


Good news then :-)

I have added the `discount` Markdown implementation into Fossil version 1.21.
This is actually pretty simple to do.

First, get David L. Parson's `discount` package from the author's site [1]; this
is a classical configure/make source tree, so if you are on Windows, you might
be interested in my adaptation [2] of it for Windows/MSVC on github.

Building should give you a static library `markdown.lib` (rsp. `markdown.a`).

The only thing that must be changed in Fossil (besides letting the compiler and
linker find the Markdown lib in the Makefile) is the source file `wikiformat.c`.

I have put the modified file in my public Dropbox [3], the changes can easily be
found by looking for the macro `WITH_MARKDOWN`. If you define it (in your
Makefile), all wiki content (and log messages if switched on etc.) will use
extended Markdown, while the Fossil-style links still work. See David Parson's
page for the details on which syntax extensions are available.

This is in an early stage of development and needs testing, and of course the
user should have the option to enable Markdown in the web interface,
individually for each wiki page rsp artifact would be best ... - but it's a
start anyway.

Feel free to experiment with that and to proliferate it.

Cheers
M.H.


[1]: http://www.pell.portland.or.us/~orc/Code/discount

[2]: https://github.com/tin-pot/discount

[3]: http://dl.dropbox.com/u/13455033/wikiformat.c





___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Bill Burdick
Excellent!

Bill


On Fri, Jan 13, 2012 at 11:18 AM, tin-pot tin-...@gmx.net wrote:

 Jan Danielsson jan.m.danielsson@... writes:

 
  On 05/24/11 08:08, Baptiste Daroussin wrote:
  [---]
   Markdown is a really simple format that would imho greatly improve the
   embed wiki of fossil.
 
 Agreed. I'd love to see markdown support in fossil.
 


 Good news then :-)

 I have added the `discount` Markdown implementation into Fossil version
 1.21.
 This is actually pretty simple to do.

 First, get David L. Parson's `discount` package from the author's site
 [1]; this
 is a classical configure/make source tree, so if you are on Windows, you
 might
 be interested in my adaptation [2] of it for Windows/MSVC on github.

 Building should give you a static library `markdown.lib` (rsp.
 `markdown.a`).

 The only thing that must be changed in Fossil (besides letting the
 compiler and
 linker find the Markdown lib in the Makefile) is the source file
 `wikiformat.c`.

 I have put the modified file in my public Dropbox [3], the changes can
 easily be
 found by looking for the macro `WITH_MARKDOWN`. If you define it (in your
 Makefile), all wiki content (and log messages if switched on etc.) will use
 extended Markdown, while the Fossil-style links still work. See David
 Parson's
 page for the details on which syntax extensions are available.

 This is in an early stage of development and needs testing, and of course
 the
 user should have the option to enable Markdown in the web interface,
 individually for each wiki page rsp artifact would be best ... - but it's a
 start anyway.

 Feel free to experiment with that and to proliferate it.

 Cheers
 M.H.


 [1]: http://www.pell.portland.or.us/~orc/Code/discount

 [2]: https://github.com/tin-pot/discount

 [3]: http://dl.dropbox.com/u/13455033/wikiformat.c





 ___
 fossil-users mailing list
 fossil-users@lists.fossil-scm.org
 http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Jeremy Cowgar
Fantastic. Hopefully this makes it into the trunk version of Fossil.

Jeremy

On Jan 13, 2012, at 6:47 AM, Bill Burdick wrote:

 Excellent!
 
 Bill
 
 
 On Fri, Jan 13, 2012 at 11:18 AM, tin-pot tin-...@gmx.net wrote:
 Jan Danielsson jan.m.danielsson@... writes:
 
 
  On 05/24/11 08:08, Baptiste Daroussin wrote:
  [---]
   Markdown is a really simple format that would imho greatly improve the
   embed wiki of fossil.
 
 Agreed. I'd love to see markdown support in fossil.
 
 
 
 Good news then :-)
 
 I have added the `discount` Markdown implementation into Fossil version 1.21.
 This is actually pretty simple to do.
 
 First, get David L. Parson's `discount` package from the author's site [1]; 
 this
 is a classical configure/make source tree, so if you are on Windows, you might
 be interested in my adaptation [2] of it for Windows/MSVC on github.
 
 Building should give you a static library `markdown.lib` (rsp. `markdown.a`).
 
 The only thing that must be changed in Fossil (besides letting the compiler 
 and
 linker find the Markdown lib in the Makefile) is the source file 
 `wikiformat.c`.
 
 I have put the modified file in my public Dropbox [3], the changes can easily 
 be
 found by looking for the macro `WITH_MARKDOWN`. If you define it (in your
 Makefile), all wiki content (and log messages if switched on etc.) will use
 extended Markdown, while the Fossil-style links still work. See David Parson's
 page for the details on which syntax extensions are available.
 
 This is in an early stage of development and needs testing, and of course the
 user should have the option to enable Markdown in the web interface,
 individually for each wiki page rsp artifact would be best ... - but it's a
 start anyway.
 
 Feel free to experiment with that and to proliferate it.
 
 Cheers
 M.H.
 
 
 [1]: http://www.pell.portland.or.us/~orc/Code/discount
 
 [2]: https://github.com/tin-pot/discount
 
 [3]: http://dl.dropbox.com/u/13455033/wikiformat.c
 
 
 
 
 
 ___
 fossil-users mailing list
 fossil-users@lists.fossil-scm.org
 http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
 
 ___
 fossil-users mailing list
 fossil-users@lists.fossil-scm.org
 http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread BohwaZ
Le Fri, 13 Jan 2012 06:49:19 -0500, Jeremy Cowgar jer...@cowgar.com a
écrit :

 Fantastic. Hopefully this makes it into the trunk version of Fossil.

I personally prefer the github flavored markdown because some things in
Markdown are really counter-intuitive, like typing :

First line
Second line

Displays as :

First line Second line

This feature is also present in actual Fossil wiki syntax, and I
dislike it very much as users don't get why a line break doesn't
display as a line break.

-- 
BohwaZ
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Jeremy Cowgar

On Jan 13, 2012, at 7:02 AM, BohwaZ wrote:

 Le Fri, 13 Jan 2012 06:49:19 -0500, Jeremy Cowgar jer...@cowgar.com a
 écrit :
 
 I personally prefer the github flavored markdown because some things in
 Markdown are really counter-intuitive, like typing :
 
 First line
 Second line
 
 Displays as :
 
 First line Second line
 
 This feature is also present in actual Fossil wiki syntax, and I
 dislike it very much as users don't get why a line break doesn't
 display as a line break.

That is standard w/about any markup language, for example what you typed in 
HTML would also appear as First line Second line. The reasoning is that line 
breaks are not normal in text. Paragraph breaks are. Thus you take the norm and 
make it easy, the abnormal (or the exception) is the one that requires you do 
to something differently.

You do, however, have paragraph breaks. That is achieved by 1 blank line in 
between your paragraphs, just as you would with an email, such as what I just 
did here. If you wish to specifically format you text with individual lines 
then you can use the nowiki tag or the pre tag to tell the syntax parser not to 
touch your text. This, however, most of the times does not achieve a readable 
text structure.

Jeremy

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Remigiusz Modrzejewski

On Jan 13, 2012, at 12:49 , Jeremy Cowgar wrote:

 Fantastic. Hopefully this makes it into the trunk version of Fossil.

Yeah, shortly after discount author signs the copyright leaflet...


Kind regards,
Remigiusz Modrzejewski



___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users



Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Bill Burdick
It's BSD licensed -- does he still need to do that?

Bill


On Fri, Jan 13, 2012 at 2:29 PM, Remigiusz Modrzejewski
l...@maxnet.org.plwrote:


 On Jan 13, 2012, at 12:49 , Jeremy Cowgar wrote:

  Fantastic. Hopefully this makes it into the trunk version of Fossil.

 Yeah, shortly after discount author signs the copyright leaflet...


 Kind regards,
 Remigiusz Modrzejewski



 ___
 fossil-users mailing list
 fossil-users@lists.fossil-scm.org
 http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Lluís Batlle i Rossell
On Fri, Jan 13, 2012 at 01:32:19PM +0100, BohwaZ wrote:
 Le Fri, 13 Jan 2012 07:10:44 -0500, Jeremy Cowgar jer...@cowgar.com a
 écrit :
 
  That is standard w/about any markup language, for example what you
  typed in HTML would also appear as First line Second line. The
  reasoning is that line breaks are not normal in text. Paragraph
  breaks are. Thus you take the norm and make it easy, the abnormal (or
  the exception) is the one that requires you do to something
  differently.
 
 Who decides line breaks are abnormal? They are natural in any text
 processing software, like when writing emails, word processing, text
 editors and so on. I don't see why a markup language should ignore them.

Markdown is closely related to HTML. And HTML is meant for display of text (and
more) on very different devices, from a watch to an e-reader, to a newspaper, to
a computer screen.

Having line breaks to show at the same place as the source code means that the
text will require a display similar to that of the author of the source file,
for proper reading.

PDF line breaks will show in the same place in every device, for example, as it
has even a paper size linked to it. That's why it's annoying to use PDF in some
small devices, and HTML ends up looking better.

My five cents,
Lluís.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Natacha Porté
Hello,

on Friday 13 January 2012 at 09:18, tin-pot wrote:
 Jan Danielsson jan.m.danielsson@... writes:
  On 05/24/11 08:08, Baptiste Daroussin wrote:
  [---]
   Markdown is a really simple format that would imho greatly improve the
   embed wiki of fossil.
  
 Agreed. I'd love to see markdown support in fossil.
  
 I have added the `discount` Markdown implementation into Fossil version 1.21.
 This is actually pretty simple to do.

Well, no offense, but that was the easy part. I would be very interested
in hearing how to handle the hard part (the one I have given up on when
I was trying to integrate libupskirt): how to make it play nice across
the distributed nature of fossil, including nodes with older versions
which do not include the change.

From what I gather in previous discussion, there is no hope of ever
having markdown in the official branch without the hard part being
solved.

On my markdown branch, I worked around it by first providing support of
embedded docs in markdown, i.e. adding a hook to .mkd files, processing
them into HTML and add fossil theme around like for .wiki files.

Is there any interest in my approach, or should I let it gather digital
dust in peace?

On the other hand, works on hook would probably include (make it easy
to include) embedded doc and/or wiki filter that would accomplish the
same thing while being extremely more flexible.


Natacha


pgpRacDFx4tWt.pgp
Description: PGP signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Remigiusz Modrzejewski

On Jan 13, 2012, at 13:36 , Bill Burdick wrote:

 It's BSD licensed -- does he still need to do that?

I don't have the time to read through the verbiage again, but IIRC yes. Any 
submission to Fossil has to go with full assignment of copyright, which has to 
be done by the original author. This way it was possible to make the move from 
GPL to BSD... But some code from the early days, when no contracts were signed, 
had to be dropped.


Kind regards,
Remigiusz Modrzejewski



___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Martin Hofmann
Hi,

 Datum: Fri, 13 Jan 2012 13:50:28 +0100
 Von: Natacha Porté nata...@instinctive.eu
 on Friday 13 January 2012 at 09:18, tin-pot wrote:
  I have added the `discount` Markdown implementation into Fossil version 
  1.21.
  This is actually pretty simple to do.
 
 Well, no offense, but that was the easy part. 

None taken ;-)

 I would be very interested
 in hearing how to handle the hard part (the one I have given up on when
 I was trying to integrate libupskirt): how to make it play nice across
 the distributed nature of fossil, including nodes with older versions
 which do not include the change.

Well, as I had admitted, this is an early stage, and of course it is a 
bad idea to simply apply Markdown everywhere in one Fossil instance, and 
nowhere in an other.

What I would propose to handle the hard part (hope I understand your
point correctly) is:

1. Of course artifacts with different notations (ie native markup and 
   Markdown) must be allowed to coexist in one repository. So we have
   to tag them somehow - but I'm too new to Fossil's interna to have 
   the right solution for that; I hope this should not be too hard?

2. A Native Item must be recognizable as such without a tag: a missing
   tag indicates the fact that it is native; and it must always be 
   rendered in the native way.

3. Markdown Items (and possibly other styles) shall be recognized by a
   Markdown-enabled Fossil executable and rendered accordingly. I see
   no fundamental problem here either.

4. What about rendering of Markdown Items (or comparable different 
   notations) by a off-the-shelf Fossil executable? A native Fossil 
   does not know anything about the tag for a Markdown Item and will 
   treat it as native anyway. I presume this is the hard part ...

The best option I see here is to degrade gracefully by an arrangement 
like this:

- A Markdown Item is wrapped into a pre HTML element (or something 
  to that effect) and gets rendered by an off-the-shelf Fossil as plain
  text without special formatting - but it sure would be good to have 
  at least native links processed correctly: how to provide for that?
  I don't know yet - hints would be greatly appreciated.

  As Markdown is _designed_ to be readable in plain-text view, this
  should at least not destroy completely the useablity of Markdown 
  content in a native Fossil.

- A Markdown Item wrapped and tagged in this way can still be rendered
  and edited correctly in a Markdown-enabled Fossil: the tagging and
  wrapping should take place unnoticed by the user for items that are
  designated as Markdown-styled.

  Still, in a native Fossil, the item can be edited simply as a piece
  of unprocessed plain text.

So this leaves me with a general request for proposals, and two specific
questions:

1. How to tag a piece of content (wiki page, log message etc.) in 
   order to signify it's markup stype?

2. How to wrap a piece of content so that a native Fossil will keep
   its formatting (line breaks, white space) untouched but still renders
   at least native links in a useable fashion?

Thanks  Greetings

Martin (tin-pot)

-- 
 Okay, buzzwords only. Two syllables, tops.  -- Laurie Anderson 

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Natacha Porté
Hello,

on Friday 13 January 2012 at 15:42, Martin Hofmann wrote:
  I would be very interested
  in hearing how to handle the hard part (the one I have given up on when
  I was trying to integrate libupskirt): how to make it play nice across
  the distributed nature of fossil, including nodes with older versions
  which do not include the change.
 
 Well, as I had admitted, this is an early stage, and of course it is a 
 bad idea to simply apply Markdown everywhere in one Fossil instance, and 
 nowhere in an other.
 
 What I would propose to handle the hard part (hope I understand your
 point correctly) is:
 
 [snip]

Good, I'm glad to see you are aware of the hard part (yes, you
understood correctly what I meant), and that you have even put some
thoughts into it. That covers all I was worried about, so
congratulations for what you've done and I wish you success for what
remains to be done.

I'm only a bit sad about the duplication of work in including different
markdown engines into fossil. However I like to believe I still have a
head-start in that I'm already willing to hand over copyright (assuming
I can keep it over my own independant copy).

Also, according to a private communication from a github employee, they
switched from discount to a fork of my library because of several
critical security vulnerabilities that are not quite trivial to fix. I
haven't been able to gather any further details, but considering how
wide wiki-append-permissions seem supposed to be, I wouldn't treat wiki
contents as trusted.

But then again, standard markdown allows raw HTML inclusion, so security
issues will eventually be raised (at least for people like me who would
not trust wiki contributors with raw HTML).


Natacha


pgpAqiLEA61Gr.pgp
Description: PGP signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Stephan Beal
On Fri, Jan 13, 2012 at 10:18 AM, tin-pot tin-...@gmx.net wrote:

 I have added the `discount` Markdown implementation into Fossil version
 1.21.
 This is actually pretty simple to do.

...

If this option ever gets incorporated into the trunk, please be sure to
post an announcement on the dev list (or let me know off-list) so that i
can adjust the JSON API to be able to deal with it (e.g. calling a
different text-processing function for that case, or provide
runtime-selectable parsing mode).

Happy Hacking!

-- 
- stephan beal
http://wanderinghorse.net/home/stephan/
http://gplus.to/sgbeal
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Martin Hofmann
Hello Natacha,

 Datum: Fri, 13 Jan 2012 16:06:07 +0100
 Von: Natacha Porté nata...@instinctive.eu
 An: fossil-users@lists.fossil-scm.org
 Betreff: Re: [fossil-users] Supporting markwon syntax for wiki

 Good, I'm glad to see you are aware of the hard part (yes, you
 understood correctly what I meant), and that you have even put some
 thoughts into it. That covers all I was worried about, so
 congratulations for what you've done and I wish you success for what
 remains to be done.

Yep, there is still the bigger part to be done, d'accord :-)

 I'm only a bit sad about the duplication of work in including different
 markdown engines into fossil. However I like to believe I still have a
 head-start in that I'm already willing to hand over copyright (assuming
 I can keep it over my own independant copy).

Oh, that I grabbed `discount` is rather coincidental: it is one of the 
few C-only implementations (that I know of, the other one being
Fletcher T. Penney's [`multimarkdown`] [1]). Furthermore, it has a BSD-
style licence and is intended to be used as a library.

 Also, according to a private communication from a github employee, they
 switched from discount to a fork of my library because of several
 critical security vulnerabilities that are not quite trivial to fix. I
 haven't been able to gather any further details, but considering how
 wide wiki-append-permissions seem supposed to be, I wouldn't treat wiki
 contents as trusted.

Didn't know that. On their [website] [2] they (still?) profess to use 
`Redcarpet`, a wrapper around the `Sundown` library (that I don't know
much either).

Anyway, I'm not fixated on `discount` and would happily try out your library as 
well, if that's alright with you. What is needed by me is basically a simple 
string-in-string-out API.

 But then again, standard markdown allows raw HTML inclusion, so security
 issues will eventually be raised (at least for people like me who would
 not trust wiki contributors with raw HTML).

You have point. Maybe it is possible to tame the generated HTML by checking 
for and removing of elements and attributes that are out of limits ...?

Thanks for your support!

Martin

[1]:https://github.com/fletcher/peg-multimarkdown

[2]:http://github.github.com/github-flavored-markdown/
-- 
 Okay, buzzwords only. Two syllables, tops.  -- Laurie Anderson 

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Jeremy Cowgar
Natacha's library is very easy to use and it has always done me right. I've 
written a Tcl wrapper around it. I'd highly suggest checking it out. Further, 
Natacha already said that the copyright issue wouldn't be a problem and on top 
of that a fossil user.

Jeremy

On Jan 13, 2012, at 10:45 AM, Martin Hofmann wrote:

 Hello Natacha,
 
 Datum: Fri, 13 Jan 2012 16:06:07 +0100
 Von: Natacha Porté nata...@instinctive.eu
 An: fossil-users@lists.fossil-scm.org
 Betreff: Re: [fossil-users] Supporting markwon syntax for wiki
 
 Good, I'm glad to see you are aware of the hard part (yes, you
 understood correctly what I meant), and that you have even put some
 thoughts into it. That covers all I was worried about, so
 congratulations for what you've done and I wish you success for what
 remains to be done.
 
 Yep, there is still the bigger part to be done, d'accord :-)
 
 I'm only a bit sad about the duplication of work in including different
 markdown engines into fossil. However I like to believe I still have a
 head-start in that I'm already willing to hand over copyright (assuming
 I can keep it over my own independant copy).
 
 Oh, that I grabbed `discount` is rather coincidental: it is one of the 
 few C-only implementations (that I know of, the other one being
 Fletcher T. Penney's [`multimarkdown`] [1]). Furthermore, it has a BSD-
 style licence and is intended to be used as a library.
 
 Also, according to a private communication from a github employee, they
 switched from discount to a fork of my library because of several
 critical security vulnerabilities that are not quite trivial to fix. I
 haven't been able to gather any further details, but considering how
 wide wiki-append-permissions seem supposed to be, I wouldn't treat wiki
 contents as trusted.
 
 Didn't know that. On their [website] [2] they (still?) profess to use 
 `Redcarpet`, a wrapper around the `Sundown` library (that I don't know
 much either).
 
 Anyway, I'm not fixated on `discount` and would happily try out your library 
 as well, if that's alright with you. What is needed by me is basically a 
 simple string-in-string-out API.
 
 But then again, standard markdown allows raw HTML inclusion, so security
 issues will eventually be raised (at least for people like me who would
 not trust wiki contributors with raw HTML).
 
 You have point. Maybe it is possible to tame the generated HTML by checking 
 for and removing of elements and attributes that are out of limits ...?
 
 Thanks for your support!
 
 Martin
 
 [1]:https://github.com/fletcher/peg-multimarkdown
 
 [2]:http://github.github.com/github-flavored-markdown/
 -- 
 Okay, buzzwords only. Two syllables, tops.  -- Laurie Anderson 
 
 ___
 fossil-users mailing list
 fossil-users@lists.fossil-scm.org
 http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Martin Hofmann
 Von: Martin Hofmann tin-...@gmx.net
 An: Fossil SCM user\'s discussion fossil-users@lists.fossil-scm.org
 Betreff: Re: [fossil-users] Supporting markwon syntax for wiki

  Also, according to a private communication from a github employee, they
  switched from discount to a fork of my library because of several
  critical security vulnerabilities that are not quite trivial to fix. I
  haven't been able to gather any further details, but considering how
  wide wiki-append-permissions seem supposed to be, I wouldn't treat wiki
  contents as trusted.
 
 Didn't know that. On their [website] [2] they (still?) profess to use
 `Redcarpet`, a wrapper around the `Sundown` library (that I don't know
 much either).

Ah, now I see - `Redcarpet` *is* that fork you're talking about!

Sorry for the confusion.


Cheers
Martin
-- 
 Okay, buzzwords only. Two syllables, tops.  -- Laurie Anderson 

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Natacha Porté
Hello,

on Friday 13 January 2012 at 16:45, Martin Hofmann wrote:
  I'm only a bit sad about the duplication of work in including different
  markdown engines into fossil. However I like to believe I still have a
  head-start in that I'm already willing to hand over copyright (assuming
  I can keep it over my own independant copy).
 
 Oh, that I grabbed `discount` is rather coincidental: it is one of the 
 few C-only implementations (that I know of, the other one being
 Fletcher T. Penney's [`multimarkdown`] [1]). Furthermore, it has a BSD-
 style licence and is intended to be used as a library.

That's also the only two I knew about when I started writing mine, as
explained in http://fossil.instinctive.eu/libupskirt/index

  Also, according to a private communication from a github employee, they
  switched from discount to a fork of my library because of several
  critical security vulnerabilities that are not quite trivial to fix. I
  haven't been able to gather any further details, but considering how
  wide wiki-append-permissions seem supposed to be, I wouldn't treat wiki
  contents as trusted.
 
 Didn't know that. On their [website] [2] they (still?) profess to use
 `Redcarpet`, a wrapper around the `Sundown` library (that I don't know
 much either).

Sundown is actually their fork of my libupskirt. It originally shared
the name, but it was deemed too politically incorrect, so they renamed
it.

 Anyway, I'm not fixated on `discount` and would happily try out your
 library as well, if that's alright with you. What is needed by me is
 basically a simple string-in-string-out API.

Sure. The link above is the fossil repository of my library, you are
welcome to try with it.

My library uses its own version of dynamic string buffers and dynamic
arrays. I started adapting it to use fossil facilities, which would mean
better integration, though I dropped it when other more important things
in my life started to go wrong. I will try to dig it out and hopefully
finish it.

  But then again, standard markdown allows raw HTML inclusion, so security
  issues will eventually be raised (at least for people like me who would
  not trust wiki contributors with raw HTML).
 
 You have point. Maybe it is possible to tame the generated HTML by
 checking for and removing of elements and attributes that are out of
 limits ...?

I would simply forbid any inline HTML, but I might be a bit of an
extremist there. Anyway, I don't pretend to have any useful answer at
this point, I only wanted to raise the questions.


Natacha


pgp5yYdrCZYJ3.pgp
Description: PGP signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2012-01-13 Thread Martin Hofmann
Hi,

 Datum: Fri, 13 Jan 2012 10:51:10 -0500
 Von: Jeremy Cowgar jer...@cowgar.com
 An: Fossil SCM user\'s discussion fossil-users@lists.fossil-scm.org
 Betreff: Re: [fossil-users] Supporting markwon syntax for wiki

 Natacha's library is very easy to use and it has always done me right.
 I've written a Tcl wrapper around it. I'd highly suggest checking it out.

I'm skimming the [`upskirt` Fossil repo] [1] right now, and it look very nice; 
I'll definitely give it a try.

[1]:http://fossil.instinctive.eu/libupskirt/home (Hope that's the 'right' one.)

Martin

-- 
 Okay, buzzwords only. Two syllables, tops.  -- Laurie Anderson 

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-07-21 Thread Baptiste Daroussin
2011/7/20 Remigiusz Modrzejewski l...@maxnet.org.pl:

 On Jul 20, 2011, at 21:18 , Eric wrote:

 +1

 Oh, for heaven's sake! We did this before:

 1) there's no pleasing everybody (we all have our different favourites)

 But most people agree that any of markdown/restructuredtext/dokuwiki/whatever 
 simple syntax is nicer than html-based markup.

 2) if its not available as a single-file C API, it's probably not going in
 anyway (and insisting that it be a library is just as restrictive)


 At some point of this discussion there was an author willing to contribute 
 his (her?) markdown-mangling C code. But this author did not want to delve 
 into inner workings of Fossil, only offered code with good license and help 
 to whoever integrates that. But nobody volunteered to be the integrator.

This is wrong she volunteered to be the integrator she was just asking
some help to work with in inner of fossil to be sure she does the
things the right way, and the way richard would be happy with.

Her code is closed to single C file to integrate, it out performs
discout from my testing.
Have a look.
http://fossil.instinctive.eu/libupskirt/index

And the more important it is really very easy to use.

Anyway richard seems to have decided that there won't be any support
for markdown in fossil.

regards,
Bapt
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-07-21 Thread Remigiusz Modrzejewski

On Jul 21, 2011, at 09:11 , Baptiste Daroussin wrote:

 Anyway richard seems to have decided that there won't be any support
 for markdown in fossil.

Um, I don't see his name in this thread at all...


Kind regards,
Remigiusz Modrzejewski



___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-07-21 Thread Natacha Porté
Hello,

on Thursday 21 July 2011 at 07:11, Baptiste Daroussin wrote:
  2) if its not available as a single-file C API, it's probably not going in
  anyway (and insisting that it be a library is just as restrictive)
 
 
  At some point of this discussion there was an author willing to contribute 
  his (her?) markdown-mangling C code. But this author did not want to delve 
  into inner workings of Fossil, only offered code with good license and help 
  to whoever integrates that. But nobody volunteered to be the integrator.
 
 This is wrong she volunteered to be the integrator she was just asking
 some help to work with in inner of fossil to be sure she does the
 things the right way, and the way richard would be happy with.

Indeed, the help is mostly needed to make sure the design fits within
the grand scheme of things, in order to make maintaining through
upstream evolution easier.

As a first step I propose to add markdown as a supported MIME format,
and add fossil header and footer just like .wiki files. Then the change
to the existing code base is easy to come up with:

--- doc.c-orig  2011-07-21 10:16:17.0 +0200
+++ doc.c   2011-07-21 10:20:18.0 +0200
@@ -167,12 +167,14 @@
 { m,  1, text/plain},
 { m3u,3, audio/x-mpegurl   },
 { man,3, application/x-troff-man   },
+{ markdown,   8, text/x-markdown   },
 { me, 2, application/x-troff-me},
 { mesh,   4, model/mesh},
 { mid,3, audio/midi},
 { midi,   4, audio/midi},
 { mif,3, application/x-mif },
 { mime,   4, www/mime  },
+{ mkd,3, text/x-markdown   },
 { movie,  5, video/x-sgi-movie },
 { mov,3, video/quicktime   },
 { mp2,3, audio/mpeg},
@@ -455,6 +457,16 @@
   wiki_convert(filebody, 0, 0);
 }
 style_footer();
+  }else if( fossil_strcmp(zMime, text/x-markdown)==0 ){
+Blob title, tail;
+if( markdown_find_title(filebody, title, tail) ){
+  style_header(blob_str(title));
+  markdown_convert(tail, 0, 0);
+}else{
+  style_header(Documentation);
+  markdown_convert(filebody, 0, 0);
+}
+style_footer();
   }else if( fossil_strcmp(zMime, text/plain)==0 ){
 style_header(Documentation);
 @ blockquotepre

Then it's only a matter of integrating my parser into fossil's build
system and writing the glue.

Moreover, adding markdown as an alternative to .wiki solve about all the
technical issues related with a markdown wiki, while filling all my
needs.

Adding markdown as a wiki syntax requires much more design work, and I
think it really has to be a design that fits seamlessly into fossil.
That requires a good knowledge of the existing codebase and the
direction into which it is going. Who can provide that?

 Her code is closed to single C file to integrate, it out performs
 discout from my testing.
 Have a look.
 http://fossil.instinctive.eu/libupskirt/index
 
 And the more important it is really very easy to use.

Actually there is one parser .c file, two helper files (one for dynamic
arrays and another for dynamic strings, I can be convinced to port the
parser to fossil solutions instead), and one .c file to define the HTML
rendering, but that will probably the same file as the glue.

And in case it matters (though I hate authority arguments), that's the
parser on which GitHub built the one it's currently using in production,
and it differs from my code only in terms of integrated features.

 Anyway richard seems to have decided that there won't be any support
 for markdown in fossil.

That is the main reason I haven't been making much progress on my
proposition: from his comments in other (older) threads, I'm very
pessimistic about my efforts in that direction being useful ever (even
for only the text/x-markdown support). That combined with serious
personal issues made me spend very little time on it lately.


Regards,
Natacha Porté


pgpjGEOu9AYns.pgp
Description: PGP signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-07-21 Thread Jan Danielsson
On 05/24/11 08:08, Baptiste Daroussin wrote:
[---]
 Markdown is a really simple format that would imho greatly improve the
 embed wiki of fossil.

   Agreed. I'd love to see markdown support in fossil.

-- 
Kind regards,
Jan Danielsson




signature.asc
Description: OpenPGP digital signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-07-20 Thread Bill Burdick
2011/5/24 Natacha Porté nata...@instinctive.eu

 As a fossil user, I would love to have the option to use Markdown in the
 wiki (with the option of dumbing down to forbid inline HTML which might
 be unsafe -- exactly the same option as it exists today).


+1
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-07-20 Thread Eric

On Wed, July 20, 2011 6:49 pm, Bill Burdick wrote:
 2011/5/24 Natacha Porté nata...@instinctive.eu

 As a fossil user, I would love to have the option to use Markdown in the
 wiki (with the option of dumbing down to forbid inline HTML which might
 be unsafe -- exactly the same option as it exists today).


 +1

Oh, for heaven's sake! We did this before:

1) there's no pleasing everybody (we all have our different favourites)
2) if its not available as a single-file C API, it's probably not going in
anyway (and insisting that it be a library is just as restrictive)

which leaves us with should fossil have hooks which still leads to
complex interface issues.

Not to mention people who want to clone a repository and join a project
but can't get the right libraries on their system.

Regards,

Eric

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-07-20 Thread Remigiusz Modrzejewski

On Jul 20, 2011, at 21:18 , Eric wrote:

 +1
 
 Oh, for heaven's sake! We did this before:
 
 1) there's no pleasing everybody (we all have our different favourites)

But most people agree that any of markdown/restructuredtext/dokuwiki/whatever 
simple syntax is nicer than html-based markup.

 2) if its not available as a single-file C API, it's probably not going in
 anyway (and insisting that it be a library is just as restrictive)


At some point of this discussion there was an author willing to contribute his 
(her?) markdown-mangling C code. But this author did not want to delve into 
inner workings of Fossil, only offered code with good license and help to 
whoever integrates that. But nobody volunteered to be the integrator.

Kind regards,
Remigiusz Modrzejewski



___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-07-20 Thread Steve Bennett
On 21/07/2011, at 6:14 AM, Remigiusz Modrzejewski wrote:

 
 On Jul 20, 2011, at 21:18 , Eric wrote:
 
 +1
 
 Oh, for heaven's sake! We did this before:
 
 1) there's no pleasing everybody (we all have our different favourites)
 
 But most people agree that any of markdown/restructuredtext/dokuwiki/whatever 
 simple syntax is nicer than html-based markup.
 
 2) if its not available as a single-file C API, it's probably not going in
 anyway (and insisting that it be a library is just as restrictive)
 
 
 At some point of this discussion there was an author willing to contribute 
 his (her?) markdown-mangling C code. But this author did not want to delve 
 into inner workings of Fossil, only offered code with good license and help 
 to whoever integrates that. But nobody volunteered to be the integrator.

Discount (http://www.pell.portland.or.us/~orc/Code/discount/) is probably 
relatively
easy to integrate and the licence is OK. Still needs somebody to do the work 
though.

Cheers,
Steve

--
µWeb: Embedded Web Framework - http://uweb.workware.net.au/
WorkWare Systems Pty Ltd
W: www.workware.net.au  P: +61 434 921 300
E: ste...@workware.net.au   F: +61 7 3391 6002





___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-07-20 Thread Ron Wilson
On Wed, Jul 20, 2011 at 4:14 PM, Remigiusz Modrzejewski
l...@maxnet.org.pl wrote:

 On Jul 20, 2011, at 21:18 , Eric wrote:

 1) there's no pleasing everybody (we all have our different favourites)

 But most people agree that any of markdown/restructuredtext/dokuwiki/whatever 
 simple syntax is nicer than html-based markup.

Maybe a tiny number of extensions to Fossil's wiki syntax? Like for
bold, italic and underline. I am not sure what the most common sysntax
for any of those are.

That said, the issue of having Fossil deliver raw wiki text has been
discussed, as well. This would facilitate client side wiki rendering.

Also, several weeks ago, I mentioned that raw delivery can be
simulated by enclosing the entire wiki content with nowiki.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-06-10 Thread Remigiusz Modrzejewski

On May 24, 2011, at 08:08 , Baptiste Daroussin wrote:
 Is there any thought on supporting markdown as a wiki format for fossil?
 [...]
 Markdown is a really simple format that would imho greatly improve the
 embed wiki of fossil.

I'd also like to see markdown in Fossil. I think I'm getting lazy...

Kind regards,
Remigiusz Modrzejewski



___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-05-25 Thread Ron Wilson
2011/5/24 Natacha Porté nata...@instinctive.eu:
 As a fossil user, I would love to have the option to use Markdown in the
 wiki (with the option of dumbing down to forbid inline HTML which might
 be unsafe -- exactly the same option as it exists today).

To me, the benefit of a more conventional wiki syntax wiould be
increased readability, especially for wiki pages. For tickets,
Fossil's wiki syntax is very reasonable and rarely needs more than the
most basic HTML.

In-browser wiki rendering does work. And, using nowiki, the wiki
source can be delivered to the browser. Aside from the fact this would
require additional traffic between Fossil and the browser, this is
roughly equivalent of a plug-in to Fossil.

As for the safety of HTML, the subset that Fossil allows is no less
safe than wiki syntax - errors in Fossil's HTML sanatizing not
withstanding.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-05-24 Thread Natacha Porté
Hello,

on Tuesday 24 May 2011 at 06:08, Baptiste Daroussin wrote:
 For information there is a fast, simple and easy to use library
 (license BSD 2 clauses) that maybe used for that:
 http://fossil.instinctive.eu/libupskirt/home it is easy to bundle if desired.

I thought I would chime in on this point (despite my huge backlog on
this list). I am the author of the above mentioned library, and I would
be very glad to provide any help that I can for bundling/integrating
the library into fossil, if you choose to try it out.

I remember a long while back, it was proposed to allow all kind of
formatting in the wiki by providing an external command to turn said
formatting into HTML, though I don't know how it ended (as I said, my
backlog is huge).

 Markdown is a really simple format that would imho greatly improve the
 embed wiki of fossil.

As a fossil user, I would love to have the option to use Markdown in the
wiki (with the option of dumbing down to forbid inline HTML which might
be unsafe -- exactly the same option as it exists today).


Cheers,
Natacha


pgpxAgeyNbS4g.pgp
Description: PGP signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-05-24 Thread Ambrose Bonnaire-Sergeant
2011/5/24 Natacha Porté nata...@instinctive.eu

 As a fossil user, I would love to have the option to use Markdown in the
 wiki (with the option of dumbing down to forbid inline HTML which might
 be unsafe -- exactly the same option as it exists today).


+1
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-05-24 Thread Lluís Batlle i Rossell
On Wed, May 25, 2011 at 01:43:14AM +0800, Ambrose Bonnaire-Sergeant wrote:
 2011/5/24 Natacha Porté nata...@instinctive.eu
 
  As a fossil user, I would love to have the option to use Markdown in the
  wiki (with the option of dumbing down to forbid inline HTML which might
  be unsafe -- exactly the same option as it exists today).
 
 
 +1

As for me, I don't need it... but in another project I use libupskirt, a C
library for Markdown parsing, that may be of interest to the people here:
http://fossil.instinctive.eu/libupskirt/index

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-05-24 Thread Ambrose Bonnaire-Sergeant
2011/5/24 Natacha Porté nata...@instinctive.eu

 I remember a long while back, it was proposed to allow all kind of
 formatting in the wiki by providing an external command to turn said
 formatting into HTML, though I don't know how it ended (as I said, my
 backlog is huge).


Judging by the below thread, I don't think something like this is likely to
be merged into core.

http://comments.gmane.org/gmane.comp.version-control.fossil-scm.user/1457

Thus this (probably) won't happen without an fork, which is undesirable.

Bummer.

Ambrose
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] Supporting markwon syntax for wiki

2011-05-24 Thread Altu Faltu
Can it be supported in a separate branch which frequently merges changes in 
trunk?

- Original Message -
From: Ambrose Bonnaire-Sergeant
Sent: 05/24/11 11:44 PM
To: fossil-users@lists.fossil-scm.org
Subject: Re: [fossil-users] Supporting markwon syntax for wiki

 2011/5/24 Natacha Porté  nata...@instinctive.eu  I remember a long while 
back, it was proposed to allow all kind of
 formatting in the wiki by providing an external command to turn said
 formatting into HTML, though I don't know how it ended (as I said, my
 backlog is huge).

 Judging by the below thread, I don't think something like this is likely to be 
merged into core.

http://comments.gmane.org/gmane.comp.version-control.fossil-scm.user/1457 

 Thus this (probably) won't happen without an fork, which is undesirable.

 Bummer.

 Ambrose
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users