ragerender 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87b99ec72e739c37527a89acfc8124efb5ed6f293446ee36ae84ffdc072f061b
-  data.tar.gz: cb2735417a459577704a526ff90b4723709101faca6ec4b7d927edf598dfc697
+  metadata.gz: 313e3cd9c0ccd4c11ea547a565e2a1cfa77af1fda5e2fc2219c0da8046c6f27a
+  data.tar.gz: 3911407ca12e719f71396099f73d70c6b19aeee29ccc38f796ef4c45b684d80d
 SHA512:
-  metadata.gz: 45d46421b5e611dbb14debb3e290a89dd50b38586c843d51da42557cf87402fc7a9afe354680e7cd5ca8cc05a33e7c338605fc1e0526190a848c64b5288315c1
-  data.tar.gz: c3f33f3eeb53ad63cfe135acd394a838446dd6270388605fa299f3d303ba6fb3876844b569b0b611b27f2c5d641a4d2256067b29863fdd60a97fffc8bc6074ea
+  metadata.gz: 4ca0ef393683e910b68e9ffe41a5909511ec66da604b50bcb99fbd758cad371bdeafdd594e1a27394e461beb3e0e8f41c4c3033a28f4c7692a492b470251f8b2
+  data.tar.gz: 5509097f24aa3df45416be46acb9d2f31710318b4227b190f9413dcec287d6c473793bff0fd08b3ecf7b1cc49617b9437739fc991d1c9bd2a309fcbd61eef199

data/README.rdoc

@@ -60,10 +60,14 @@ The file name of the image will be the title of your comic page. And that's it,
 you added your first comic!
 
 If you want to add an author note, create a text file in a folder called
-<tt>_comics</tt> that has the same file name, but with a <tt>.md</tt> extension:
+<tt>_comics</tt> that has the same file name, but with a <tt>.txt</tt> extension:
 
   mkdir _comics
-  echo "Check out my cool comic y'all!" > '_comics/My first page.md'
+  echo "Check out my cool comic y'all!" > '_comics/My first page.txt'
+
+Or use HTML:
+
+  echo "This is my <strong>first</strong> page!" > '_comics/My first page.html'
 
 Generate the site using:
 
@@ -101,18 +105,17 @@ Your webcomic now has its basic information set up.
 
 === Adding your layouts
 
-RageRender will use a ComicFury default layout if you don't supply your own
-files.
+If you want to use your own layout code, then create a <tt>_layouts</tt>
+directory and put the contents of each of your ComicFury layout tabs in there,
+and then put your CSS in the main folder.
 
-If you want to keep using the "simple" layout, you can add the details into your
-<tt>_config.yml</tt> too:
+The easiest way is to go to your Webcomic Management, click "Edit Layout", then
+in the box labelled "Useful", click "Download Layout Backup". Pass this file to
+RageRender, which will <tt>unpack</tt> it for you:
 
-  layout:
+    bundle exec jekyll unpack mycomic-2025-09-13.cflxml
 
-If you want to use your own layout code, then create a <tt>_layouts</tt>
-directory and put the contents of each of your ComicFury layout tabs in there,
-and then put your CSS in the main folder. You should end up with a full set of
-files like:
+You should end up with a full set of files like:
 
   _layouts
     archive.html
@@ -130,7 +133,7 @@ instead.
 
 === Adding blogs
 
-Add your blogs into a folder called `_posts`:
+Add your blogs into a folder called <tt>_posts</tt>:
 
   cat _posts/2025-05-29-my-new-comic.md
   Hey guys, welcome to my new comic! It's gonna be so sick!
@@ -197,6 +200,16 @@ You control this by setting a <tt>frontpage</tt> key in your site config.
 - anything else will display the extra page that has the matching
   <tt>slug</tt> in its Front Matter
 
+=== Putting changes on ComicFury
+
+Once you're done making changes, you can <tt>pack</tt> your layout:
+
+    bundle exec jekyll pack
+
+The resulting file can be uploaded to ComicFury by going to your Webcomic
+Management, clicking "Edit Layout", then in the box labelled "Useful", click
+"Restore Layout Backup".
+
 === Stuff that doesn't work
 
 Here is a probably incomplete list of things you can expect to be different

data/lib/ragerender/cflxml.rb

@@ -0,0 +1,105 @@
+require 'pathname'
+require 'rexml'
+require 'base64'
+
+module RageRender
+  HTML_FILES = {
+    overall: 'overall',
+    overview: 'overview',
+    viewblog: 'blog-display',
+    comic: 'comic-page',
+    archive: 'archive',
+    blogarchive: 'blog-archive',
+    error: 'error-page',
+    search: 'search',
+  }
+
+  CSS_FILES = {
+    layoutcss: 'layout'
+  }
+
+  def self.unpack src, html_dest, css_dest
+    doc = REXML::Document.new(src).elements
+    html_dir = Pathname.new(html_dest)
+    css_dir = Pathname.new(css_dest)
+
+    HTML_FILES.each do |(tag, filename)|
+      File.write html_dir.join(filename + '.html'), Base64.decode64(doc["/layout/ldata/#{tag.to_s}/text()"].value)
+    end
+
+    CSS_FILES.each do |(tag, filename)|
+      File.write css_dir.join(filename + '.css'), Base64.decode64(doc["/layout/ldata/#{tag.to_s}/text()"].value)
+    end
+  end
+
+  def self.pack html_srcdir, css_srcdir, dest
+    layout = REXML::Element.new('layout')
+
+    name = REXML::Element.new('name')
+    name.text = "Downloaded ComicFury layout"
+    layout.add name
+
+    version = REXML::Element.new('cfxml')
+    version.text = '1.2'
+    layout.add version
+
+    spage = REXML::Element.new('spage')
+    spage.text = '1'
+    layout.add spage
+
+    ldata = REXML::Element.new('ldata')
+    html_dir = Pathname.new(html_srcdir)
+    css_dir = Pathname.new(css_srcdir)
+
+    HTML_FILES.each do |(tag, filename)|
+      elem = REXML::Element.new tag.to_s
+      elem.text = Base64.strict_encode64 File.read html_dir.join(filename + '.html')
+      ldata.add elem
+    end
+
+    CSS_FILES.each do |(tag, filename)|
+      elem = REXML::Element.new tag.to_s
+      elem.text = Base64.strict_encode64 File.read css_dir.join(filename + '.css')
+      ldata.add elem
+    end
+    layout.add ldata
+
+    # ComicFury will only accept backup files that have:
+    # - A valid XML declaration using double quotes
+    # – A comment as per below
+    # – Tab indentation
+    doc = REXML::Document.new(nil, prologue_quote: :quote)
+    doc.add REXML::XMLDecl.new REXML::XMLDecl::DEFAULT_VERSION, REXML::XMLDecl::DEFAULT_ENCODING
+    doc.add REXML::Comment.new 'This is a ComicFury layout backup, use the import layout function to restore this to a webcomic site. You can access this as follows: Go to your Webcomic Management, click "Edit Layout", then in the Box labelled "Useful", click "Restore Layout Backup"'
+    doc.add layout
+
+    # Pretty print, but *always* make text nodes take up a single line, no
+    # matter how long they are
+    formatter = REXML::Formatters::Pretty.new(1)
+    formatter.compact = true
+    formatter.width = Float::INFINITY
+
+    # Replace the space indentation with tab indentation
+    buf = StringIO.new
+    formatter.write(doc, buf)
+    buf.string.each_line do |line|
+      dest << line.gsub(/^ +/) {|sp| "\t" * sp.size }
+    end
+  end
+end
+
+if __FILE__ == $0
+  case ARGV.shift
+  when 'pack'
+    html_srcdir, css_srcdir, *dest = ARGV
+    RageRender.pack(html_srcdir, css_srcdir, dest.any? ? File.open(dest.first, 'w') : $stdout)
+  when 'unpack'
+    src, html_dest, css_dest = ARGV
+    RageRender.unpack(src == '-' ? $stdin : File.open(src, 'r'), html_dest, css_dest)
+  else
+    raise <<~USAGE
+      Usage: pack html_srcdir css_srcdir dest
+      Usage: unpack src html_dest css_dest
+    USAGE
+  end
+end

data/lib/ragerender/functions.rb

@@ -1,17 +1,25 @@
 require 'cgi'
+require 'json'
 
 # Include this module to get ComicFury intrinsic functions available in
 # templates.
 module RageRender
   module TemplateFunctions
     def js str
-      '"' + CGI.escape_html(str) + '"'
+      JSON.generate(str, script_safe: true, ascii_only: true).gsub(/[<>'&]|\\"/) do |m|
+        '\u' + sprintf('%04x', m.chars.last.ord).upcase
+      end
     end
 
     def randomnumber a, b
       rand a.to_i..b.to_i
     end
 
+    # Unescape all HTML entities in the input
+    def rawhtml str
+      CGI.unescape_html str
+    end
+
     # https://github.com/Shopify/liquid/blob/9bb7fbf123e6e2bd61e00189b1c83159f375d3f3/lib/liquid/standardfilters.rb#L24-L29
     # Used under the MIT License.
     STRIP_HTML_BLOCKS = Regexp.union(

data/lib/ragerender/jekyll/archive.rb

@@ -2,12 +2,13 @@ require 'jekyll/generator'
 require 'jekyll/drops/drop'
 require_relative 'comics'
 require_relative 'pagination'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 # Pass the right variables to archive pages. Note that this doesn't apply to
 # chapter pages because they are not "pages"
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'archive'
+    RageRender::Pipettes.clean_payload payload
     payload.merge! RageRender::ArchiveDrop.new(page).to_liquid
   end
 end
@@ -98,7 +99,7 @@ module RageRender
   # A Drop that provides all of the page variables for the archive pages.
   class ArchiveDrop < Jekyll::Drops::Drop
     private delegate_method_as :data, :fallback_data
-    extend NamedDataDelegator
+    extend Pipettes
 
     def ischapterarchive
       @obj.type == :chapters

data/lib/ragerender/jekyll/blog.rb

@@ -1,20 +1,27 @@
 require 'jekyll/hooks'
 require 'jekyll/drops/document_drop'
 require_relative '../date_formats'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 Jekyll::Hooks.register :posts, :pre_render do |post, payload|
+  RageRender::Pipettes.clean_payload payload
   payload.merge! RageRender::BlogDrop.new(post).to_liquid
 end
 
 module RageRender
   class BlogDrop < Jekyll::Drops::DocumentDrop
     private delegate_method_as :data, :fallback_data
-    extend NamedDataDelegator
+    extend Pipettes
 
-    def_data_delegator :title, :blogtitle
     def_data_delegator :author, :authorname
-    delegate_method_as :content, :blog
+
+    def blogtitle
+      escape @obj.data['title']
+    end
+
+    def blog
+      maybe_escape @obj.content
+    end
 
     def posttime
       comicfury_date @obj.date

data/lib/ragerender/jekyll/blog_archive.rb

@@ -3,11 +3,12 @@ require 'jekyll/drops/drop'
 require 'jekyll/drops/document_drop'
 require_relative '../date_formats'
 require_relative 'pagination'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 # Pass the right variables to blog archive pages.
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'blog-archive'
+    RageRender::Pipettes.clean_payload payload
     payload.merge! RageRender::BlogArchiveDrop.new(page).to_liquid
   end
 end
@@ -90,7 +91,7 @@ module RageRender
   # Data representing a single paginated blog entry, as available from
   # [l:blogs_paginated].
   class PaginatedBlogDrop < Jekyll::Drops::DocumentDrop
-    extend NamedDataDelegator
+    extend Pipettes
 
     def_data_delegator :title, :blogtitle
     def_delegator :@obj, :url, :bloglink

data/lib/ragerender/jekyll/chapter.rb

@@ -1,6 +1,6 @@
 require 'jekyll/generator'
 require 'jekyll/drops/document_drop'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 require_relative 'setup_collection'
 
 # Add default values for the 'unchapter' which is used to hold all comics that
@@ -21,6 +21,7 @@ Jekyll::Hooks.register :site, :after_init do |site|
 end
 
 Jekyll::Hooks.register :chapters, :pre_render do |chapter, payload|
+  RageRender::Pipettes.clean_payload payload
   payload.merge! RageRender::ChapterDrop.new(chapter).to_liquid
   payload.merge! RageRender::ArchiveDrop.new(chapter).to_liquid
 end
@@ -76,15 +77,15 @@ module RageRender
     PAGINATION_FIELDS = %w[ chaptername chapterdescription ]
 
     delegate_method_as :data, :fallback_data
-    extend NamedDataDelegator
+    extend Pipettes
     extend Forwardable
 
-    def_data_delegator :title, :chaptername
     def_data_delegator :description, :chapterdescription
+    def_data_delegator :image, :image
     def_delegator :@obj, :url, :chapterarchiveurl
 
-    def cover
-      cover_obj.url
+    def chaptername
+      escape @obj.data['title']
     end
 
     def cover_width_small
@@ -114,24 +115,15 @@ module RageRender
     end
 
     private
-    def cover_width
-      cover_obj.data['width'] ||= Dimensions.width cover_obj.path
-    end
-
-    def cover_height
-      cover_obj.data['height'] ||= Dimensions.height cover_obj.path
-    end
-
-    def cover_obj
-      @cover_obj ||= @obj.site.static_files.detect {|f| f.relative_path == cover_relative_path }
-    end
-
-    def cover_relative_path
-      Pathname.new('/').join(@obj.data['image']).to_s
-    end
+    def_image_metadata :image
 
     def first_comic
       @obj.site.collections['comics'].docs.select {|c| c.data['chapter'] == @obj.data['slug'] }.first
     end
+
+    public
+    alias cover image_url
+    alias cover_height image_height
+    alias cover_width image_width
   end
 end

data/lib/ragerender/jekyll/comics.rb

@@ -2,9 +2,10 @@ require 'jekyll/generator'
 require 'jekyll/document'
 require 'jekyll/drops/document_drop'
 require_relative '../date_formats'
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 Jekyll::Hooks.register :comics, :pre_render do |page, payload|
+  RageRender::Pipettes.clean_payload payload
   payload.merge! RageRender::ComicDrop.new(page).to_liquid
 end
 
@@ -76,16 +77,20 @@ module RageRender
   end
 
   class ComicDrop < Jekyll::Drops::DocumentDrop
-    extend NamedDataDelegator
+    extend Pipettes
 
     PAGINATION_FIELDS = %w[ comicurl comictitle posttime ]
 
     delegate_method_as :id, :comicid
-    def_data_delegator :title, :comictitle
     def_delegator :@obj, :url, :comicurl
+    def_delegator :@obj, :url, :permalink
     data_delegator 'rating'
     data_delegator 'votecount'
 
+    def comictitle
+      escape @obj.data['title']
+    end
+
     def posttime
       comicfury_date(@obj.date)
     end
@@ -99,11 +104,11 @@ module RageRender
     end
 
     def chaptername
-      chapter.data['title']
+      escape(chapter.data['title']) rescue nil
     end
 
     def chapterlink
-      chapter.url
+      chapter&.url
     end
 
     def dropdown
@@ -118,7 +123,7 @@ module RageRender
           dropdown << {
             'is_selected' => @obj == c,
             'is_disabled' => false,
-            'title' => c.data['title'],
+            'title' => escape(c.data['title']),
             'grouplabel' => c.data['chapter'],
             'newgroup' => new_group,
             'endgroup' => false,
@@ -141,7 +146,7 @@ module RageRender
     def authornotes
       @obj.data['authornotes'] || [{
         'is_reply' => false,
-        'comment' => @obj.content,
+        'comment' => maybe_escape(@obj.content),
         'isguest' => false,
         'avatar' => nil,
         'authorname' => @obj.data['author'],
@@ -152,8 +157,12 @@ module RageRender
     end
 
     def custom
-      @obj.data.fetch('custom', {}).reject do |k, v|
+      chapter_data = chapter.nil? ? {} : chapter.data.fetch('custom', {})
+      comic_data = @obj.data.fetch('custom', {})
+      chapter_data.merge(comic_data).reject do |k, v|
         v.nil? || (v.respond_to?(:empty?) && v.empty?)
+      end.transform_values do |v|
+        v.is_a?(String) ? escape(v) : v
       end
     end
 
@@ -173,18 +182,6 @@ module RageRender
       @obj.next_doc&.url
     end
 
-    def comicimageurl
-      File.join (@obj.site.baseurl || ''), image_relative_path
-    end
-
-    def comicwidth
-      image_obj.data['width'] ||= Dimensions.width image_path
-    end
-
-    def comicheight
-      image_obj.data['height'] ||= Dimensions.height image_path
-    end
-
     # An HTML tag to print for the comic image. If there is a future image, then
     # this is also a link to the next comic page.
     def comicimage
@@ -215,16 +212,12 @@ module RageRender
       @obj.site.collections['chapters'].docs.detect {|c| c.data['slug'] == @obj.data['chapter'] }
     end
 
-    def image_obj
-      @image_obj ||= @obj.site.static_files.detect {|f| f.relative_path == image_relative_path }
-    end
-
-    def image_path
-      image_obj.path
-    end
+    data_delegator 'image'
+    def_image_metadata :image
 
-    def image_relative_path
-      Pathname.new('/').join(@obj.data['image']).to_s
-    end
+    public
+    alias comicimageurl image_url
+    alias comicwidth image_width
+    alias comicheight image_height
   end
 end

data/lib/ragerender/jekyll/error.rb

@@ -1,7 +1,8 @@
-require_relative 'named_data_delegator'
+require_relative 'pipettes'
 
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'error-page'
+    RageRender::Pipettes.clean_payload payload
     payload.merge! RageRender::ErrorDrop.new(page).to_liquid
   end
 end
@@ -9,7 +10,7 @@ end
 module RageRender
   class ErrorDrop < Jekyll::Drops::Drop
     private delegate_method_as :data, :fallback_data
-    extend NamedDataDelegator
+    extend Pipettes
     extend Forwardable
 
     def_data_delegator :title, :errortitle

data/lib/ragerender/jekyll/overview.rb

@@ -6,6 +6,7 @@ require_relative 'blog_archive'
 # Pass the right variables to overview pages.
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'overview'
+    RageRender::Pipettes.clean_payload payload
     payload.merge! RageRender::ComicDrop.new(page.site.collections['comics'].docs.last).to_liquid
     payload.merge! RageRender::OverviewDrop.new(page).to_liquid
   end

data/lib/ragerender/jekyll/pipettes.rb

@@ -0,0 +1,61 @@
+# Pipettes help you make drops.
+require 'cgi'
+require 'dimensions'
+
+module RageRender
+  module Pipettes
+    def self.clean_payload payload
+      Jekyll.logger.debug("Cleaning payload")
+      sets = Jekyll::Drops::DocumentDrop.subclasses.map(&:invokable_methods)
+      methods = sets.reduce(Set.new) {|s,acc| acc.merge(s)} - Set.new(Jekyll::Drops::DocumentDrop.invokable_methods)
+      payload.send(:fallback_data).delete_if {|k| methods.include? k}
+    end
+
+    def def_data_delegator key, aliaz
+      define_method(aliaz.to_sym) do
+        @obj.data[key.to_s]
+      end
+    end
+
+    def self.extended mod
+      mod.define_method(:escape) do |str|
+        str.nil? ? nil : CGI.escapeHTML(str)
+      end
+      mod.send(:private, :escape)
+
+      mod.define_method(:maybe_escape) do |str|
+        Pathname.new(@obj.path).extname != '.html' ?  escape(str) : str
+      end
+      mod.send(:private, :maybe_escape)
+    end
+
+    def def_image_metadata prefix
+      define_method(:"#{prefix}_relative_path") do
+        Pathname.new('/').join(send(prefix.to_sym)).to_path
+      end
+
+      define_method(:"#{prefix}_url") do
+        File.join (@obj.site.baseurl || ''), send(:"#{prefix}_relative_path")
+      end
+
+      define_method(:"#{prefix}_obj") do
+        unless instance_variable_defined? :"@#{prefix}_obj"
+          instance_variable_set(:"@#{prefix}_obj", @obj.site.static_files.detect {|f| f.relative_path == send(:"#{prefix}_relative_path") })
+        end
+        instance_variable_get(:"@#{prefix}_obj")
+      end
+
+      define_method(:"#{prefix}_path") do
+        send(:"#{prefix}_obj").path
+      end
+
+      define_method(:"#{prefix}_width") do
+        send(:"#{prefix}_obj").data['width'] ||= Dimensions.width(send(:"#{prefix}_path")) rescue nil
+      end
+
+      define_method(:"#{prefix}_height") do
+        send(:"#{prefix}_obj").data['height'] ||= Dimensions.height(send(:"#{prefix}_path")) rescue nil
+      end
+    end
+  end
+end

data/lib/ragerender/jekyll/search.rb

@@ -1,5 +1,6 @@
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
   if page.data['layout'] == 'search'
+    RageRender::Pipettes.clean_payload payload
     payload.merge! RageRender::SearchDrop.new(page).to_liquid
   end
 end

data/lib/ragerender/jekyll.rb

@@ -1,11 +1,11 @@
 require 'etc'
 require 'stringio'
 require 'jekyll'
-require 'dimensions'
 require_relative 'language'
 require_relative 'functions'
 require_relative 'to_liquid'
 require_relative 'date_formats'
+require_relative 'cflxml'
 require_relative 'jekyll/archive'
 require_relative 'jekyll/blog'
 require_relative 'jekyll/blog_archive'
@@ -14,9 +14,42 @@ require_relative 'jekyll/chapter'
 require_relative 'jekyll/overview'
 require_relative 'jekyll/error'
 require_relative 'jekyll/search'
-require_relative 'jekyll/named_data_delegator'
+require_relative 'jekyll/pipettes'
 require_relative 'jekyll/setup_collection'
 
+module RageRender
+  class CFLXMLCommands < Jekyll::Command
+    class << self
+      def init_with_program(jekyll)
+        jekyll.command :pack do |pack|
+          pack.syntax 'pack'
+          pack.description 'Create a ComicFury layout backup from this site'
+          pack.action do |args, options|
+            config = configuration_from_options(options)
+            filename = "#{(config['title'] || File.basename(config['source']))} #{Time.now.to_s}.cflxml"
+            puts "Outputting backup file #{filename}"
+            File.open(filename, 'w') do |file|
+              RageRender.pack config['layouts_dir'], config['source'], file
+            end
+          end
+        end
+
+        jekyll.command :unpack do |unpack|
+          unpack.syntax 'unpack <file>'
+          unpack.description 'Overwrite HTML and CSS from a ComicFury layout backup'
+          unpack.action do |args, options|
+            raise ArgumentError, 'unpack requires one cflxml file' unless args.one?
+            config = configuration_from_options(options)
+            File.open(args.first, 'r') do |file|
+              RageRender.unpack file, config['layouts_dir'], config['source']
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
 Jekyll::Hooks.register :site, :after_init do |site|
   # This is obviously quite naughty for many reasons,
   # but it's the only way to get the theme selected
@@ -84,24 +117,31 @@ Jekyll::Hooks.register :documents, :pre_render do |doc, payload|
 end
 
 Jekyll::Hooks.register :pages, :pre_render do |page, payload|
+  RageRender::Pipettes.clean_payload payload
   payload.merge! RageRender::WebcomicDrop.new(page).to_liquid
 end
 
 class RageRender::WebcomicDrop < Jekyll::Drops::Drop
   extend Forwardable
-  extend RageRender::NamedDataDelegator
+  extend RageRender::Pipettes
 
   def self.def_config_delegator source, target
     define_method(target) { @obj.site.config[source.to_s] }
   end
 
-  def_config_delegator :title, :webcomicname
-  def_config_delegator :description, :webcomicslogan
   def_config_delegator :search, :searchon
   %w{bannerads allowratings showpermalinks showcomments allowcomments}.each do |var|
     def_config_delegator var, var
   end
 
+  def webcomicname
+    escape @obj.site.config['title']
+  end
+
+  def webcomicslogan
+    escape @obj.site.config['description']
+  end
+
   def webcomicurl
     @obj.site.baseurl
   end
@@ -111,7 +151,7 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
   end
 
   def copyrights
-    @obj.site.config['copyrights'].gsub('[year]', Date.today.year.to_s)
+    escape @obj.site.config['copyrights'].gsub('[year]', Date.today.year.to_s)
   end
 
   def banner
@@ -122,6 +162,11 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
     Pathname.new(@obj.site.baseurl || '/').join(@obj.site.config['webcomicavatar'] || '').to_path
   end
 
+  def webcomicicon
+    @obj.site.config.fetch('webcomicavatar', '')
+  end
+  def_image_metadata :webcomicicon
+
   def hasblogs
     @obj.site.posts.docs.any?
   end
@@ -132,7 +177,7 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
 
   def extrapages
     @obj.site.pages.reject {|page| page.data['hidden'] }.map do |page|
-      {'link' => page.url, 'title' => page.data['title']}
+      {'link' => page.url, 'title' => escape(page.data['title'])}
     end
   end
 
@@ -150,8 +195,17 @@ class RageRender::WebcomicDrop < Jekyll::Drops::Drop
     css_files.map {|f| File.read f }.join
   end
 
-  delegate_method_as :url, :permalink
-  def_data_delegator :title, :pagetitle
+  def layoutcss
+    <<~HTML
+    <style type="text/css">
+      #{css}
+    </style>
+    HTML
+  end
+
+  def pagetitle
+    escape @obj.data['title']
+  end
 
   def iscomicpage
     @obj.type == :comics

data/lib/ragerender/language.rb

@@ -45,13 +45,13 @@ module RageRender
       /!?/.r.map {|c| c == '!' },
       PATH.map {|p| Variable.new(p) },
       optional(OPERATOR),
-      optional(VARIABLE | TEXT))
+      optional(VARIABLE | /[^\]]+/.r))
     ).map {|(reversed, lhs, operator, rhs)| Conditional.new reversed, lhs, operator, rhs }
 
     # FUNCTION with no arguments: 'f:cowsay' => Function.new("cowsay", [])
     # FUNCTION with a variable argument: 'f:js|v:foo' => Function.new('js', [Variable.new(['foo'])])
     # FUNCTION with literal arguments: 'f:add|2|3' => Function.new('add', ['2', '3'])
-    FUNCTION = ('f:'.r >> seq(IDENT, ('|'.r >> (VARIABLE | TEXT)).star)).map {|(name, params)| Function.new name, params }
+    FUNCTION = ('f:'.r >> seq(IDENT, ('|'.r >> (VARIABLE | /[^\]\|]+/.r)).star)).map {|(name, params)| Function.new name, params }
 
     # TAG matches variable tags: '[v:value]' => Variable.new(["value"])
     # TAG matches loop tags: '[l:loop]' => Loop.new(["loop"])

data/lib/ragerender/to_erb.rb

@@ -20,7 +20,7 @@ module RageRender
         elsif chunk.path == ['l', 'iteration']
           '<%= index %>'
         else
-          "<%= #{chunk.path.join('.')}.to_s.gsub(/'/, '&#039;').gsub(/\"/, '&quot;') rescue nil %>"
+          "<%= #{chunk.path.join('.')} rescue nil %>"
         end
 
       when Language::Conditional
@@ -70,23 +70,13 @@ module RageRender
           when /^[0-9]+$/
             param
           else
-            "\"#{param}\""
+            "\"#{param.gsub(/['"]/) {|c| "\\" + c}}\""
           end
         end
 
         if ERB_OPERATORS.include? chunk.name
           "<%= #{params.join(ERB_OPERATORS[chunk.name])} %>"
-        elsif chunk.name == 'rawhtml'
-          "<%= #{params.first} %>"
         else
-          params = params.zip(chunk.params).map do |param, old_param|
-            case old_param
-            when Language::Variable
-              param + ".to_s.gsub(/'/, '&#039;').gsub(/\"/, '&quot;')"
-            else
-              param
-            end
-          end
           "<%= #{chunk.name}(#{params.join(', ')}) %>"
         end
 

data/lib/ragerender/to_liquid.rb

@@ -1,3 +1,4 @@
+require 'digest'
 require_relative 'language'
 
 module RageRender
@@ -6,37 +7,20 @@ module RageRender
     'subtract' => proc {|f| [Language::Function.new('minus', f.params)] },
     'multiply' => proc {|f| [Language::Function.new('times', f.params)] },
     'divide' => proc {|f| [Language::Function.new('divided_by', f.params)] },
-    'removehtmltags' => proc {|f| QUOTE_ESCAPER.call(Language::Function.new('strip_html', f.params)) },
-    'rawhtml' => proc {|f| f.params }
+    'removehtmltags' => proc {|f| Language::Function.new('strip_html', f.params) },
   }
 
-  QUOTE_REPLACEMENTS = {
-    '"' => '"',
-    "'" => ''',
-  }
-
-  REPLACE_QUOTES = ["replace: '\"', '"'", "replace: \"'\", '''"].join(' | ')
-
-  QUOTE_ESCAPER = proc do |f|
-    output = []
-    params = f.params.each_with_index do |param, index|
-      case param
-      when Language::Variable
-        new_name = param.path.join('_')
-        output << "{% assign #{new_name} = #{render_value(param)} | #{REPLACE_QUOTES} %}"
-        Language::Variable.new([new_name])
-      else
-        param
-      end
-    end
-    output << Language::Function.new(f.name, params)
-    output
-  end
-
-  def self.render_value value
+  def self.render_value value, literals
     case value
     when String
-      value =~ /^[0-9]+$/ ? value : "\"#{value}\""
+      case value
+      when /^[0-9]+$/
+        value
+      when /"'/
+        literals[value]
+      else
+        "\"#{value}\""
+      end
     when Language::Variable
       if value.path.first == 'l' && value.path.last == 'iteration'
         'forloop.index0'
@@ -46,7 +30,7 @@ module RageRender
         value.path.join('.')
       end
     when Language::Function
-      params = value.params.map {|p| render_value p }
+      params = value.params.map {|p| render_value p, literals }
       args = params.drop(1).map {|p| "#{value.name}: #{p}" }.join(' | ')
       [params.first, args.empty? ? value.name : args].join(' | ')
     when nil
@@ -56,20 +40,21 @@ module RageRender
 
   def self.to_liquid document
     tag_stack = Array.new
+    literals = Hash.new {|cache, l| cache[l] = "str" + Digest::MD5.hexdigest(l)}
 
-    document.map do |chunk|
+    chunks = document.map do |chunk|
       case chunk
       when String
         chunk
 
       when Language::Variable
-        "{{ #{render_value chunk} | #{REPLACE_QUOTES} }}"
+        "{{ #{render_value chunk, literals} }}"
 
       when Language::Conditional
         tag_stack << (chunk.reversed ? :endunless : :endif)
 
-        lhs = render_value chunk.lhs
-        rhs = render_value chunk.rhs
+        lhs = render_value chunk.lhs, literals
+        rhs = render_value chunk.rhs, literals
         operator = chunk.operator
 
         if chunk.lhs.is_a?(Language::Variable) && chunk.lhs.path.first == "l"
@@ -105,8 +90,8 @@ module RageRender
         output.join
 
       when Language::Function
-        *output, func = LIQUID_FUNCTIONS.fetch(chunk.name, QUOTE_ESCAPER).call(chunk)
-        output << "{{ #{render_value(func)} }}"
+        *output, func = LIQUID_FUNCTIONS.fetch(chunk.name, proc{|f| f}).call(chunk)
+        output << "{{ #{render_value(func, literals)} }}"
         output.join
 
       when Language::Loop
@@ -124,6 +109,10 @@ module RageRender
         end
       end
     end
+
+    literals.map do |(value, name)|
+      "{% capture #{name} %}#{value}{% endcapture %}"
+    end + chunks
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ragerender
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Simon Worthington
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-07-20 00:00:00.000000000 Z
+date: 2025-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsec
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -138,10 +152,14 @@ description: |-
   you added your first comic!
 
   If you want to add an author note, create a text file in a folder called
-  <tt>_comics</tt> that has the same file name, but with a <tt>.md</tt> extension:
+  <tt>_comics</tt> that has the same file name, but with a <tt>.txt</tt> extension:
 
     mkdir _comics
-    echo "Check out my cool comic y'all!" > '_comics/My first page.md'
+    echo "Check out my cool comic y'all!" > '_comics/My first page.txt'
+
+  Or use HTML:
+
+    echo "This is my <strong>first</strong> page!" > '_comics/My first page.html'
 
   Generate the site using:
 
@@ -181,8 +199,15 @@ description: |-
 
   If you want to use your own layout code, then create a <tt>_layouts</tt>
   directory and put the contents of each of your ComicFury layout tabs in there,
-  and then put your CSS in the main folder. You should end up with a full set of
-  files like:
+  and then put your CSS in the main folder.
+
+  The easiest way is to go to your Webcomic Management, click "Edit Layout", then
+  in the box labelled "Useful", click "Download Layout Backup". Pass this file to
+  RageRender, which will <tt>unpack</tt> it for you:
+
+      bundle exec jekyll unpack mycomic-2025-09-13.cflxml
+
+  You should end up with a full set of files like:
 
     _layouts
       archive.html
@@ -200,7 +225,7 @@ description: |-
 
   === Adding blogs
 
-  Add your blogs into a folder called `_posts`:
+  Add your blogs into a folder called <tt>_posts</tt>:
 
     cat _posts/2025-05-29-my-new-comic.md
     Hey guys, welcome to my new comic! It's gonna be so sick!
@@ -267,6 +292,16 @@ description: |-
   - anything else will display the extra page that has the matching
     <tt>slug</tt> in its Front Matter
 
+  === Putting changes on ComicFury
+
+  Once you're done making changes, you can <tt>pack</tt> your layout:
+
+      bundle exec jekyll pack
+
+  The resulting file can be uploaded to ComicFury by going to your Webcomic
+  Management, clicking "Edit Layout", then in the box labelled "Useful", click
+  "Restore Layout Backup".
+
   === Stuff that doesn't work
 
   Here is a probably incomplete list of things you can expect to be different
@@ -318,6 +353,7 @@ files:
 - assets/overview.html
 - assets/search.html
 - lib/ragerender.rb
+- lib/ragerender/cflxml.rb
 - lib/ragerender/date_formats.rb
 - lib/ragerender/functions.rb
 - lib/ragerender/jekyll.rb
@@ -327,9 +363,9 @@ files:
 - lib/ragerender/jekyll/chapter.rb
 - lib/ragerender/jekyll/comics.rb
 - lib/ragerender/jekyll/error.rb
-- lib/ragerender/jekyll/named_data_delegator.rb
 - lib/ragerender/jekyll/overview.rb
 - lib/ragerender/jekyll/pagination.rb
+- lib/ragerender/jekyll/pipettes.rb
 - lib/ragerender/jekyll/search.rb
 - lib/ragerender/jekyll/setup_collection.rb
 - lib/ragerender/language.rb

data/lib/ragerender/jekyll/named_data_delegator.rb

@@ -1,9 +0,0 @@
-module RageRender
-  module NamedDataDelegator
-    def def_data_delegator key, aliaz
-      define_method(aliaz.to_sym) do
-        @obj.data[key.to_s]
-      end
-    end
-  end
-end