Changeset 15351 in project


Ignore:
Timestamp:
08/07/09 14:04:06 (10 years ago)
Author:
sjamaan
Message:

Move the SXML rules into their own file, and update them to make complete and correct HTML pages (assuming a complete SXML ruleset for the output of wiki-parse)

Location:
release/4/qwiki/trunk
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • release/4/qwiki/trunk/qwiki.meta

    r15329 r15351  
    11((synopsis "qwiki - the quick wiki")
    2  (needs wiki-parse intarweb uri-common spiffy sxml-transforms)
     2 (needs wiki-parse intarweb uri-common spiffy (doctype 1.2) sxml-transforms)
    33 (author "Peter Bex")
    44 (category www)
  • release/4/qwiki/trunk/qwiki.scm

    r15329 r15351  
    22;; qwiki - the quick wiki
    33;;
    4 ;; Copyright 2009 Peter Bex
     4;; Copyright (c) 2009 Peter Bex
    55;;
    66;;  Redistribution and use in source and binary forms, with or without
     
    4141(import chicken scheme)
    4242(use extras files ports posix data-structures srfi-1 srfi-13
    43      wiki-parse intarweb uri-common spiffy sxml-transforms svn-client)
     43     intarweb uri-common spiffy sxml-transforms svn-client
     44     wiki-parse qwiki-sxml)
    4445
    4546;; HTML files are stored here, relative to the current Spiffy docroot
     
    5960
    6061;; TODO: Make this use some kind of wiki-html-transformations, which
    61 ;; should end up in their own egg for reusability
    62 (define qwiki-transformation-rules (make-parameter universal-conversion-rules))
     62;; should end up in their own egg or module for reusability
     63(define qwiki-transformation-rules
     64  (make-parameter qwiki-basic-transformation-rules))
    6365
    6466;; Return the trailing part of the path relative to the docroot/base-uri
     
    99101                       '()))
    100102         (source (or (alist-ref 'source postdata)
    101                      (with-input-from-file source-file read-string)))
     103                     (and (file-exists? source-file) ;; XXX what if it's a dir?
     104                          (with-input-from-file source-file read-string))
     105                     ""))
    102106         ;; TODO: Clean this up, maybe put it in a transformation rule so
    103107         ;; it can be extended by plugins.  The names of the buttons are
    104108         ;; pretty much tied to the code though
    105          (content `(page
     109         (content `(wiki-page
    106110                    ,(if (alist-ref 'preview postdata)
    107111                         `(div (@ (class "preview"))
     
    164168    (with-output-to-path html-file
    165169      (lambda ()
    166         (let ((content `(page
     170        (let ((content `(wiki-page
    167171                         ,(call-with-input-file source-file wiki-parse))))
    168172          (SRV:send-reply
  • release/4/qwiki/trunk/qwiki.setup

    r15329 r15351  
    22(compile -s -O2 qwiki.import.scm)
    33
     4(compile -s -O2 qwiki-sxml.scm -j qwiki)
     5(compile -s -O2 qwiki-sxml.import.scm)
     6
    47(install-extension
    58  'qwiki
    6   '("qwiki.so" "qwiki.import.so")
     9  '("qwiki.so" "qwiki.import.so" "qwiki-sxml.so" "qwiki-sxml.import.so")
    710  `((version 0.1)
    811    (documentation "qwiki.html")))
Note: See TracChangeset for help on using the changeset viewer.