aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorGravatar Étienne Deparis 2020-11-12 17:03:12 +0100
committerGravatar Étienne Deparis 2020-11-12 17:03:12 +0100
commitf8f299e6e9dd8d9c822d14f1c666efbd92aa151c (patch)
tree9c2a8c25b56ac62b774654bd9aa2451c92ad1a74
parent9c253d5fea1774ea4186d3fc34104097b7a371b0 (diff)
parent6562da1cff27ea6c73a09315ffdd9c25d7b1b7ec (diff)
downloadfronde-0.3.0.tar.gz
fronde-0.3.0.tar.xz
fronde-0.3.0.zip
chore: Merge branch 'v0.3.0-dev'v0.3.0
-rw-r--r--.gitignore3
-rw-r--r--.pryrc2
-rw-r--r--.rubocop.yml6
-rw-r--r--.yardopts1
-rw-r--r--CONFIG.org91
-rw-r--r--DOCUMENTATION.org660
-rw-r--r--Firma_Pablo_Neruda.pngbin39783 -> 0 bytes
-rw-r--r--README.org34
-rw-r--r--Rakefile16
-rwxr-xr-xbin/fronde45
-rwxr-xr-xbin/pablo193
-rw-r--r--fronde.gemspec (renamed from neruda.gemspec)50
-rw-r--r--lib/fronde/cli.rb60
-rw-r--r--lib/fronde/cli/commands.rb115
-rw-r--r--lib/fronde/config.rb (renamed from lib/neruda/config.rb)14
-rw-r--r--lib/fronde/config/lisp_config.rb (renamed from lib/neruda/config/lisp_config.rb)49
-rw-r--r--lib/fronde/config/org-config.el (renamed from lib/neruda/config/org-config.el)12
-rw-r--r--lib/fronde/config/ox-fronde.el (renamed from lib/neruda/config/ox-neruda.el)40
-rw-r--r--lib/fronde/emacs.rb (renamed from lib/neruda/emacs.rb)8
-rw-r--r--lib/fronde/index.rb (renamed from lib/neruda/index.rb)24
-rw-r--r--lib/fronde/index/atom_generator.rb (renamed from lib/neruda/index/atom_generator.rb)22
-rw-r--r--lib/fronde/index/org_generator.rb (renamed from lib/neruda/index/org_generator.rb)22
-rw-r--r--lib/fronde/org_file.rb (renamed from lib/neruda/org_file.rb)62
-rw-r--r--lib/fronde/org_file/class_methods.rb (renamed from lib/neruda/org_file/class_methods.rb)12
-rw-r--r--lib/fronde/org_file/extracter.rb (renamed from lib/neruda/org_file/extracter.rb)10
-rw-r--r--lib/fronde/org_file/htmlizer.rb (renamed from lib/neruda/org_file/htmlizer.rb)18
-rw-r--r--lib/fronde/preview.rb (renamed from lib/neruda/preview.rb)14
-rw-r--r--lib/fronde/templater.rb (renamed from lib/neruda/templater.rb)16
-rw-r--r--lib/fronde/utils.rb (renamed from lib/neruda/utils.rb)68
-rw-r--r--lib/fronde/version.rb6
-rw-r--r--lib/neruda/version.rb6
-rw-r--r--lib/tasks/org.rake55
-rw-r--r--lib/tasks/site.rake34
-rw-r--r--lib/tasks/sync.rake12
-rw-r--r--lib/tasks/tags.rake6
-rw-r--r--locales/en.yml43
-rw-r--r--locales/fr.yml43
-rw-r--r--spec/data/index_proof.html8
-rw-r--r--spec/data/org-config-blog-proof.el20
-rw-r--r--spec/data/org-config-proof.el20
-rw-r--r--spec/fronde/config_spec.rb (renamed from spec/neruda/config_spec.rb)34
-rw-r--r--spec/fronde/index_spec.rb (renamed from spec/neruda/index_spec.rb)34
-rw-r--r--spec/fronde/org_file_spec.rb (renamed from spec/neruda/org_file_spec.rb)18
-rw-r--r--spec/fronde/templater_spec.rb (renamed from spec/neruda/templater_spec.rb)48
-rw-r--r--spec/fronde/utils_spec.rb (renamed from spec/neruda/utils_spec.rb)21
-rw-r--r--spec/rake_org_spec.rb46
-rw-r--r--spec/rake_preview_spec.rb20
-rw-r--r--spec/rake_site_spec.rb24
-rw-r--r--spec/requirements.rb19
-rw-r--r--tigre.pngbin0 -> 62424 bytes
-rw-r--r--tigre.svg127
51 files changed, 1531 insertions, 780 deletions
diff --git a/.gitignore b/.gitignore
index f32a0ac..8a84424 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
.byebug_history
-.ignore
.ruby-*
-neruda-*.gem
+fronde-*.gem
doc
coverage
.yardoc
diff --git a/.pryrc b/.pryrc
index 5e6ca11..396b47d 100644
--- a/.pryrc
+++ b/.pryrc
@@ -4,4 +4,4 @@ require 'byebug'
$LOAD_PATH.unshift('./lib')
# The following requires other components automatically
-require 'neruda/org_file'
+require 'fronde/org_file'
diff --git a/.rubocop.yml b/.rubocop.yml
index d7097a3..212f95a 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -29,7 +29,7 @@ Metrics/BlockLength:
Exclude:
- spec/**/*
- lib/tasks/*
- - neruda.gemspec
+ - fronde.gemspec
Metrics/MethodLength:
Max: 15
@@ -37,8 +37,8 @@ Metrics/MethodLength:
Metrics/ModuleLength:
Max: 120
Exclude:
- - lib/neruda/config/lisp_config.rb
- - lib/neruda/utils.rb
+ - lib/fronde/config/lisp_config.rb
+ - lib/fronde/utils.rb
Metrics/PerceivedComplexity:
Max: 10
diff --git a/.yardopts b/.yardopts
new file mode 100644
index 0000000..0ad64e6
--- /dev/null
+++ b/.yardopts
@@ -0,0 +1 @@
+--private -m org --files DOCUMENTATION.org --asset tigre.png
diff --git a/CONFIG.org b/CONFIG.org
deleted file mode 100644
index 32f37cb..0000000
--- a/CONFIG.org
+++ /dev/null
@@ -1,91 +0,0 @@
-#+title: Neruda config.yml file
-#+author: Étienne Deparis
-#+lang: en
-#+description: Glossary of all possible configuration options for Neruda
-#+options: ^:{}
-
-This file explain all possible configuration options for Neruda, which
-may be put in file named ~config.yml~ at the root of your static website
-project. The options are listed in alphabetical order. However, they can
-be put in any order in the ~config.yml~ file.
-
-* ~author~
-
-The ~author~ option stores the default author name of your org
-files. This value is used when you create a new file. *It is not used by
-the regular Org mode publishing process*. You must be sure that your org
-files contains an ~#+author:~ metadata field before publishing them.
-
-This value is used in the generation of the blog index page and the main
-atom feed.
-
-* ~domain~
-
-The domain name pointing to where your static website is expected to be
-hosted. This value is used to generate absolute path to your files on
-your expected host name (for example in the Atom feeds). Its value is
-expected to *not* end by a slash. That is to say ~https://example.com~
-is a *valid* value, while ~https://example.com/~ is not. Its default
-value is an empty string.
-
-By default, your static website is expected to be hosted at the root of
-your domain name (like ~https://example.com/index.html~). If it is not
-the case and your neruda static website is hosted in a sub directory of
-your main website, you must add this sub folder to the ~domain~
-value. Thus, ~https://example.com/example~ or
-~https://example.com/complex/example~ are *valid* values too, while
-~https://example.com/example/~ or ~https://example.com/complex/example/~
-are not.
-
-* ~lang~
-
-The main locale your website will be written in. Its value must comply
-with the [[https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes][ISO 639-1]] standard.
-
-* ~public_folder~
-
-The ~public_folder~ option stores the path to the folder, which will
-contains the generated files, ready for publication. It's default value
-is ~public_html~ (at the root of your project).
-
-* ~remote~
-
-The ~remote~ option contains an /rsync/ like destination string, which
-will be used to published your website when using the ~sync:push~ /rake/
-task. For exemple ~user@domain:/var/www/mywebsite/~
-
-* ~title~
-
-The ~title~ option stores the default title of your org files. This value
-is used when you create a new file. *It is not used by the regular org
-mode publishing process*. You must be sure that your org files contains
-an ~#+title:~ metadata field before publishing them.
-
-This value is used in the generation of the blog index page and the main
-atom feed.
-
-* ~sources~
-
-The ~sources~ option stores an array of all source folders, where your
-org files to be published are. This allow you to gather various
-different places (even at some absolute path in your computer) in your
-website.
-
-Each source listed in that array is an object, which must use the
-following keys:
-
-- path :: [string] path to the folder containing the file to exports
-- name :: [string, optional] key used to generate the Org project name.
- Defaults to the last dirname of the path value.
-- recursive :: [boolean, optional] wether the path should be exported
- recursively. Defaults to True
-- exclude :: [string, optional] Regexp of files to not export for this
- projects. Default to nothing (no files to exclude).
-- target :: [string, optional] Path where to put the exported files,
- relative to the ~public_folder~ folder. Default to the project name at
- the root of the ~public_folder~ folder.
-- is_blog :: [boolean, optional] Whether this project should be
- considered as a blog and thus, serves as source to generate blog
- index, tags indexes and atom feeds.
-- theme :: [string, optional] Theme name to use for this
- project. Defaults to “default”.
diff --git a/DOCUMENTATION.org b/DOCUMENTATION.org
new file mode 100644
index 0000000..ca2dd90
--- /dev/null
+++ b/DOCUMENTATION.org
@@ -0,0 +1,660 @@
+#+title: Fronde Documentation
+#+author: Étienne Deparis
+#+lang: en
+#+description: Glossary of all possible configuration options for Fronde
+#+options: ^:{} toc:3 num:3 H:4
+
+* Introduction
+
+** Summary
+
+*Fronde* is a static website generator for [[https://orgmode.org][Org]], written in Ruby and
+Emacs Lisp (elisp). It lets you contentrate about your writings, and
+manage all the needed steps to build and publish your Website.
+
+You can refer to the [[./README.org][read me file]] for a quick list of the main features.
+
+** Nomenclature
+
+This project name is fronde and will always be written normally though
+this document to refer to this project as a whole. As such, it will also
+be capitalized when used as the first word of a sentence. But when it is
+written as ~fronde~, it will always refer to the provided program you
+can call in your terminal.
+
+This document uses the short name Emacs to always refer to the [[https://www.gnu.org/software/emacs/][GNU Emacs]]
+editor or capabilities.
+
+** Frequently Asked Questions
+*** Why do you think we need another static website generator?
+
+The most known of them lacks of (good) support for Org as source
+format. The second main reason I wrote this, instead of dealing with a
+pure Org publish config was my need to easily amend the generated
+HTML. I’m not an elisp expert and I would like to have some generic
+solution for all the tiny website I’m maintaining. To be short, the main
+feature of this project is surely its [[#templates_setting][templates support]].
+
+*** Where does this name come from?
+
+A /fronde/ is the french word for a [[https://en.wikipedia.org/wiki/Sling_(weapon)][sling]]. This name was chosen as a
+tribute to the french newspaper « La Fronde », created by [[https://en.wikipedia.org/wiki/Marguerite_Durand][Marguerite
+Durand]] in France in 1897. This was the first all-women written and
+edited newspaper in the world. Marguerite Durand said about it in one of
+her editorial[fn:durand1902] that her newspaper was « comme les autres
+journaux… pas plus amusant » (what may be translated by “just like other
+newspapers… as boring”).
+
+[fn:durand1902] Marguerite Durand. « En cinq ans ». La Fronde,
+n^{o} 1832. 15th December 1902.
+https://gallica.bnf.fr/ark:/12148/bpt6k67059454.item
+
+
+As such, fronde is like all other static website generator… as
+boring. However, like its illustrious reference, fronde wishes to help
+empowering people, offering them a tool to express themselves on the
+Web.
+
+*** Opinionated you say?
+
+Fronde is built with some strong opinion about what should be a static
+website generator, and more specifically, what should it be for Org.
+
+- Org is a powerfull tool, which allows you to publish your writings in
+ a wide range of format. Its markup is easy to learn and as readable
+ and as convenient as Markdown. That's why fronde will never support
+ any other markup language.
+- However Org HTML export should be more easily expandable. That’s why
+ fronde gives you the [[#templates_setting][templates feature]] and introduces [[#formatting_tags][new formatting
+ tags]] for the preamble and postamble sections.
+- Org writers should already be Emacs users, that’s why fronde will
+ directly call Emacs to convert your Org files to html. There is no
+ need to use Pandoc or org-ruby if you already have Emacs.
+- You may want to author a wide variety of things, and manage all these
+ projects inside your Emacs configuration may be a nightmare. You also
+ may want to apply different settings for different projects. That’s
+ why fronde is totally independent from your Emacs settings and let’s
+ you organize your projects as you wish.
+
+*** What will come next?
+
+We are already aware of some limitations we would like to leverage.
+
+**** TODO Allow theme to provide configuration options
+Themes should be able to declare a set of default ~templates~ or
+specific Org export options
+
+**** TODO Improve this documentation
+**** TODO Create a theme portfolio
+**** TODO Better protect upgrade
+
+For example, Rakefile should only be overwritten after upgrade of the
+gem.
+
+** Source code
+
+You can access the source code at: https://git.umaneti.net/fronde
+
+* Getting started
+
+** Installation
+
+Fronde is a [[https://rubygems.org/][Ruby gem]] and thus you need a working Ruby environment to use
+it. Fronde requires at least ruby 2.6 to work.
+
+You may already have Ruby installed on your computer. You can check
+inside a terminal emulator by typing: ~ruby -v~. You also need the
+rubygems package manager, which may also be already installed on your
+system. You can check it too with the following command: ~gem -v~.
+
+*** Install ruby with your system package manager
+
+See the [[https://www.ruby-lang.org/en/downloads/][official ruby lang website]] to know more about options to install
+a ruby environment on your system.
+
+Some operating systems already package the right ruby version to use:
+
+**** Archlinux-like
+
+On Archlinux, Manjaro or Parabola, you just have to install the packages
+~ruby~ and ~rubygems~:
+
+#+caption: Ruby installation procedure on Archlinux-like system
+#+begin_src shell
+ sudo pacman -S ruby rubygems
+#+end_src
+
+**** Debian-like
+
+Ruby 2.6 does not seem to be available at all. However, on Ubuntu at
+least, ruby 2.7 is available. Thus you should try the following command:
+
+#+caption: Ruby installation procedure on Debian-like system
+#+begin_src shell
+ sudo apt install ruby2.7
+#+end_src
+
+**** Others
+
+Ruby 2.7 seems to be already well packaged for Fedora, Red Hat or
+OpenMandriva, thus it should not be a problem for you to install it.
+
+*** Install ruby with RVM
+
+[[https://rvm.io][RVM]] allows you to install different ruby versions on the same
+machine. It could be interesting when you are already a ruby
+developper.
+
+We recommand you to use a dedicated gemset for fronde, to avoid
+polluting your other projects.
+
+#+caption: Ruby installation procedure with RVM
+#+begin_src shell
+ rvm get latest
+ rvm use ruby-2.7.2@fronde --create
+#+end_src
+
+*** Install Fronde
+
+As soon as you have a working ruby environment, you just need to install
+it as any other gem:
+
+#+caption: Fronde gem installation procedure
+#+begin_src shell
+ gem install fronde
+#+end_src
+
+*** Build Fronde from sources
+
+You may also want to install a development version of fronde, directly
+from its source code repository. We won’t describe this procedure in
+details as it should only be used by developpers or advanced users. But
+still, here are the commands you can used to build fronde from the
+sources.
+
+#+caption: Build sources procedure
+#+begin_src shell
+ git clone https://git.umaneti.net/fronde
+ cd fronde
+ gem install bundler
+ bundle install
+ gem build fronde.gemspec
+#+end_src
+
+Then, you can install fronde from this new locally built gem file
+(obviously, you must adapt the following command with the fronde version
+number you just built):
+
+#+caption: Fronde installation procedure from local gem file
+#+begin_src shell
+ gem install fronde-0.3.0.gem
+#+end_src
+
+** Creation of a website
+
+A fronde project is essentially just a folder containing the
+configuration of your website and a subfolder containing the org files
+to publish. fronde requires a local installation of org-mode to work,
+and will generate various configuration files you are not expected to
+modify. To setup all these things, you must use the ~fronde init~
+command.
+
+Thus, to create a new fronde website, you must create an empty folder
+and move to this new folder in your terminal:
+
+#+caption: Create a fronde project directory
+#+begin_src shell
+ mkdir yourproject
+ cd yourproject
+#+end_src
+
+Now, you can run the ~fronde init~ command with some arguments:
+
+#+caption: Initialize a fronde project
+#+begin_src shell
+ fronde init -t "My brand new website"
+#+end_src
+
+#+begin_tip
+The following arguments are allowed:
+
+- -a (--author) :: Set up the default author name (see the [[#author_setting][~author~ config key]])
+- -l (--lang) :: Set up the default lang of your website (see the [[#lang_setting][~lang~ config key]])
+- -t (--title) :: Set up the title of your website (see the [[#title_setting][~title~ config key]])
+#+end_tip
+
+At the end of the init process, fronde will automatically open Emacs on
+the first page of your website. You can directly write in it or close it
+and come back to it later. This file is stored in the default ~src~
+[[#sources_setting][source]] subfolder as ~src/index.org~.
+
+Your project now consist of the following file hierarchy:
+
+#+begin_example
+yourproject/
+├── config.yml # main config file
+├── .dir-locals.el # Emacs per-directory local variables file
+├── lib/ # required dependencies
+├── public_html/ # output folder
+│   └── assets/
+├── Rakefile # fronde-generated ruby related file
+├── src/
+│   └── index.org # your first website page
+└── var/ # variable files used during operation
+#+end_example
+
+#+begin_caution
+Fronde relies a lot on files stored in the ~lib~ and ~var~ folders. You
+should never try to remove them by yourself.
+#+end_caution
+
+** Creation or edition of a page
+
+To create a new page for your website, or to edit an already existing
+one, you are totally free to use the tool you want. Pages are just
+regular Org files, without any specific modifications. If you already
+have a bunch of them, you can use them without any changes.
+
+By default, without any other configuration options, the website pages
+must be stored in a folder named ~src~ at the root of your
+project. However you can configure any other [[#sources_setting][sources folder]] you want,
+even one, which is not in your project directory.
+
+In parallel of your regular Org workflow, fronde provides a little
+command to help you create or edit pages for your website: the ~fronde
+open~ command.
+
+The most simple use case is just to call it with a file path and it will
+open that file in your default ~EDITOR~ (which should be Emacs).
+
+#+caption: Open a page with the fronde open command
+#+begin_src shell
+ fronde open src/index.org
+#+end_src
+
+When creating a new page, this command accepts the following arguments:
+
+- -a (--author) :: Set the author name of the page
+- -l (--lang) :: Set the language of the page
+- -t (--title) :: Set the title of the page
+
+If you use the ~--title~ argument, instead of giving a full file path
+argument, you can just give the folder path where you want to save the
+new file, and the command will create the document with a Web-ready
+name.
+
+#+caption: Creation of a new page with the title argument
+#+begin_src shell
+ fronde open -a Alice -t "My new page’s shiny, isn’t it?" src
+ ls src
+ > index.org my-new-page-s-shiny-isn-t-it.org
+#+end_src
+
+And now ~src/my-new-page-s-shiny-isn-t-it.org~ contains:
+
+#+begin_example
+#+title: My new page’s shiny, isn’t it?
+#+date: <2020-11-12 Thu. 11:25:58>
+#+author: Alice
+#+language: en
+
+
+#+end_example
+
+** Building the website
+
+Once you have written some content, you can convert your org files to
+html with the ~fronde build~ command.
+
+#+caption: Build a fronde project
+#+begin_src shell
+ fronde build
+#+end_src
+
+#+begin_tip
+As this building process makes a direct use of the org-mode publishing
+feature, it will only rebuild changed files since the last command
+invocation. If you want to force a full rebuild, you can pass the
+~--force~ arguments to the command.
+
+#+begin_src shell
+ fronde build -f
+#+end_src
+#+end_tip
+
+To review what you just built, you can use the ~fronde preview~ command,
+which will start a local webserver and open your default web browser on
+the home page of your project.
+
+#+caption: Build a fronde project
+#+begin_src shell
+ fronde preview
+#+end_src
+
+** Publishing the website
+
+* Advanced usage
+
+** Config File
+
+All the fronde configuration is stored in one [[https://en.wikipedia.org/wiki/YAML][YAML]] file named
+~config.yml~ and stored at the root of your project. If none exists, a
+default one will be created the first time you run any ~fronde~ command.
+
+The following document explains all possible configuration options for
+fronde, which may be put in file named ~config.yml~ at the root of your
+static website project. The options are listed in alphabetical
+order. However, they can be put in any order in the ~config.yml~ file.
+
+*** ~author~
+:PROPERTIES:
+:CUSTOM_ID: author_setting
+:END:
+
+The ~author~ option stores the default author name of your org
+files. This value is used when you create a new file. *It is not used by
+the regular Org mode publishing process*. You must be sure that your org
+files contains an ~#+author:~ metadata field before publishing them.
+
+This value is used in the generation of the blog index page and the main
+atom feed.
+
+#+caption: Example of an author setting
+#+begin_src yaml
+ ---
+ author: Alice Doe
+#+end_src
+
+#+begin_note
+The default ~author~ setting is inferred from your user name on your
+current computer system session.
+#+end_note
+
+*** ~domain~
+
+The domain name pointing to where your static website is expected to be
+hosted. This value is used to generate absolute path to your files on
+your expected host name (for example in the Atom feeds).
+
+#+begin_caution
+Its value is expected to *not* end by a slash. That is to say
+~https://example.com~ is a *valid* value, while ~https://example.com/~
+is not.
+#+end_caution
+
+By default, your static website is expected to be hosted at the root of
+your domain name (like ~https://example.com/index.html~). If it is not
+the case and your fronde static website is hosted in a sub directory of
+your main website, you must add this sub folder to the ~domain~
+value. Thus, ~https://example.com/example~ or
+~https://example.com/complex/example~ are *valid* values too.
+
+#+caption: Example of a domain setting
+#+begin_src yaml
+ ---
+ domain: https://alice.doe.name
+#+end_src
+
+#+begin_note
+The default ~domain~ value is an empty string.
+#+end_note
+
+*** ~lang~
+:PROPERTIES:
+:CUSTOM_ID: lang_setting
+:END:
+
+The main locale your website will be written in. Its value must comply
+with the [[https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes][ISO 639-1]] standard.
+
+#+caption: Example of a lang setting
+#+begin_src yaml
+ ---
+ lang: en
+#+end_src
+
+#+begin_note
+The default ~lang~ setting is inferred from your current system one.
+#+end_note
+
+*** ~public_folder~
+
+The ~public_folder~ option stores the path to the folder, which will
+contains the generated files, ready for publication.
+
+#+begin_note
+The default ~public_folder~ value is ~public_html~ (at the root of your
+project).
+#+end_note
+
+*** ~remote~
+
+The ~remote~ option contains an /rsync/ like destination string, which
+will be used to published your website when using the ~sync:push~ /rake/
+task. For exemple ~user@domain:/var/www/mywebsite/~
+
+#+begin_note
+There is no default value for ~remote~. Publication of your website will
+just be skipped.
+#+end_note
+
+*** ~title~
+:PROPERTIES:
+:CUSTOM_ID: title_setting
+:END:
+
+The ~title~ option stores the default title of your org files. This
+value is used when you create a new file with the ~fronde~ command.
+
+#+begin_warning
+*This setting is not used by the regular org mode publishing process*.
+You must ensure that your org files contains an ~#+title:~ metadata
+field before publishing them.
+#+end_warning
+
+This value is also used in the generation of the blog index page and the
+main atom feed as website title.
+
+*** ~sources~
+:PROPERTIES:
+:CUSTOM_ID: sources_setting
+:END:
+
+The ~sources~ option stores an array of all source folders, where your
+org files to be published are. This allow you to gather various
+different places (even at some absolute path in your computer) in your
+website.
+
+Each source listed in that array is an object, which must use the
+following keys:
+
+- path :: [string] path to the folder containing the file to exports
+- name :: [string, optional] key used to generate the [[https://orgmode.org/org.html#Project-alist][Org “project”
+ name]]. This name never appear in a generated file, it is more like an
+ internal id. Defaults to the last dirname of the path value.
+- recursive :: [boolean, optional] wether the path should be exported
+ recursively. Defaults to True
+- exclude :: [string, optional] Regexp of files to not export for this
+ source. Default to nothing (no files to exclude).
+- target :: [string, optional] Path where to put the exported files,
+ relative to the ~public_folder~ folder. Default to the source name at
+ the root of the ~public_folder~ folder.
+- is_blog :: [boolean, optional] Whether this source should be
+ considered as a blog and thus, serves to generate blog index, tags
+ indexes and atom feeds.
+- theme :: [string, optional] Theme name to use for this
+ source. Defaults to “default”.
+
+#+begin_tip
+If one of your source is expected to use all default settings, instead
+of an object, you can just provide the source path as a string. Look at
+the ~src~ source in the example bellow.
+#+end_tip
+
+#+caption: Example of a sources array setting
+#+begin_src yaml
+ ---
+ sources:
+ - src
+ - path: src/news
+ is_blog: true
+#+end_src
+
+If you don’t provide any ~sources~ option, it fallbacks to support only
+one source folder named ~src~ at the root of your project directory, as
+if the ~sources~ option has been:
+
+#+caption: Default value of the sources option
+#+begin_src yaml
+ ---
+ sources:
+ - path: src
+ target: .
+ name: src
+ recursive: yes
+#+end_src
+
+#+begin_warning
+Not setting the ~sources~ option is different from giving it the
+following exact value:
+
+#+begin_src yaml
+ ---
+ sources:
+ - src
+#+end_src
+
+In the first case, as nothing as been given for the ~sources~ option,
+its default value will use ~.~ as its target directory, which means to
+put generated html files directly at the root of the ~public_folder~
+(which defaults to ~public_html~). But in the later case, the generated
+target will be the ~src~ folder /inside/ the ~public_folder~, what will
+be, by default, ~public_html/src~.
+
+Thus, if you have a very simple website with only one source, you should
+avoid to set the ~sources~ options, or be very precise in what you want.
+#+end_warning
+
+*** ~templates~
+:PROPERTIES:
+:CUSTOM_ID: templates_setting
+:END:
+
+The ~templates~ option let’s you customized the built html files,
+whatever source they come from. The main idea behind it, is to add
+HTML fragments to the generated files.
+
+The ~templates~ option stores an array of /template/, each of one
+documenting an HTML fragment to insert or move at some place in a
+specified generated file. Each template listed in that array is an
+object, which must use the following keys:
+
+- type :: [string] how the template should be inserted or moved in the
+ HTML document. Can be either ~before~, ~after~ or ~replace~. It
+ defaults to ~after~.
+- content :: [string] the HTML fragment to insert or replace. This value
+ will be evaluated before insertion and some tags will be replaced in a
+ context sensitive maneer. See the [[#formatting_tags][Preamble/Postamble/Templates
+ formatting tags]] section for the details.
+- selector :: [string] a CSS selector specififying where the new
+ fragment should be inserted. For exemple, if this value is ~#main
+ p:first-child~ and the current template ~type~ is ~after~, then the
+ current ~content~ will be placed /after/ the first HTML tag ~p~ inside
+ a container, which ~id~ is ~main~.
+- path :: [string, optional] the current template will only apply on
+ generated HTML files matching this glob pattern. This pattern must
+ match against a published path. That means, for a HTML document stored
+ at ~public_html/some/folder/doc.html~, the path could be
+ ~/some/folder/doc.html~ or ~/some/folder/*.html~, but not
+ ~public_html/…~.
+- source :: [string, optional] this option is incompatible with the
+ ~content~: either you have a ~content~ or a ~source~, never both of
+ them. The aim of this option is to target, with a CSS selector, any
+ part of the HTML document, in order to move it elsewhere. See example
+ below.
+
+For example, if you want to hide social media ~meta~ tags in the /head/
+of your generated HTML files, you can use the following ~templates~
+setting, which will add a bunch of ~meta~ tags /before/ the ~title~ of
+any generated HTML file:
+
+#+caption: Templates setting to add social media meta tags
+#+begin_src yaml
+ ---
+ templates:
+ - type: before
+ selector: title
+ content: |
+ <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/">
+ <meta property="dc.publisher" content="%a">
+ <meta property="dc.type" content="text">
+ <meta property="dc.format" content="text/html">
+ <meta property="dc.title" lang="%l" content="%t">
+ <meta property="dc.description" lang="%l" content="%x">
+ <meta property="dc.language" content="%l">
+ <meta property="dc.date" content="%I">
+ <meta property="dc.rights" content="%L">
+ <meta name="twitter:card" content="summary">
+ <meta name="twitter:creator" content="@fsfe">
+ <meta property="og:type" content="article">
+ <meta property="og:title" content="%t">
+ <meta property="og:article:published_time" content="%I">
+ <meta property="og:url" content="%u">
+ <meta property="og:locale" content="%l">
+ <meta property="og:description" content="%x">
+ <meta property="og:site_name" content="My wonderfull website">
+#+end_src
+
+Here is another example, if you want, for example, move the generated
+Org table of content before the main ~#content~ div (by default, the Org
+publish process put it /inside/ this div). As we specified a ~path~
+option, this replacment will only occur for HTML document under the
+~/docs~ folder.
+
+#+caption: Templates setting to move the table of content outside the #content div
+#+begin_src yaml
+- type: before
+ selector: div#content
+ source: nav#table-of-contents
+ path: "/docs/*.html"
+#+end_src
+
+** Preamble/Postamble/Templates formatting tags
+:PROPERTIES:
+:CUSTOM_ID: formatting_tags
+:END:
+
+This section documents the percent-tags you can use in the preamble or
+postamble of your [[#sources_setting][sources]], or in any of your [[#templates_setting][templates]]. This tags will
+be replaced by their corresponding content when you will build your
+website. Their value is context sensitive: it will take a value from the
+currently evaluated Org file, or by default the config of your project.
+
+- %a :: the raw author name of the current Org file, or the one given in
+ the config file.
+- %A :: the HTML rendering of the author name, equivalent to
+ ~<span class="author">%a</span>~.
+- %d :: a short date HTML representation, equivalent to
+ ~<time datetime="%I">%i</time>~.
+- %D :: the full date and time HTML representation.
+- %i :: the raw short date and time.
+- %I :: the raw rfc3339 date and time.
+- %k :: the current Org file keywords separated by a comma.
+- %K :: the HTML list rendering of the keywords.
+- %l :: the lang of the document, or the one given in the config file.
+- %L :: the license information, taken from the config file.
+- %n :: the Fronde name and version.
+- %N :: the Fronde name and version with a link to the project
+ home.
+- %s :: the subtitle of the current Org file (from ~#+subtitle:~).
+- %t :: the title of the current Org file (from ~#+title:~).
+- %u :: the web path to the related published HTML document.
+- %x :: the raw description (~x~ as in eXcerpt) of the current Org file
+ (from ~#+description:~).
+- %X :: the description, enclosed in an HTML ~p~ tag, equivalent
+ to ~<p>%x</p>~
+
+** Rake tasks
+
+Like a lot of ruby project, fronde exposes some [[https://ruby.github.io/rake/][Rake]] tasks. You can
+discover them with the ~rake -T~ command.
diff --git a/Firma_Pablo_Neruda.png b/Firma_Pablo_Neruda.png
deleted file mode 100644
index 4abb6dc..0000000
--- a/Firma_Pablo_Neruda.png
+++ /dev/null
Binary files differ
diff --git a/README.org b/README.org
index c3f3054..1ca0b57 100644
--- a/README.org
+++ b/README.org
@@ -1,17 +1,18 @@
-#+title: Neruda
+#+title: Fronde
#+author: Étienne Deparis
#+lang: en
#+keywords: static website generator, ruby, gem, org mode, emacs
-#+description: Neruda is a ruby gem, which helps you to manage your
+#+description: Fronde is a ruby gem, which helps you to manage your
#+description: static website generated with Org mode
* What's for?
#+attr_html: :style width:150px;float:right;margin-top:-4.5em;margin-left:2em;
-[[file:./Firma_Pablo_Neruda.png]]
+[[file:./tigre.png]]
-Neruda is a static website generator made for [[https://orgmode.org][Org files]]. It improves the
-default Org HTML exporting/publishing routine.
+Fronde is an opinionated static website generator for [[https://orgmode.org][Org]]. It helps you
+converting Org mode files into websites, giving you full control over
+the publication process.
* Features
@@ -26,30 +27,29 @@ default Org HTML exporting/publishing routine.
- Can use different theme for different sources
- Supports tags and [[https://en.wikipedia.org/wiki/Atom_(Web_standard)][ATOM feeds]]
-* How to install it
+* Quick install
-Neruda is a [[https://rubygems.org/][Ruby gem]]. You need a working Ruby environment to use it. We
+Fronde is a [[https://rubygems.org/][Ruby gem]]. You need a working Ruby environment to use it. We
recommand you to use [[https://rvm.io][RVM]] and a specific gemset. However it will works
with a global ruby installation too.
#+caption: Installation procedure with RVM
#+begin_src shell
rvm get latest
-rvm use ruby-2.6.3@neruda --create
-gem install neruda
+rvm use ruby-2.7.2@fronde --create
+gem install fronde
#+end_src
-Now, you're ready to create your first Neruda website.
+Now, you're ready to create your first Fronde website.
#+begin_src shell
-pablo init -t "My first neruda website"
+mkdir mywebite
+cd mywebsite
+fronde init -t "My first fronde website"
+fronde build
+fronde preview
#+end_src
* Going further
-All the Neruda configuration is stored in one [[https://en.wikipedia.org/wiki/YAML][YAML]] file named
-~config.yml~ and stored at the root of your project. If none exists, a
-default one will be created the first time you run any ~pablo~ command.
-
-You should read the [[./CONFIG.org][config file documentation]] to discover its various
-options.
+Please refer to the [[./DOCUMENTATION.org][documentation]].
diff --git a/Rakefile b/Rakefile
deleted file mode 100644
index 5f83311..0000000
--- a/Rakefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-begin
- require 'yard'
- require 'rspec/core/rake_task'
-
- RSpec::Core::RakeTask.new(:spec)
-
- YARD::Rake::YardocTask.new do |t|
- t.options = ['-m', 'org', '--no-progress',
- '--files', 'CONFIG.org',
- '--asset', 'Firma_Pablo_Neruda.png']
- end
-rescue LoadError
- warn 'You are not using the development bundle.'
-end
diff --git a/bin/fronde b/bin/fronde
new file mode 100755
index 0000000..c4a370d
--- /dev/null
+++ b/bin/fronde
@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'optparse'
+require 'r18n-core'
+require 'fronde/utils'
+require 'fronde/version'
+require 'fronde/cli'
+
+R18n.default_places = File.expand_path('../locales', __dir__)
+R18n.set Fronde::Config.settings['lang']
+
+optparser = OptionParser.new
+optparser.version = Fronde::VERSION
+
+Fronde::Utils::FRONDE_OPTIONS.each do |k, opt|
+ optparser.send(opt[:meth] || :on, *Fronde::Utils.decorate_option(k))
+end
+
+params = {}
+optparser.parse!(into: params)
+
+if params[:version]
+ warn optparser.ver
+ exit
+end
+
+if ARGV[0] == 'help'
+ params[:help] = true
+ ARGV.shift
+end
+fronde = Fronde::CLI.new(params)
+command = "fronde_#{ARGV[0]}".to_sym
+cmd_err = !fronde.respond_to?(command)
+if params[:help] || cmd_err
+ cmd_err = false if params[:help] && !ARGV[0]
+ fronde.fronde_help(ARGV[0], error: cmd_err)
+end
+ARGV.shift
+
+init_cmds = [:fronde_init, :fronde_config]
+unless File.exist?('config.yml') || init_cmds.include?(command)
+ fronde.fronde_init
+end
+fronde.send command
diff --git a/bin/pablo b/bin/pablo
deleted file mode 100755
index 3e04fa4..0000000
--- a/bin/pablo
+++ /dev/null
@@ -1,193 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'rake'
-require 'optparse'
-require 'r18n-core'
-require 'neruda/utils'
-require 'neruda/version'
-
-R18n.default_places = File.expand_path('../locales', __dir__)
-R18n.set Neruda::Config.settings['lang']
-
-# Pablo commands
-module PabloCommands
- def pablo_init
- cnf = @options.merge
- cnf.delete(:verbose)
- cnf.transform_keys!(&:to_s)
- Neruda::Config.save(Neruda::Config.settings.merge(cnf))
- @rake.options.build_all = true
- @rake.invoke_task('org:install')
- return if File.exist? 'src/index.org'
- Neruda::OrgFile.new('src/index.org', @options).write
- pablo_open 'src/index.org'
- end
- alias_method :pablo_config, :pablo_init
-
- def pablo_build
- @rake.options.build_all = true
- task = 'site:build'
- task = "#{task}[true]" if @options[:force]
- @rake.invoke_task task
- end
-
- def pablo_preview
- Thread.new do
- sleep 1
- port = Neruda::Config.settings.dig('preview', 'server_port') || 5000
- uri = "http://127.0.0.1:#{port}/"
- current_os = Neruda::Utils.current_os
- case current_os
- when 'windows'
- system 'start', uri
- when 'apple'
- system 'open', uri
- else
- system 'gio', 'open', uri
- end
- end
- @rake.invoke_task('site:preview')
- end
-
- def pablo_open(file_path = ARGV[0])
- editor = ENV['EDITOR'] || ENV['VISUAL'] || 'emacs'
- cmd = [editor]
- if file_path.nil? || !File.file?(file_path)
- # file_path may be updated with title given in options
- file_path = create_new_file(file_path)
- # Only move to the end of file for new file. Let the editor handle
- # the best position for already existing files
- cmd << '+6'
- end
- cmd << file_path
- system(*cmd)
- end
- alias_method :pablo_edit, :pablo_open
-
- def pablo_publish
- @rake.invoke_task('sync:push')
- end
-
- def pablo_help(command = 'basic', error: false)
- warn R18n.t.pablo.error.no_command if error
- cmd = Neruda::Utils.resolve_possible_alias(command)
- cmd_opt = Neruda::Utils::PABLO_COMMANDS[cmd]
- label = cmd_opt[:label] || command
- warn format("%<label>s\n\n", label: R18n.t.pablo.usage(label))
- if R18n.t.pablo.commands[cmd].translated?
- warn format("%<label>s\n\n", label: R18n.t.pablo.commands[cmd])
- end
- warn help_command_body(cmd).join("\n")
- exit 1 if error
- exit
- end
-
- private
-
- def new_file_name(file_path)
- file_path = File.expand_path(file_path || '')
- return file_path if file_path[-4..] == '.org'
- # file_path seems to be a dir path. Thus we have to create the new
- # filename from its title
- title = @options[:title]
- # No title, nor a reliable file_path? Better abort
- return nil if title.nil? || title == ''
- filename = "#{Neruda::OrgFile.slug(title)}.org"
- File.join file_path, filename
- end
-
- def create_new_file(file_path)
- filename = new_file_name(file_path)
- if filename.nil?
- warn R18n.t.pablo.error.no_file
- exit 1
- end
- FileUtils.mkdir_p File.dirname(filename)
- Neruda::OrgFile.new(filename, @options).write
- filename
- end
-
- def help_command_body(command)
- body = [
- R18n.t.pablo.options.cmd_title,
- Neruda::Utils.summarize_command(command)
- ]
- return body unless command == 'basic'
- body + [
- '',
- R18n.t.pablo.commands.cmd_title,
- Neruda::Utils.list_commands
- ]
- end
-end
-
-# Main pablo class
-class Pablo
- def initialize(opts = {})
- @options = { verbose: false }.merge(opts)
- init_rake
- end
-
- include PabloCommands
-
- private
-
- def init_rake
- init_rakefile unless File.exist?('Rakefile')
- @rake = Rake.application
- Rake.verbose(false) unless @options[:verbose]
- @rake.raw_load_rakefile
- end
-
- def init_rakefile
- rakefile = <<~RAKE
- # frozen_string_literal: true
-
- require 'neruda/config'
- require 'r18n-core'
-
- neruda_spec = Gem::Specification.find_by_name 'neruda'
- R18n.default_places = "\#{neruda_spec.gem_dir}/locales"
- R18n.set(Neruda::Config.settings['lang'] || 'en')
- R18n::Filters.on(:named_variables)
-
- Dir.glob("\#{neruda_spec.gem_dir}/lib/tasks/*.rake").each { |r| import r }
-
- task default: 'site:build'
- RAKE
- IO.write 'Rakefile', rakefile
- end
-end
-
-optparser = OptionParser.new
-optparser.version = Neruda::VERSION
-
-Neruda::Utils::PABLO_OPTIONS.each do |k, opt|
- optparser.send(opt[:meth] || :on, *Neruda::Utils.decorate_option(k))
-end
-
-params = {}
-optparser.parse!(into: params)
-
-if params[:version]
- warn optparser.ver
- exit
-end
-
-if ARGV[0] == 'help'
- params[:help] = true
- ARGV.shift
-end
-pablo = Pablo.new(params)
-command = "pablo_#{ARGV[0]}".to_sym
-cmd_err = !pablo.respond_to?(command)
-if params[:help] || cmd_err
- cmd_err = false if params[:help] && !ARGV[0]
- pablo.pablo_help(ARGV[0], error: cmd_err)
-end
-ARGV.shift
-
-init_cmds = [:pablo_init, :pablo_config]
-pablo.pablo_init unless File.exist?('config.yml') || init_cmds.include?(command)
-pablo.send command
diff --git a/neruda.gemspec b/fronde.gemspec
index 1a2946b..adbcec8 100644
--- a/neruda.gemspec
+++ b/fronde.gemspec
@@ -1,33 +1,35 @@
# frozen_string_literal: true
-require './lib/neruda/version'
+require './lib/fronde/version'
Gem::Specification.new do |s|
- s.name = 'neruda'
- s.version = Neruda::VERSION
- s.summary = 'A simplistic way to create an Org static website.'
+ s.name = 'fronde'
+ s.version = Fronde::VERSION
+ s.summary = 'An opinionated static website generator for Org'
s.description = <<~DESC
- An opinionated Org static website generator.
- Write your org-mode files, we take care of the rest.
+ Fronde helps you to convert Org mode files into websites, giving you
+ full control over the publication process.
DESC
s.authors = ['Étienne Deparis']
s.email = 'etienne@depar.is'
- s.files = ['lib/neruda/config.rb',
- 'lib/neruda/config/lisp_config.rb',
- 'lib/neruda/config/org-config.el',
- 'lib/neruda/config/ox-neruda.el',
- 'lib/neruda/emacs.rb',
- 'lib/neruda/index.rb',
- 'lib/neruda/index/atom_generator.rb',
- 'lib/neruda/index/org_generator.rb',
- 'lib/neruda/org_file.rb',
- 'lib/neruda/org_file/class_methods.rb',
- 'lib/neruda/org_file/extracter.rb',
- 'lib/neruda/org_file/htmlizer.rb',
- 'lib/neruda/templater.rb',
- 'lib/neruda/utils.rb',
- 'lib/neruda/preview.rb',
- 'lib/neruda/version.rb',
+ s.files = ['lib/fronde/cli.rb',
+ 'lib/fronde/cli/commands.rb',
+ 'lib/fronde/config.rb',
+ 'lib/fronde/config/lisp_config.rb',
+ 'lib/fronde/config/org-config.el',
+ 'lib/fronde/config/ox-fronde.el',
+ 'lib/fronde/emacs.rb',
+ 'lib/fronde/index.rb',
+ 'lib/fronde/index/atom_generator.rb',
+ 'lib/fronde/index/org_generator.rb',
+ 'lib/fronde/org_file.rb',
+ 'lib/fronde/org_file/class_methods.rb',
+ 'lib/fronde/org_file/extracter.rb',
+ 'lib/fronde/org_file/htmlizer.rb',
+ 'lib/fronde/templater.rb',
+ 'lib/fronde/utils.rb',
+ 'lib/fronde/preview.rb',
+ 'lib/fronde/version.rb',
# Rake tasks
'lib/tasks/org.rake',
'lib/tasks/site.rake',
@@ -38,8 +40,8 @@ Gem::Specification.new do |s|
'locales/fr.yml',
# Others
'LICENSE']
- s.executables = ['pablo']
- s.homepage = 'https://git.umaneti.net/neruda/about/'
+ s.executables = ['fronde']
+ s.homepage = 'https://git.umaneti.net/fronde/about/'
s.license = 'WTFPL'
s.required_ruby_version = '>= 2.6'
diff --git a/lib/fronde/cli.rb b/lib/fronde/cli.rb
new file mode 100644
index 0000000..c9bd87e
--- /dev/null
+++ b/lib/fronde/cli.rb
@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'rake'
+require 'fronde/cli/commands'
+
+module Fronde
+ # Fronde CLI app
+ class CLI
+ def initialize(opts = {})
+ @options = { verbose: false }.merge(opts)
+ init_required_files
+ init_rake
+ end
+
+ include Fronde::CLICommands
+
+ private
+
+ def init_required_files
+ init_rakefile unless File.exist?('Rakefile')
+ init_gitignore unless File.exist?('.gitignore')
+ end
+
+ def init_rake
+ @rake = Rake.application
+ Rake.verbose(false) unless @options[:verbose]
+ @rake.raw_load_rakefile
+ end
+
+ def init_rakefile
+ rakefile = <<~RAKE
+ # frozen_string_literal: true
+
+ require 'fronde/config'
+ require 'r18n-core'
+
+ fronde_spec = Gem::Specification.find_by_name 'fronde'
+ R18n.default_places = "\#{fronde_spec.gem_dir}/locales"
+ R18n.set(Fronde::Config.settings['lang'] || 'en')
+ R18n::Filters.on(:named_variables)
+
+ Dir.glob("\#{fronde_spec.gem_dir}/lib/tasks/*.rake").each { |r| import r }
+
+ task default: 'site:build'
+ RAKE
+ IO.write 'Rakefile', rakefile
+ end
+
+ def init_gitignore
+ gitignore = <<~GITIGNORE
+ .dir-locals.el
+ Rakefile
+ lib
+ public_html
+ var
+ GITIGNORE
+ IO.write '.gitignore', gitignore
+ end
+ end
+end
diff --git a/lib/fronde/cli/commands.rb b/lib/fronde/cli/commands.rb
new file mode 100644
index 0000000..321a1d4
--- /dev/null
+++ b/lib/fronde/cli/commands.rb
@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+module Fronde
+ # Fronde commands
+ module CLICommands
+ def fronde_init
+ cnf = @options.merge
+ cnf.delete(:verbose)
+ cnf.transform_keys!(&:to_s)
+ Fronde::Config.save(Fronde::Config.settings.merge(cnf))
+ @rake.options.build_all = true
+ @rake.invoke_task('org:install')
+ return if File.exist? 'src/index.org'
+ Fronde::OrgFile.new('src/index.org', @options).write
+ fronde_open 'src/index.org'
+ end
+ alias_method :fronde_config, :fronde_init
+
+ def fronde_build
+ @rake.options.build_all = true
+ task = 'site:build'
+ task = "#{task}[true]" if @options[:force]
+ @rake.invoke_task task
+ end
+
+ def fronde_preview
+ Thread.new do
+ sleep 1
+ port = Fronde::Config.settings.dig('preview', 'server_port') || 5000
+ uri = "http://127.0.0.1:#{port}/"
+ current_os = Fronde::Utils.current_os
+ case current_os
+ when 'windows'
+ system 'start', uri
+ when 'apple'
+ system 'open', uri
+ else
+ system 'gio', 'open', uri
+ end
+ end
+ @rake.invoke_task('site:preview')
+ end
+
+ def fronde_open(file_path = ARGV[0])
+ editor = ENV['EDITOR'] || ENV['VISUAL'] || 'emacs'
+ cmd = [editor]
+ if file_path.nil? || !File.file?(file_path)
+ # file_path may be updated with title given in options
+ file_path = create_new_file(file_path)
+ # Only move to the end of file for new file. Let the editor handle
+ # the best position for already existing files
+ cmd << '+6'
+ end
+ cmd << file_path
+ system(*cmd)
+ end
+ alias_method :fronde_edit, :fronde_open
+
+ def fronde_publish
+ @rake.invoke_task('sync:push')
+ end
+
+ def fronde_help(command = 'basic', error: false)
+ warn R18n.t.fronde.bin.error.no_command if error
+ cmd = Fronde::Utils.resolve_possible_alias(command)
+ cmd_opt = Fronde::Utils::FRONDE_COMMANDS[cmd]
+ label = cmd_opt[:label] || command
+ warn format("%<label>s\n\n", label: R18n.t.fronde.bin.usage(label))
+ if R18n.t.fronde.bin.commands[cmd].translated?
+ warn format("%<label>s\n\n", label: R18n.t.fronde.bin.commands[cmd])
+ end
+ warn help_command_body(cmd).join("\n")
+ exit 1 if error
+ exit
+ end
+
+ private
+
+ def new_file_name(file_path)
+ file_path = File.expand_path(file_path || '')
+ return file_path if file_path[-4..] == '.org'
+ # file_path seems to be a dir path. Thus we have to create the new
+ # filename from its title
+ title = @options[:title]
+ # No title, nor a reliable file_path? Better abort
+ return nil if title.nil? || title == ''
+ filename = "#{Fronde::OrgFile.slug(title)}.org"
+ File.join file_path, filename
+ end
+
+ def create_new_file(file_path)
+ filename = new_file_name(file_path)
+ if filename.nil?
+ warn R18n.t.fronde.bin.error.no_file
+ exit 1
+ end
+ FileUtils.mkdir_p File.dirname(filename)
+ Fronde::OrgFile.new(filename, @options).write
+ filename
+ end
+
+ def help_command_body(command)
+ body = [
+ R18n.t.fronde.bin.options.cmd_title,
+ Fronde::Utils.summarize_command(command)
+ ]
+ return body unless command == 'basic'
+ body + [
+ '',
+ R18n.t.fronde.bin.commands.cmd_title,
+ Fronde::Utils.list_commands
+ ]
+ end
+ end
+end
diff --git a/lib/neruda/config.rb b/lib/fronde/config.rb
index 28f77bd..da2bf18 100644
--- a/lib/neruda/config.rb
+++ b/lib/fronde/config.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
require 'yaml'
-require 'neruda/config/lisp_config'
+require 'fronde/config/lisp_config'
-module Neruda
+module Fronde
# Wrapper for configuration
#
# This class is a singleton interface, which share the static website
@@ -24,11 +24,11 @@ module Neruda
# Settings will be available like this:
#
# #+begin_src
- # Neruda::Config.settings['author']
+ # Fronde::Config.settings['author']
# => "Alice Doe"
# #+end_src
class Config
- extend Neruda::LispConfig
+ extend Fronde::LispConfig
class << self
# Access the current website settings
@@ -47,7 +47,7 @@ module Neruda
# Not only this method overwrite the old settings, but it replace
# the current shared settings with the ones given in
# parameter. Later call to
- # {file:Neruda/Config.html#settings-class_method settings}
+ # {file:Fronde/Config.html#settings-class_method settings}
# will, obviously, use these new settings.
#
# @param new_config [Hash] the settings to save
@@ -56,7 +56,7 @@ module Neruda
# Do not save obvious default config values. We'll always try to
# save author and lang as they default on system variables,
# which may be different from a system to another. Thus it may
- # be confusing if one use neruda on two different computer and
+ # be confusing if one use fronde on two different computer and
# these params always change.
new_config.delete_if do |k, v|
['domain', 'public_folder', 'templates', 'theme'].include?(k) \
@@ -69,7 +69,7 @@ module Neruda
# Load the given settings as if they comes from the ~config.yml~ file.
#
# This method is handy for testing purpose. Later call to
- # {file:Neruda/Config.html#settings-class_method settings} will
+ # {file:Fronde/Config.html#settings-class_method settings} will
# use these new settings.
#
# @param config [Hash] the settings to artificially load
diff --git a/lib/neruda/config/lisp_config.rb b/lib/fronde/config/lisp_config.rb
index 1f47ac2..b2855ed 100644
--- a/lib/neruda/config/lisp_config.rb
+++ b/lib/fronde/config/lisp_config.rb
@@ -2,9 +2,9 @@
require 'json'
require 'open-uri'
-require 'neruda/version'
+require 'fronde/version'
-module Neruda
+module Fronde
# This module contains utilitary methods to ease ~org-config.el~
# file generation
module LispConfig
@@ -13,16 +13,16 @@ module Neruda
# @return [String] the new x.x.x version string of Org
def org_last_version
return @org_version if @org_version
- if File.exist?('tmp/__last_org_version__')
- @org_version = IO.read('tmp/__last_org_version__')
+ if File.exist?('var/tmp/last_org_version')
+ @org_version = IO.read('var/tmp/last_org_version')
return @org_version
end
versions = JSON.parse(
URI('https://updates.orgmode.org/data/releases').open.read
).sort { |a, b| b['date'] <=> a['date'] }
@org_version = versions.first['version']
- FileUtils.mkdir_p 'tmp'
- IO.write('tmp/__last_org_version__', @org_version)
+ FileUtils.mkdir_p 'var/tmp'
+ IO.write('var/tmp/last_org_version', @org_version)
@org_version
end
@@ -38,9 +38,9 @@ module Neruda
projects = org_generate_projects(with_tags: with_tags)
workdir = Dir.pwd
content = IO.read(File.expand_path('./org-config.el', __dir__))
- .gsub('__VERSION__', Neruda::VERSION)
+ .gsub('__VERSION__', Fronde::VERSION)
.gsub('__WORK_DIR__', workdir)
- .gsub('__NERUDA_DIR__', __dir__)
+ .gsub('__FRONDE_DIR__', __dir__)
.gsub('__ORG_VER__', org_last_version)
.gsub('__ALL_PROJECTS__', all_projects(projects))
.gsub('__THEME_CONFIG__', org_default_theme_config)
@@ -48,35 +48,38 @@ module Neruda
.gsub('__LONG_DATE_FMT__', r18n_full_datetime_format)
.gsub('__AUTHOR_EMAIL__', settings['author_email'] || '')
.gsub('__AUTHOR_NAME__', settings['author'])
- IO.write("#{workdir}/org-config.el", content)
+ FileUtils.mkdir_p "#{workdir}/var/lib"
+ IO.write("#{workdir}/var/lib/org-config.el", content)
end
# Generate emacs directory variables file.
#
# This method generate the file ~.dir-locals.el~, which is
- # responsible to load neruda Org settings when visiting an Org file
- # of this neruda instance.
+ # responsible to load fronde Org settings when visiting an Org file
+ # of this fronde instance.
#
# @return [Integer] the length written (as returned by the
# underlying ~IO.write~ method call)
def write_dir_locals
workdir = Dir.pwd
+ # rubocop:disable Layout/LineLength
IO.write(
"#{workdir}/.dir-locals.el",
- "((org-mode . ((eval . (load-file \"#{workdir}/org-config.el\")))))"
+ "((org-mode . ((eval . (load-file \"#{workdir}/var/lib/org-config.el\")))))"
)
+ # rubocop:enable Layout/LineLength
end
private
def r18n_full_datetime_format
locale = R18n.get.locale
- date_fmt = R18n.t.neruda.index.full_date_format(
+ date_fmt = R18n.t.fronde.index.full_date_format(
date: locale.full_format
)
date_fmt = locale.year_format.sub('_', date_fmt)
time_fmt = locale.time_format.delete('_').strip
- R18n.t.neruda.index.full_date_with_time_format(
+ R18n.t.fronde.index.full_date_with_time_format(
date: date_fmt, time: time_fmt
)
end
@@ -155,9 +158,9 @@ module Neruda
def org_default_postamble
<<~POSTAMBLE
- <p><span class="author">#{R18n.t.neruda.org.postamble.written_by}</span>
- #{R18n.t.neruda.org.postamble.with_emacs}</p>
- <p class="date">#{R18n.t.neruda.org.postamble.last_modification}</p>
+ <p><span class="author">#{R18n.t.fronde.org.postamble.written_by}</span>
+ #{R18n.t.fronde.org.postamble.with_emacs}</p>
+ <p class="date">#{R18n.t.fronde.org.postamble.last_modification}</p>
<p class="validation">%v</p>
POSTAMBLE
end
@@ -202,16 +205,22 @@ module Neruda
head.gsub('__ATOM_FEED__', atomfeed)
end
+ def cast_lisp_value(value)
+ return 't' if value.is_a?(TrueClass)
+ return 'nil' if value.nil? || value.is_a?(FalseClass)
+ value.strip.gsub(/"/, '\"')
+ end
+
def build_project_org_headers(project)
orgtplopts = org_default_html_options(project).merge(
settings['org-html'] || {}, project['org-html'] || {}
)
orgtpl = []
- truthy_val = ['t', 'nil', '1'].freeze
+ lisp_keywords = ['t', 'nil', '1', '-1', '0'].freeze
orgtplopts.each do |k, v|
v = expand_vars_in_html_head(v, project) if k == 'html-head'
- val = v.strip.gsub(/"/, '\"')
- if truthy_val.include? val
+ val = cast_lisp_value(v)
+ if lisp_keywords.include? val
orgtpl << ":#{k} #{val}"
else
orgtpl << ":#{k} \"#{val}\""
diff --git a/lib/neruda/config/org-config.el b/lib/fronde/config/org-config.el
index 8660b29..a4e20d0 100644
--- a/lib/neruda/config/org-config.el
+++ b/lib/fronde/config/org-config.el
@@ -1,11 +1,11 @@
;; Add org-mode to load path
-(add-to-list 'load-path (expand-file-name "org-__ORG_VER__/lisp" "__WORK_DIR__"))
+(add-to-list 'load-path (expand-file-name "org-__ORG_VER__/lisp" "__WORK_DIR__/lib"))
;; Load last version of htmlize.el
-(load-file (expand-file-name "htmlize.el" "__WORK_DIR__"))
+(load-file (expand-file-name "htmlize.el" "__WORK_DIR__/lib"))
;; Current project options
-(setq neruda/version "__VERSION__"
- neruda/current-work-dir "__WORK_DIR__"
+(setq fronde/version "__VERSION__"
+ fronde/current-work-dir "__WORK_DIR__"
user-mail-address "__AUTHOR_EMAIL__"
user-full-name "__AUTHOR_NAME__"
org-html-metadata-timestamp-format "__LONG_DATE_FMT__"
@@ -13,5 +13,5 @@
`(__ALL_PROJECTS____THEME_CONFIG__
("website" :components (__ALL_PROJECTS_NAMES__))))
-;; Load neruda lib
-(load-file (expand-file-name "ox-neruda.el" "__NERUDA_DIR__"))
+;; Load fronde lib
+(load-file (expand-file-name "ox-fronde.el" "__FRONDE_DIR__"))
diff --git a/lib/neruda/config/ox-neruda.el b/lib/fronde/config/ox-fronde.el
index 0a5e938..0a2842a 100644
--- a/lib/neruda/config/ox-neruda.el
+++ b/lib/fronde/config/ox-fronde.el
@@ -1,4 +1,4 @@
-;;; ox-neruda.el --- Neruda Gem specific helpers for Org Export Engine -*- lexical-binding: t; -*-
+;;; ox-fronde.el --- Fronde Gem specific helpers for Org Export Engine -*- lexical-binding: t; -*-
;; Copyright (C) 2011-2019 Free Software Foundation, Inc.
@@ -23,7 +23,7 @@
;;; Commentary:
;; This library implements specific helpers function, needed by the Ruby
-;; Gem Neruda, which offers an easy way to publish a static website
+;; Gem Fronde, which offers an easy way to publish a static website
;; using Org files as sources.
;;; Code:
@@ -33,17 +33,17 @@
;;; Function Declarations
-(defvar neruda/version ""
- "Version of the current neruda installation")
+(defvar fronde/version ""
+ "Version of the current fronde installation")
-(defvar neruda/current-work-dir nil
- "Location of the current neruda website base directory.")
+(defvar fronde/current-work-dir nil
+ "Location of the current fronde website base directory.")
-(defvar neruda/org-temp-dir nil
+(defvar fronde/org-temp-dir nil
"Location of the local Org temporary directory (where to place
org timestamps and id locations).")
-(defun neruda/org-html-format-spec (upstream info)
+(defun fronde/org-html-format-spec (upstream info)
"Return format specification for preamble and postamble.
INFO is a plist used as a communication channel."
(let ((output (funcall upstream info)))
@@ -58,14 +58,14 @@ INFO is a plist used as a communication channel."
"\n")))
output)
(push `(?l . ,(org-export-data (plist-get info :language) info)) output)
- (push `(?n . ,(format "Neruda %s" neruda/version)) output)
- (push `(?N . ,(format "<a href=\"https://git.umaneti.net/neruda/about/\">Neruda</a> %s" neruda/version)) output)
+ (push `(?n . ,(format "Fronde %s" fronde/version)) output)
+ (push `(?N . ,(format "<a href=\"https://git.umaneti.net/fronde/about/\">Fronde</a> %s" fronde/version)) output)
(push `(?x . ,(org-export-data (plist-get info :description) info)) output)
(push `(?X . ,(format "<p>%s</p>"
(org-export-data (plist-get info :description) info)))
output)))
-(defun neruda/org-i18n-export (link description format)
+(defun fronde/org-i18n-export (link description format)
"Export a i18n link"
(let* ((splitted-link (split-string link "|"))
(path (car splitted-link))
@@ -80,20 +80,20 @@ INFO is a plist used as a communication channel."
(`ascii (format "%s (%s)" desc path))
(_ path))))
-(defun neruda/org-i18n-follow (link)
+(defun fronde/org-i18n-follow (link)
"Visit a i18n link"
(browse-url (car (split-string link "|"))))
(org-link-set-parameters "i18n"
- :export #'neruda/org-i18n-export
- :follow #'neruda/org-i18n-follow)
+ :export #'fronde/org-i18n-export
+ :follow #'fronde/org-i18n-follow)
;;; Set configuration options
-(setq neruda/org-temp-dir (expand-file-name "tmp" neruda/current-work-dir)
- org-publish-timestamp-directory (expand-file-name "timestamps/" neruda/org-temp-dir)
- org-id-locations-file (expand-file-name "id-locations.el" neruda/org-temp-dir)
+(setq fronde/org-temp-dir (expand-file-name "var/tmp" fronde/current-work-dir)
+ org-publish-timestamp-directory (expand-file-name "timestamps/" fronde/org-temp-dir)
+ org-id-locations-file (expand-file-name "id-locations.el" fronde/org-temp-dir)
make-backup-files nil
enable-local-variables :all
org-confirm-babel-evaluate nil
@@ -107,8 +107,8 @@ INFO is a plist used as a communication channel."
(strike-through . "<del>%s</del>")
(underline . "<span class=\"underline\">%s</span>")
(verbatim . "<code>%s</code>")))
-(advice-add 'org-html-format-spec :around #'neruda/org-html-format-spec)
+(advice-add 'org-html-format-spec :around #'fronde/org-html-format-spec)
-(provide 'ox-neruda)
+(provide 'ox-fronde)
-;;; ox-neruda.el ends here
+;;; ox-fronde.el ends here
diff --git a/lib/neruda/emacs.rb b/lib/fronde/emacs.rb
index 21203e3..9522a5c 100644
--- a/lib/neruda/emacs.rb
+++ b/lib/fronde/emacs.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
-require 'neruda/config'
+require 'fronde/config'
-module Neruda
+module Fronde
# Wraps Gnu/Emacs calls
class Emacs
def initialize(file_path: nil, verbose: false)
@@ -12,7 +12,7 @@ module Neruda
def publish
command = emacs_command(
- '-l ./org-config.el', '--eval \'(org-publish "website")\''
+ '-l ./var/lib/org-config.el', '--eval \'(org-publish "website")\''
)
if @verbose
warn command
@@ -24,7 +24,7 @@ module Neruda
private
def emacs_command(*arguments)
- default_emacs = Neruda::Config.settings['emacs']
+ default_emacs = Fronde::Config.settings['emacs']
emacs_cmd = [
default_emacs || 'emacs -Q --batch -nw',
'--eval \'(setq enable-dir-local-variables nil)\''
diff --git a/lib/neruda/index.rb b/lib/fronde/index.rb
index 09ffc94..e7a349d 100644
--- a/lib/neruda/index.rb
+++ b/lib/fronde/index.rb
@@ -2,22 +2,22 @@
require 'fileutils'
require 'digest/md5'
-require 'neruda/config'
-require 'neruda/org_file'
-require 'neruda/index/atom_generator'
-require 'neruda/index/org_generator'
+require 'fronde/config'
+require 'fronde/org_file'
+require 'fronde/index/atom_generator'
+require 'fronde/index/org_generator'
-module Neruda
+module Fronde
# Generates website indexes and atom feeds for all the org documents
# keywords.
class Index
attr_reader :date
- include Neruda::IndexAtomGenerator
- include Neruda::IndexOrgGenerator
+ include Fronde::IndexAtomGenerator
+ include Fronde::IndexOrgGenerator
def initialize
- @pubdir = Neruda::Config.settings['public_folder']
+ @pubdir = Fronde::Config.settings['public_folder']
@index = { 'index' => [] }
@projects = {}
@tags_names = {}
@@ -59,7 +59,7 @@ module Neruda
private
def feed
- Neruda::Config.sources.each do |project|
+ Fronde::Config.sources.each do |project|
next unless project['is_blog']
if project['recursive']
file_pattern = '**/*.org'
@@ -70,7 +70,7 @@ module Neruda
org_file = File.join(project['path'], s)
next if exclude_file?(org_file, project)
add_to_indexes(
- Neruda::OrgFile.new(org_file, project: project)
+ Fronde::OrgFile.new(org_file, project: project)
)
end
end
@@ -86,7 +86,7 @@ module Neruda
@index['index'] << article
add_to_project_index article
article.keywords.each do |k|
- slug = Neruda::OrgFile.slug k
+ slug = Fronde::OrgFile.slug k
@tags_names[slug] = k # Overwrite is permitted
@index[slug] ||= []
@index[slug] << article
@@ -121,7 +121,7 @@ module Neruda
def save?
return true unless empty?
- Neruda::Config.sources.each do |project|
+ Fronde::Config.sources.each do |project|
return true if project['is_blog'] && Dir.exist?(project['path'])
end
false
diff --git a/lib/neruda/index/atom_generator.rb b/lib/fronde/index/atom_generator.rb
index ad12462..2a47028 100644
--- a/lib/neruda/index/atom_generator.rb
+++ b/lib/fronde/index/atom_generator.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
require 'cgi'
-require 'neruda/config'
+require 'fronde/config'
-module Neruda
+module Fronde
# Embeds Atom feeds sepecific methods
module IndexAtomGenerator
def to_atom(index_name = 'index')
@@ -16,7 +16,7 @@ module Neruda
def write_atom(index_name)
return unless save?
- slug = Neruda::OrgFile.slug index_name
+ slug = Fronde::OrgFile.slug index_name
FileUtils.mkdir_p "#{@pubdir}/feeds"
atomdest = "#{@pubdir}/feeds/#{slug}.xml"
IO.write(atomdest, to_atom(index_name))
@@ -29,15 +29,15 @@ module Neruda
# @param title [String] the title of the current atom feed
# @return [String] the Atom header as a String
def atom_header(title)
- domain = Neruda::Config.settings['domain']
+ domain = Fronde::Config.settings['domain']
upddate = @date.rfc3339
if title == 'index'
slug = 'index'
tagurl = domain
- title = Neruda::Config.settings['title'] || \
- R18n.t.neruda.index.all_tags
+ title = Fronde::Config.settings['title'] || \
+ R18n.t.fronde.index.all_tags
else
- slug = Neruda::OrgFile.slug(title)
+ slug = Fronde::OrgFile.slug(title)
tagurl = "#{domain}/tags/#{slug}.html"
title = @tags_names[title]
end
@@ -47,21 +47,21 @@ module Neruda
<feed xmlns="http://www.w3.org/2005/Atom"
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:wfw="http://wellformedweb.org/CommentAPI/"
- xml:lang="#{Neruda::Config.settings['lang']}">
+ xml:lang="#{Fronde::Config.settings['lang']}">
<title>#{title}</title>
<link href="#{domain}/feeds/#{slug}.xml" rel="self" type="application/atom+xml"/>
<link href="#{tagurl}" rel="alternate" type="text/html" title="#{title}"/>
<updated>#{upddate}</updated>
- <author><name>#{Neruda::Config.settings['author'] || ''}</name></author>
+ <author><name>#{Fronde::Config.settings['author'] || ''}</name></author>
<id>urn:md5:#{Digest::MD5.hexdigest(domain)}</id>
- <generator uri="https://git.umaneti.net/neruda/about/">Neruda</generator>
+ <generator uri="https://git.umaneti.net/fronde/about/">Fronde</generator>
ENDATOM
end
# Render an Atom feed entry.
#
- # @param article [Neruda::OrgFile] the related org document for this
+ # @param article [Fronde::OrgFile] the related org document for this
# entry
# @return [String] the Atom entry as a String
def atom_entry(article)
diff --git a/lib/neruda/index/org_generator.rb b/lib/fronde/index/org_generator.rb
index f864329..6818dd8 100644
--- a/lib/neruda/index/org_generator.rb
+++ b/lib/fronde/index/org_generator.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-module Neruda
+module Fronde
# Embeds methods responsible for generating an org file for a given
# index.
module IndexOrgGenerator
@@ -14,7 +14,7 @@ module Neruda
def write_org(index_name)
return unless save?
- slug = Neruda::OrgFile.slug index_name
+ slug = Fronde::OrgFile.slug index_name
FileUtils.mkdir 'tags' unless Dir.exist? 'tags'
content = to_org index_name
orgdest = "tags/#{slug}.org"
@@ -32,7 +32,7 @@ module Neruda
end
def write_all_blog_home(verbose)
- Neruda::Config.sources.each do |project|
+ Fronde::Config.sources.each do |project|
next unless project['is_blog']
next unless Dir.exist?(project['path'])
warn "Generated blog home for #{project['name']}" if verbose
@@ -43,11 +43,11 @@ module Neruda
def all_tags_index
content = [
- org_header(R18n.t.neruda.index.all_tags, is_tag: false)
+ org_header(R18n.t.fronde.index.all_tags, is_tag: false)
]
sort_tags_by_name_and_weight.each do |t, tags|
content << ''
- content << org_title(R18n.t.neruda.index.send(t), 'index-tags')
+ content << org_title(R18n.t.fronde.index.send(t), 'index-tags')
next if tags.empty?
tags.each do |k|
content << "- #{tag_published_url(k)} (#{@index[k].length})"
@@ -57,7 +57,7 @@ module Neruda
end
def tag_published_url(tag_name)
- domain = Neruda::Config.settings['domain']
+ domain = Fronde::Config.settings['domain']
title = @tags_names[tag_name]
tag_link = "#{domain}/tags/#{tag_name}.html"
"[[#{tag_link}][#{title}]]"
@@ -67,12 +67,12 @@ module Neruda
if is_tag
title = @tags_names[title]
elsif title.nil? || title == 'index'
- title = Neruda::Config.settings['title']
+ title = Fronde::Config.settings['title']
end
<<~HEADER.strip
#+title: #{title}
- #+author: #{Neruda::Config.settings['author']}
- #+language: #{Neruda::Config.settings['lang']}
+ #+author: #{Fronde::Config.settings['author']}
+ #+language: #{Fronde::Config.settings['lang']}
HEADER
end
@@ -93,7 +93,7 @@ module Neruda
line = "- *[[#{article.url}][#{article.title}]]*"
if article.date
art_date = article.datestring(:full, year: false)
- published = R18n.t.neruda.index.published_on art_date
+ published = R18n.t.fronde.index.published_on art_date
line += " / #{published}"
end
line += " \\\\\n #{article.excerpt}" if article.excerpt != ''
@@ -101,7 +101,7 @@ module Neruda
end
def org_title(year, html_class = 'index-year')
- year = R18n.t.neruda.index.unsorted if year == '0000'
+ year = R18n.t.fronde.index.unsorted if year == '0000'
<<~ENDPROP
* #{year}
:PROPERTIES:
diff --git a/lib/neruda/org_file.rb b/lib/fronde/org_file.rb
index e6dd000..19b5743 100644
--- a/lib/neruda/org_file.rb
+++ b/lib/fronde/org_file.rb
@@ -2,14 +2,14 @@
require 'time'
require 'fileutils'
-# neruda/config is required by htmlizer
-require 'neruda/org_file/htmlizer'
-require 'neruda/org_file/extracter'
-require 'neruda/org_file/class_methods'
-require 'neruda/index'
-require 'neruda/version'
+# fronde/config is required by htmlizer
+require 'fronde/org_file/htmlizer'
+require 'fronde/org_file/extracter'
+require 'fronde/org_file/class_methods'
+require 'fronde/index'
+require 'fronde/version'
-module Neruda
+module Fronde
# Handles org files.
#
# This class is responsible for reading or writing existing or new org
@@ -73,10 +73,10 @@ module Neruda
# @return [String] the project owning this document.
attr_reader :project
- extend Neruda::OrgFileClassMethods
+ extend Fronde::OrgFileClassMethods
- include Neruda::OrgFileExtracter
- include Neruda::OrgFileHtmlizer
+ include Fronde::OrgFileExtracter
+ include Fronde::OrgFileHtmlizer
# Prepares the file named by ~file_name~ for read and write
# operations.
@@ -87,20 +87,20 @@ module Neruda
# @example
# File.exist? './test.org'
# => true
- # o = Neruda::OrgFile.new('./test.org')
- # => #<Neruda::OrgFile @file='./test.org'...>
+ # o = Fronde::OrgFile.new('./test.org')
+ # => #<Fronde::OrgFile @file='./test.org'...>
# o.title
# => "This is an existing test file"
# File.exist? '/tmp/does_not_exist.org'
# => false
- # o = Neruda::OrgFile.new('/tmp/does_not_exist.org')
- # => #<Neruda::OrgFile @file='/tmp/does_not_exist.org'...>
+ # o = Fronde::OrgFile.new('/tmp/does_not_exist.org')
+ # => #<Fronde::OrgFile @file='/tmp/does_not_exist.org'...>
# o.title
# => ""
# File.exist? '/tmp/other.org'
# => false
- # o = Neruda::OrgFile.new('/tmp/other.org', title: 'New file')
- # => #<Neruda::OrgFile @file='/tmp/other.org'...>
+ # o = Fronde::OrgFile.new('/tmp/other.org', title: 'New file')
+ # => #<Fronde::OrgFile @file='/tmp/other.org'...>
# o.title
# => "New file"
#
@@ -110,11 +110,11 @@ module Neruda
# @option opts [String] author (system user or '') the author of the
# document
# @option opts [Boolean] verbose (false) if the
- # {Neruda::OrgFileHtmlizer#publish publish} method should output
+ # {Fronde::OrgFileHtmlizer#publish publish} method should output
# emacs process messages
# @option opts [String] project the project owning this file
# must be stored
- # @return [Neruda::OrgFile] the new instance of Neruda::OrgFile
+ # @return [Fronde::OrgFile] the new instance of Fronde::OrgFile
def initialize(file_name, opts = {})
file_name = nil if file_name == ''
@file = file_name
@@ -183,11 +183,11 @@ module Neruda
return R18n.l @date.to_date if dateformat == :short
return @date.rfc3339 if dateformat == :rfc3339
locale = R18n.get.locale
- long_fmt = R18n.t.neruda.index.full_date_format(
+ long_fmt = R18n.t.fronde.index.full_date_format(
date: locale.format_date_full(@date, year)
)
unless @notime
- long_fmt = R18n.t.neruda.index.full_date_with_time_format(
+ long_fmt = R18n.t.fronde.index.full_date_with_time_format(
date: long_fmt, time: locale.time_format.delete('_').strip
)
end
@@ -199,6 +199,8 @@ module Neruda
# This method expects to find percent-tags in the given ~string~ and
# replace them by their corresponding value.
#
+ # It reuses the same tags than the ~org-html-format-spec~ method.
+ #
# *** Format:
#
# - %a :: the raw author name
@@ -213,9 +215,9 @@ module Neruda
# - %K :: the HTML list rendering of the keywords
# - %l :: the lang of the document
# - %L :: the license information, taken from the
- # {Neruda::Config#settings}
- # - %n :: the Neruda name and version
- # - %N :: the Neruda name and version with a link to the project
+ # {Fronde::Config#settings}
+ # - %n :: the Fronde name and version
+ # - %N :: the Fronde name and version with a link to the project
# home on the name
# - %s :: the subtitle of the document
# - %t :: the title of the document
@@ -241,9 +243,9 @@ module Neruda
.gsub('%k', @keywords.join(', '))
.gsub('%K', keywords_to_html)
.gsub('%l', @lang)
- .gsub('%L', (Neruda::Config.settings['license'] || '').gsub(/\s+/, ' ').strip)
- .gsub('%n', "Neruda #{Neruda::VERSION}")
- .gsub('%N', "<a href=\"https://git.umaneti.net/neruda/about/\">Neruda</a> #{Neruda::VERSION}")
+ .gsub('%L', (Fronde::Config.settings['license'] || '').gsub(/\s+/, ' ').strip)
+ .gsub('%n', "Fronde #{Fronde::VERSION}")
+ .gsub('%N', "<a href=\"https://git.umaneti.net/fronde/about/\">Fronde</a> #{Fronde::VERSION}")
.gsub('%s', @subtitle)
.gsub('%t', @title)
.gsub('%u', @html_file || '')
@@ -270,10 +272,10 @@ module Neruda
def build_html_file_and_url
return if @file.nil?
- @html_file = Neruda::OrgFile.target_for_source(
+ @html_file = Fronde::OrgFile.target_for_source(
@file, @project, with_public_folder: false
)
- @url = "#{Neruda::Config.settings['domain']}/#{@html_file}"
+ @url = "#{Fronde::Config.settings['domain']}/#{@html_file}"
end
def init_empty_file
@@ -281,9 +283,9 @@ module Neruda
@subtitle = ''
@date = DateTime.now
@notime = false
- @author = @options[:author] || Neruda::Config.settings['author']
+ @author = @options[:author] || Fronde::Config.settings['author']
@keywords = []
- @lang = @options[:lang] || Neruda::Config.settings['lang']
+ @lang = @options[:lang] || Fronde::Config.settings['lang']
@excerpt = ''
body = @options[:content] || ''
@content = @options[:raw_content] || <<~ORG
diff --git a/lib/neruda/org_file/class_methods.rb b/lib/fronde/org_file/class_methods.rb
index 352bab8..a4e3f43 100644
--- a/lib/neruda/org_file/class_methods.rb
+++ b/lib/fronde/org_file/class_methods.rb
@@ -1,15 +1,15 @@
# frozen_string_literal: true
-module Neruda
- # This module holds class methods for the {Neruda::OrgFile} class.
+module Fronde
+ # This module holds class methods for the {Fronde::OrgFile} class.
module OrgFileClassMethods
def source_for_target(file_name)
# file_name may be frozen...
src = file_name.sub(/\.html\z/, '.org')
- pubfolder = Neruda::Config.settings['public_folder']
+ pubfolder = Fronde::Config.settings['public_folder']
src.sub!(/^#{pubfolder}\//, '')
# Look for match in each possible sources. The first found wins.
- Neruda::Config.sources.each do |project|
+ Fronde::Config.sources.each do |project|
if project['target'] == '.'
origin = File.join(project['path'], src)
else
@@ -36,13 +36,13 @@ module Neruda
target = "#{project['target']}/#{target}" if project['target'] != '.'
end
return target unless with_public_folder
- pubfolder = Neruda::Config.settings['public_folder']
+ pubfolder = Fronde::Config.settings['public_folder']
"#{pubfolder}/#{target}"
end
def project_for_source(file_name)
# Look for match in each possible sources. The first found wins.
- Neruda::Config.sources.each do |project|
+ Fronde::Config.sources.each do |project|
project_relative_path = project['path'].sub(/^#{Dir.pwd}\//, '')
return project if file_name.match?(/^#{project_relative_path}\//)
end
diff --git a/lib/neruda/org_file/extracter.rb b/lib/fronde/org_file/extracter.rb
index ac5b783..05f211d 100644
--- a/lib/neruda/org_file/extracter.rb
+++ b/lib/fronde/org_file/extracter.rb
@@ -1,12 +1,12 @@
# frozen_string_literal: true
-module Neruda
- # This module holds extracter methods for the {Neruda::OrgFile} class.
+module Fronde
+ # This module holds extracter methods for the {Fronde::OrgFile} class.
module OrgFileExtracter
private
# Main method, which will call the other to initialize an
- # {Neruda::OrgFile} instance.
+ # {Fronde::OrgFile} instance.
def extract_data
@content = IO.read @file
@title = extract_title
@@ -49,7 +49,7 @@ module Neruda
def extract_author
m = /^#\+author:(.+)$/i.match(@content)
- return Neruda::Config.settings['author'] if m.nil?
+ return Fronde::Config.settings['author'] if m.nil?
m[1].strip
end
@@ -61,7 +61,7 @@ module Neruda
def extract_lang
m = /^#\+language:(.+)$/i.match(@content)
- return Neruda::Config.settings['lang'] if m.nil?
+ return Fronde::Config.settings['lang'] if m.nil?
m[1].strip
end
diff --git a/lib/neruda/org_file/htmlizer.rb b/lib/fronde/org_file/htmlizer.rb
index 9973c10..953f120 100644
--- a/lib/neruda/org_file/htmlizer.rb
+++ b/lib/fronde/org_file/htmlizer.rb
@@ -1,30 +1,30 @@
# frozen_string_literal: true
-require 'neruda/config'
-require 'neruda/emacs'
+require 'fronde/config'
+require 'fronde/emacs'
-module Neruda
- # This module holds HTML formatter methods for the {Neruda::OrgFile}
+module Fronde
+ # This module holds HTML formatter methods for the {Fronde::OrgFile}
# class.
module OrgFileHtmlizer
private
- # Format {Neruda::OrgFile#keywords} list in an HTML listing.
+ # Format {Fronde::OrgFile#keywords} list in an HTML listing.
#
# @return [String] the HTML keywords list
def keywords_to_html
- domain = Neruda::Config.settings['domain']
+ domain = Fronde::Config.settings['domain']
klist = @keywords.map do |k|
<<~KEYWORDLINK
<li class="keyword">
- <a href="#{domain}/tags/#{Neruda::OrgFile.slug(k)}.html">#{k}</a>
+ <a href="#{domain}/tags/#{Fronde::OrgFile.slug(k)}.html">#{k}</a>
</li>
KEYWORDLINK
end.join
"<ul class=\"keywords-list\">#{klist}</ul>"
end
- # Format {Neruda::OrgFile#date} as a HTML `time` tag.
+ # Format {Fronde::OrgFile#date} as a HTML `time` tag.
#
# @return [String] the HTML `time` tag
def date_to_html(dateformat = :full)
@@ -32,7 +32,7 @@ module Neruda
"<time datetime=\"#{@date.rfc3339}\">#{datestring(dateformat)}</time>"
end
- # Format {Neruda::OrgFile#author} in a HTML `span` tag with a
+ # Format {Fronde::OrgFile#author} in a HTML `span` tag with a
# specific class.
#
# @return [String] the author HTML `span`
diff --git a/lib/neruda/preview.rb b/lib/fronde/preview.rb
index 710a06b..62a0110 100644
--- a/lib/neruda/preview.rb
+++ b/lib/fronde/preview.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
require 'webrick'
-require 'neruda/config'
+require 'fronde/config'
-module Neruda # rubocop:disable Style/Documentation
+module Fronde # rubocop:disable Style/Documentation
# A tiny preview server, which main goal is to replace references to
# the target domain by localhost.
class PreviewServlet < WEBrick::HTTPServlet::AbstractServlet
@@ -19,9 +19,9 @@ module Neruda # rubocop:disable Style/Documentation
private
def local_path(requested_path)
- routes = Neruda::Config.settings.dig('preview', 'routes') || {}
+ routes = Fronde::Config.settings.dig('preview', 'routes') || {}
return routes[requested_path] if routes.has_key? requested_path
- local_path = Neruda::Config.settings['public_folder'] + requested_path
+ local_path = Fronde::Config.settings['public_folder'] + requested_path
if File.directory? local_path
local_path = format(
'%<path>s/index.html', path: local_path.delete_suffix('/')
@@ -34,7 +34,7 @@ module Neruda # rubocop:disable Style/Documentation
def parse_body(local_path, local_host)
body = IO.read local_path
return body unless local_path.match?(/\.(?:ht|x)ml\z/)
- domain = Neruda::Config.settings['domain']
+ domain = Fronde::Config.settings['domain']
return body if domain == ''
body.gsub(/"file:\/\//, format('"%<host>s', host: local_host))
.gsub(/"#{domain}/, format('"%<host>s', host: local_host))
@@ -45,9 +45,9 @@ module Neruda # rubocop:disable Style/Documentation
def start_preview
# Inspired by ruby un.rb library, which allows normally to start a
# webrick server in one line: ruby -run -e httpd public_html -p 5000
- port = Neruda::Config.settings.dig('preview', 'server_port') || 5000
+ port = Fronde::Config.settings.dig('preview', 'server_port') || 5000
s = WEBrick::HTTPServer.new(Port: port)
- s.mount '/', Neruda::PreviewServlet
+ s.mount '/', Fronde::PreviewServlet
['TERM', 'QUIT', 'INT'].each { |sig| trap(sig, proc { s.shutdown }) }
s.start
end
diff --git a/lib/neruda/templater.rb b/lib/fronde/templater.rb
index 8adb8d0..54da13b 100644
--- a/lib/neruda/templater.rb
+++ b/lib/fronde/templater.rb
@@ -2,9 +2,9 @@
require 'nokogiri'
require 'digest/md5'
-require 'neruda/org_file'
+require 'fronde/org_file'
-module Neruda
+module Fronde
# Insert custom part inside generated HTML files.
class Templater
def initialize(source, dom, opts = {})
@@ -14,7 +14,7 @@ module Neruda
@content = extract_content opts
@element = @dom.css(opts['selector'])
digest = Digest::MD5.hexdigest(@content)
- @check_line = " Neruda Template: #{digest} "
+ @check_line = " Fronde Template: #{digest} "
end
def apply
@@ -37,12 +37,12 @@ module Neruda
templates_to_apply = filter_templates(file_name)
return if templates_to_apply.empty?
if source.nil?
- sourcepath = Neruda::OrgFile.source_for_target(file_name)
- source = Neruda::OrgFile.new(sourcepath)
+ sourcepath = Fronde::OrgFile.source_for_target(file_name)
+ source = Fronde::OrgFile.new(sourcepath)
end
dom = open_dom(file_name)
templates_to_apply.each do |t|
- tpl = Neruda::Templater.new(source, dom, t)
+ tpl = Fronde::Templater.new(source, dom, t)
next if tpl.in_head?
tpl.apply
end
@@ -52,7 +52,7 @@ module Neruda
private
def filter_templates(file_name)
- templates = Neruda::Config.settings['templates']
+ templates = Fronde::Config.settings['templates']
return [] if templates.nil? || templates.empty?
templates.filter { |t| check_required_keys(t, file_name) }
end
@@ -71,7 +71,7 @@ module Neruda
end
def check_path(file_name, pathes)
- pub_folder = Neruda::Config.settings['public_folder']
+ pub_folder = Fronde::Config.settings['public_folder']
if pathes.is_a?(Array)
pathes.each do |tp|
return true if File.fnmatch?("#{pub_folder}#{tp}",
diff --git a/lib/neruda/utils.rb b/lib/fronde/utils.rb
index f5c0cb8..f3235d0 100644
--- a/lib/neruda/utils.rb
+++ b/lib/fronde/utils.rb
@@ -4,9 +4,9 @@ require 'uri'
require 'rainbow'
require 'net/http'
require 'r18n-core'
-require 'neruda/config'
+require 'fronde/config'
-module Neruda
+module Fronde
# Embeds usefull methods, mainly used in rake tasks.
module Utils
# @return [Hash] the possible throbber themes
@@ -22,26 +22,25 @@ module Neruda
'⡀ ⠄ ⠂ ⠁ ⠂ ⠄ ⡀', '⠄ ⡀ ⠄ ⠂ ⠁ ⠂ ⠄', '⠂ ⠄ ⡀ ⠄ ⠂ ⠁ ⠂']
}.freeze
- # @return [Hash] the possible ~pablo~ options and their
+ # @return [Hash] the possible ~fronde~ options and their
# configuration
- PABLO_OPTIONS = {
+ FRONDE_OPTIONS = {
'-a' => { long: 'author' },
'-f' => { long: 'force', boolean: true },
'-h' => { long: 'help', boolean: true, meth: :on_tail },
'-l' => { long: 'lang', keyword: 'LOCALE' },
- '-p' => { long: 'path' },
'-t' => { long: 'title' },
'-v' => { long: 'verbose', boolean: true, meth: :on_tail },
'-V' => { long: 'version', boolean: true, meth: :on_tail }
}.freeze
- # @return [Hash] the possible ~pablo~ subcommands and their
+ # @return [Hash] the possible ~fronde~ subcommands and their
# configuration
- PABLO_COMMANDS = {
+ FRONDE_COMMANDS = {
'init' => { opts: ['-a', '-h', '-l', '-t', '-v'] },
'config' => { alias: 'init' },
'preview' => { opts: ['-h'] },
- 'open' => { opts: ['-a', '-h', '-l', '-p', '-t', '-v'] },
+ 'open' => { opts: ['-a', '-h', '-l', '-t', '-v'] },
'edit' => { alias: 'open' },
'build' => { opts: ['-f', '-h'] },
'publish' => { opts: ['-h'] },
@@ -55,11 +54,11 @@ module Neruda
#
# The animation is chosen among a bunch of themes, with the
# configuration option ~throbber~ (retrieved via
- # {Neruda::Config#settings}).
+ # {Fronde::Config#settings}).
#
# @example
# long_stuff = Thread.new { very_long_operation }
- # Neruda::Utils.throbber(long_stuff, 'Computing hard stuff:')
+ # Fronde::Utils.throbber(long_stuff, 'Computing hard stuff:')
#
# @param thread [Thread] the long-running operation to decorate
# @param message [String] the message to display before the throbber
@@ -80,53 +79,53 @@ module Neruda
# Returns the short and long options specification for a given
# short option.
#
- # This method use the {Neruda::Utils::PABLO_OPTIONS} Hash to
+ # This method use the {Fronde::Utils::FRONDE_OPTIONS} Hash to
# retrieve corresponding values.
#
# @example
- # spec = Neruda::Utils.decorate_option('-a')
+ # spec = Fronde::Utils.decorate_option('-a')
# => ['-a AUTHOR', '--author AUTHOR']
#
# @param short [String] the short option to decorate
# @return [Array] the short and long specification for an option
def decorate_option(short)
- opt = Neruda::Utils::PABLO_OPTIONS[short]
+ opt = Fronde::Utils::FRONDE_OPTIONS[short]
long = "--#{opt[:long]}"
return [short, long] if opt[:boolean]
key = opt[:keyword] || opt[:long].upcase
[short + key, format('%<long>s %<key>s', long: long, key: key)]
end
- # Returns the ~pablo~ help summary for a given command.
+ # Returns the ~fronde~ help summary for a given command.
#
# @param command [String] the command for which a summary
# should be given
# @return [String]
def summarize_command(command)
- Neruda::Utils::PABLO_COMMANDS[command][:opts].map do |k|
- short, long = Neruda::Utils.decorate_option(k)
- opt = Neruda::Utils::PABLO_OPTIONS[k]
+ Fronde::Utils::FRONDE_COMMANDS[command][:opts].map do |k|
+ short, long = Fronde::Utils.decorate_option(k)
+ opt = Fronde::Utils::FRONDE_OPTIONS[k]
label = [short, long].join(', ')
line = [format(' %<opt>s', opt: label).ljust(30)]
- if R18n.t.pablo.options[opt[:long]].translated?
- line << R18n.t.pablo.options[opt[:long]]
+ if R18n.t.fronde.bin.options[opt[:long]].translated?
+ line << R18n.t.fronde.bin.options[opt[:long]]
end
line.join(' ')
end.join("\n")
end
- # Returns a formatted list of available commands for ~pablo~.
+ # Returns a formatted list of available commands for ~fronde~.
#
# @return [String]
def list_commands
lines = []
- Neruda::Utils::PABLO_COMMANDS.each do |cmd, opt|
+ Fronde::Utils::FRONDE_COMMANDS.each do |cmd, opt|
next if cmd == 'basic'
line = [' ', cmd.ljust(10)]
if opt.has_key? :alias
- line << R18n.t.pablo.commands.alias(opt[:alias])
+ line << R18n.t.fronde.bin.commands.alias(opt[:alias])
else
- line << R18n.t.pablo.commands[cmd]
+ line << R18n.t.fronde.bin.commands[cmd]
end
lines << line.join(' ')
end
@@ -139,8 +138,8 @@ module Neruda
# @param command [String] the command to resolve
# @return [String]
def resolve_possible_alias(command)
- return 'basic' unless Neruda::Utils::PABLO_COMMANDS.include?(command)
- cmd_opt = Neruda::Utils::PABLO_COMMANDS[command]
+ return 'basic' unless Fronde::Utils::FRONDE_COMMANDS.include?(command)
+ cmd_opt = Fronde::Utils::FRONDE_COMMANDS[command]
return cmd_opt[:alias] if cmd_opt.has_key?(:alias)
command
end
@@ -160,15 +159,16 @@ module Neruda
# Download latest org-mode tarball.
#
+ # @param destination [String] where to save the org-mode tarball
# @return [String] the downloaded org-mode version
- def download_org
+ def download_org(destination = 'var/tmp')
# :nocov:
- return if Neruda::Config.org_last_version.nil?
+ return if Fronde::Config.org_last_version.nil?
# :nocov:
- tarball = "org-#{Neruda::Config.org_last_version}.tar.gz"
+ tarball = "org-#{Fronde::Config.org_last_version}.tar.gz"
# Remove version number in dest file to allow easy rake file
# task naming
- dest_file = 'tmp/org.tar.gz'
+ dest_file = File.expand_path('org.tar.gz', destination)
return if File.exist?(dest_file)
uri = URI("https://orgmode.org/#{tarball}")
# Will crash on purpose if anything goes wrong
@@ -188,16 +188,16 @@ module Neruda
format(
"%<message>s %<label>s\n%<explanation>s",
message: message,
- label: Rainbow(R18n.t.neruda.error.label).bold.red,
- explanation: Rainbow(R18n.t.neruda.error.explanation).bold
+ label: Rainbow(R18n.t.fronde.error.label).bold.red,
+ explanation: Rainbow(R18n.t.fronde.error.explanation).bold
)
)
end
def select_throbber_frames
- model = Neruda::Config.settings['throbber'] || 'default'
- model = 'default' unless Neruda::Utils::THROBBER_FRAMES.has_key?(model)
- Neruda::Utils::THROBBER_FRAMES[model]
+ model = Fronde::Config.settings['throbber'] || 'default'
+ model = 'default' unless Fronde::Utils::THROBBER_FRAMES.has_key?(model)
+ Fronde::Utils::THROBBER_FRAMES[model]
end
def run_and_decorate_thread(thread, message, frames)
diff --git a/lib/fronde/version.rb b/lib/fronde/version.rb
new file mode 100644
index 0000000..d33008b
--- /dev/null
+++ b/lib/fronde/version.rb
@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Fronde
+ # @return [String] the version number of the current Fronde release.
+ VERSION = '0.3.0'
+end
diff --git a/lib/neruda/version.rb b/lib/neruda/version.rb
deleted file mode 100644
index a865421..0000000
--- a/lib/neruda/version.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Neruda
- # @return [String] the version number of the current Neruda release.
- VERSION = '0.2.4'
-end
diff --git a/lib/tasks/org.rake b/lib/tasks/org.rake
index cdc5a75..fa1db36 100644
--- a/lib/tasks/org.rake
+++ b/lib/tasks/org.rake
@@ -2,48 +2,51 @@
require 'open-uri'
-# Neruda::Config is required by Neruda::Utils
-require 'neruda/utils'
+# Fronde::Config is required by Fronde::Utils
+require 'fronde/utils'
require 'rake/clean'
CLOBBER.push(
- 'tmp/org.tar.gz', 'tmp/__last_org_version__',
- 'org-config.el', '.dir-locals.el', 'htmlize.el'
+ 'var/tmp/org.tar.gz', 'var/tmp/last_org_version',
+ 'var/lib/org-config.el', '.dir-locals.el', 'lib/htmlize.el'
)
namespace :org do
+ directory 'var/tmp'
+
desc 'Download last version of Org'
- file 'tmp/org.tar.gz' do
+ file 'var/tmp/org.tar.gz' => 'var/tmp' do
verbose = Rake::FileUtilsExt.verbose_flag
download = Thread.new do
- Thread.current[:org_version] = Neruda::Config.org_last_version
- Neruda::Utils.download_org
+ Thread.current[:org_version] = Fronde::Config.org_last_version
+ Fronde::Utils.download_org
end
if verbose
download.join
warn "Org version #{download[:org_version]} has been downloaded"
else
- Neruda::Utils.throbber(download, 'Downloading Org:')
+ Fronde::Utils.throbber(download, 'Downloading Org:')
end
end
desc 'Compile Org'
- task compile: 'tmp/org.tar.gz' do |task|
+ task compile: 'var/tmp/org.tar.gz' do |task|
verbose = Rake::FileUtilsExt.verbose_flag
- org_version = "org-#{Neruda::Config.org_last_version}"
- next if Dir.exist?("#{org_version}/lisp")
- make = ['make', '-C', org_version]
+ org_version = Fronde::Config.org_last_version
+ org_dir = "lib/org-#{org_version}"
+ next if Dir.exist?("#{org_dir}/lisp")
+ make = ['make', '-C', org_dir]
unless verbose
make << '-s'
make << 'EMACSQ="emacs -Q --eval \'(setq inhibit-message t)\'"'
end
build = Thread.new do
- sh "tar xzf #{task.prerequisites[0]}"
+ sh "tar -C lib -xzf #{task.prerequisites[0]}"
sh((make + ['compile']).join(' '))
sh((make + ['autoloads']).join(' '))
- Dir.glob('org-[0-9.]*').each do |ov|
- next if ov == org_version
+ Dir.glob('lib/org-[0-9.]*').each do |ov|
+ next if ov == org_dir
rm_r ov
end
end
@@ -51,29 +54,31 @@ namespace :org do
build.join
warn "#{org_version} has been locally installed"
else
- Neruda::Utils.throbber(build, 'Installing Org:')
+ Fronde::Utils.throbber(build, 'Installing Org:')
end
end
- file 'htmlize.el' do
+ directory 'lib'
+
+ file 'lib/htmlize.el' => 'lib' do
htmlize = URI(
'https://raw.githubusercontent.com/hniksic/emacs-htmlize/master/htmlize.el'
).open.read
- IO.write 'htmlize.el', htmlize
+ IO.write 'lib/htmlize.el', htmlize
end
- file 'org-config.el' => 'htmlize.el' do
- Neruda::Config.write_org_lisp_config
+ file 'var/lib/org-config.el' => 'lib/htmlize.el' do
+ Fronde::Config.write_org_lisp_config
end
- file '.dir-locals.el' do
- Neruda::Config.write_dir_locals
+ file '.dir-locals.el' => 'var/lib/org-config.el' do
+ Fronde::Config.write_dir_locals
end
desc 'Install Org'
- multitask install: ['org:compile', 'org-config.el', '.dir-locals.el'] do
- mkdir_p "#{Neruda::Config.settings['public_folder']}/assets"
- Neruda::Config.sources.each do |s|
+ multitask install: ['org:compile', '.dir-locals.el'] do
+ mkdir_p "#{Fronde::Config.settings['public_folder']}/assets"
+ Fronde::Config.sources.each do |s|
mkdir_p s['path'] unless Dir.exist? s['path']
end
end
diff --git a/lib/tasks/site.rake b/lib/tasks/site.rake
index ed73534..6027ef8 100644
--- a/lib/tasks/site.rake
+++ b/lib/tasks/site.rake
@@ -1,15 +1,15 @@
# frozen_string_literal: true
-require 'neruda/emacs'
-require 'neruda/index'
-require 'neruda/utils'
-require 'neruda/org_file'
-require 'neruda/templater'
+require 'fronde/emacs'
+require 'fronde/index'
+require 'fronde/utils'
+require 'fronde/org_file'
+require 'fronde/templater'
namespace :site do
desc 'Generates all index files'
task :index do
- index = Neruda::Index.new
+ index = Fronde::Index.new
verbose = Rake::FileUtilsExt.verbose_flag
if verbose
index.write_all
@@ -18,20 +18,20 @@ namespace :site do
build = Thread.new do
index.write_all(verbose: false)
end
- Neruda::Utils.throbber(build, 'Generating indexes:')
+ Fronde::Utils.throbber(build, 'Generating indexes:')
next if index.empty?
- Neruda::Config.write_org_lisp_config(with_tags: true)
+ Fronde::Config.write_org_lisp_config(with_tags: true)
end
desc 'Convert and customize all org files'
- task :build, [:force?] => ['org-config.el', :index] do |_, args|
+ task :build, [:force?] => ['var/lib/org-config.el', :index] do |_, args|
args.with_defaults(:force? => false)
build_html = Thread.new do
- rm_r 'tmp/timestamps', force: true if args[:force?]
- Neruda::Emacs.new(verbose: Rake::FileUtilsExt.verbose_flag).publish
+ rm_r 'var/tmp/timestamps', force: true if args[:force?]
+ Fronde::Emacs.new(verbose: Rake::FileUtilsExt.verbose_flag).publish
end
begin
- Neruda::Utils.throbber(build_html, 'Building:')
+ Fronde::Utils.throbber(build_html, 'Building:')
# :nocov:
rescue RuntimeError
warn 'Aborting'
@@ -39,17 +39,17 @@ namespace :site do
end
# :nocov:
customize_html = Thread.new do
- pubfolder = Neruda::Config.settings['public_folder']
+ pubfolder = Fronde::Config.settings['public_folder']
Dir["#{pubfolder}/**/*.html"].each do |f|
- Neruda::Templater.customize_output(f)
+ Fronde::Templater.customize_output(f)
end
end
- Neruda::Utils.throbber(customize_html, 'Customizing:')
+ Fronde::Utils.throbber(customize_html, 'Customizing:')
end
desc 'Start a test server'
task :preview do
- require 'neruda/preview'
- Neruda.start_preview
+ require 'fronde/preview'
+ Fronde.start_preview
end
end
diff --git a/lib/tasks/sync.rake b/lib/tasks/sync.rake
index 77dc6dc..a2867aa 100644
--- a/lib/tasks/sync.rake
+++ b/lib/tasks/sync.rake
@@ -1,10 +1,10 @@
# frozen_string_literal: true
-require 'neruda/config'
-require 'neruda/utils'
+require 'fronde/config'
+require 'fronde/utils'
def rsync_command(verbose, test = nil)
- rsync_command = Neruda::Config.settings['rsync']
+ rsync_command = Fronde::Config.settings['rsync']
return rsync_command unless rsync_command.nil?
optstring = []
optstring << 'n' if test
@@ -19,16 +19,16 @@ end
namespace :sync do
desc 'Push change to server'
task :push, :test? do |_, args|
- remote_path = Neruda::Config.settings['remote']
+ remote_path = Fronde::Config.settings['remote']
if remote_path.nil?
warn 'No remote path set'
next
end
- public_folder = Neruda::Config.settings['public_folder']
+ public_folder = Fronde::Config.settings['public_folder']
publish_thread = Thread.new do
sh [rsync_command(Rake::FileUtilsExt.verbose_flag, args[:test?]),
"#{public_folder}/", remote_path].join(' ')
end
- Neruda::Utils.throbber(publish_thread, 'Publishing:')
+ Fronde::Utils.throbber(publish_thread, 'Publishing:')
end
end
diff --git a/lib/tasks/tags.rake b/lib/tasks/tags.rake
index 2522275..9fc5dd9 100644
--- a/lib/tasks/tags.rake
+++ b/lib/tasks/tags.rake
@@ -1,18 +1,18 @@
# frozen_string_literal: true
-require 'neruda/index'
+require 'fronde/index'
namespace :tags do
desc 'List all tags by name'
task :name do
- index = Neruda::Index.new
+ index = Fronde::Index.new
next if index.empty?
puts index.sort_by(:name).join("\n")
end
desc 'List all tags by weight'
task :weight do
- index = Neruda::Index.new
+ index = Fronde::Index.new
next if index.empty?
puts index.sort_by(:weight).join("\n")
end
diff --git a/locales/en.yml b/locales/en.yml
index cc890ce..4437ec1 100644
--- a/locales/en.yml
+++ b/locales/en.yml
@@ -1,28 +1,27 @@
---
-pablo:
- error:
- no_command: 'ERROR: no command or unknown command given.'
- no_file: 'ERROR: no file to open or edit.'
- usage: 'Usage: pablo %1 [options]'
- commands:
- cmd_title: Commands
- alias: Alias for %1.
- init: Initialize your Neruda instance (you just need to do it once).
- preview: 'Start a test web server to preview your website on http://127.0.0.1:5000'
- open: Open or create an org file.
- build: Compile your org files to HTML.
- publish: Push local changes to your public web server.
- help: Alias for the -h switch.
- options:
- cmd_title: Options
- path: Path to the new file.
- directory: Wrap the new org file in this named folder.
- help: Display help for a command and exit.
- version: Display Neruda version and exit.
-neruda:
+fronde:
+ bin:
+ usage: 'Usage: fronde %1 [options]'
+ commands:
+ cmd_title: Commands
+ alias: Alias for %1.
+ init: Initialize your Fronde instance (you just need to do it once).
+ preview: 'Start a test web server to preview your website on http://127.0.0.1:5000'
+ open: Open or create an org file.
+ build: Compile your org files to HTML.
+ publish: Push local changes to your public web server.
+ help: Alias for the -h switch.
+ options:
+ cmd_title: Options
+ directory: Wrap the new org file in this named folder.
+ help: Display help for a command and exit.
+ version: Display Fronde version and exit.
+ error:
+ no_command: 'ERROR: no command or unknown command given.'
+ no_file: 'ERROR: no file to open or edit.'
error:
label: An error occured.
- explanation: To see it, run again your command with more verbosity, i.e. pablo build -v
+ explanation: To see it, run again your command with more verbosity, i.e. fronde build -v
index:
unsorted: Unsorted
published_on: Published on %1
diff --git a/locales/fr.yml b/locales/fr.yml
index c01ceec..993bb54 100644
--- a/locales/fr.yml
+++ b/locales/fr.yml
@@ -1,28 +1,27 @@
---
-pablo:
- error:
- no_command: 'ERREUR : Aucune commande ou commande inconnue donnée.'
- no_file: 'ERREUR : Aucun fichier à ouvrir ou éditer.'
- usage: 'Usage : pablo %1 [options]'
- commands:
- cmd_title: Commandes
- alias: Alias pour %1.
- init: Initialise votre instance de Neruda (vous ne devriez faire cela qu'une fois).
- preview: "Démarre un serveur web de test pour prévisualiser votre site à l'adresse http://127.0.0.1:5000"
- open: Ouvre ou crée un fichier org.
- build: Compile vos fichiers org en HTML.
- publish: Pousse vos changements locaux vers votre serveur web public.
- help: Alias pour l'argument -h.
- options:
- cmd_title: Options
- path: Chemin vers le nouveau fichier.
- directory: Place le nouveau fichier org dans un dossier à ce nom.
- help: Affiche l'aide pour une commande et quitte.
- version: Affiche la version de Neruda et quitte.
-neruda:
+fronde:
+ bin:
+ usage: 'Usage : fronde %1 [options]'
+ commands:
+ cmd_title: Commandes
+ alias: Alias pour %1.
+ init: Initialise votre instance de Fronde (vous ne devriez faire cela qu'une fois).
+ preview: "Démarre un serveur web de test pour prévisualiser votre site à l'adresse http://127.0.0.1:5000"
+ open: Ouvre ou crée un fichier org.
+ build: Compile vos fichiers org en HTML.
+ publish: Pousse vos changements locaux vers votre serveur web public.
+ help: Alias pour l'argument -h.
+ options:
+ cmd_title: Options
+ directory: Place le nouveau fichier org dans un dossier à ce nom.
+ help: Affiche l'aide pour une commande et quitte.
+ version: Affiche la version de Fronde et quitte.
+ error:
+ no_command: 'ERREUR : Aucune commande ou commande inconnue donnée.'
+ no_file: 'ERREUR : Aucun fichier à ouvrir ou éditer.'
error:
label: Une erreur est survenue
- explanation: Pour voir le détail, lancez de nouveau la commande avec plus de verbosité, par exemple pablo build -v
+ explanation: Pour voir le détail, lancez de nouveau la commande avec plus de verbosité, par exemple fronde build -v
index:
unsorted: Non triés
published_on: Publié le %1
diff --git a/spec/data/index_proof.html b/spec/data/index_proof.html
index e76025f..ef9edf5 100644
--- a/spec/data/index_proof.html
+++ b/spec/data/index_proof.html
@@ -2,12 +2,12 @@
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Neruda Template: 5e83e25f9df9ce28b246d28f08f99cf4 -->
+<!-- Fronde Template: cb3b496c0cce07a7bd21c1ea1a94e8c7 -->
<!-- __PUB_DATE__ -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta property="neruda-test" content="test">
+<meta property="fronde-test" content="test">
<title>My website</title>
<meta name="generator" content="Org mode">
<meta name="author" content="Tata">
@@ -227,11 +227,11 @@ Nice content.
</p>
<p>
-<a href="http://mydomain.local/firma.png">Firma</a>
+<a href="http://mydomain.local/tigre.png">Tigre</a>
</p>
</div>
<div id="postamble" class="status">
-<footer>Published by Neruda.</footer>
+<footer>Published by Fronde.</footer>
</div>
</body>
</html>
diff --git a/spec/data/org-config-blog-proof.el b/spec/data/org-config-blog-proof.el
index b9047f8..09e38d8 100644
--- a/spec/data/org-config-blog-proof.el
+++ b/spec/data/org-config-blog-proof.el
@@ -1,11 +1,11 @@
;; Add org-mode to load path
-(add-to-list 'load-path (expand-file-name "org-__ORG_VERSION__/lisp" "__TEST_DIR__"))
+(add-to-list 'load-path (expand-file-name "org-__ORG_VERSION__/lisp" "__TEST_DIR__/lib"))
;; Load last version of htmlize.el
-(load-file (expand-file-name "htmlize.el" "__TEST_DIR__"))
+(load-file (expand-file-name "htmlize.el" "__TEST_DIR__/lib"))
;; Current project options
-(setq neruda/version "__VERSION__"
- neruda/current-work-dir "__TEST_DIR__"
+(setq fronde/version "__VERSION__"
+ fronde/current-work-dir "__TEST_DIR__"
user-mail-address ""
user-full-name "Tata"
org-html-metadata-timestamp-format "%A %-d of %B, %Y at %R"
@@ -19,7 +19,7 @@
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
- :html-postamble "<footer>Published by Neruda.</footer>"
+ :html-postamble "<footer>Published by Fronde.</footer>"
:html-head "<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\"
href=\"/assets/toto/css/style.css\">
<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\"
@@ -40,7 +40,7 @@
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
- :html-postamble "<footer>Published by Neruda.</footer>"
+ :html-postamble "<footer>Published by Fronde.</footer>"
:html-head "<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\"
href=\"/assets/toto/css/style.css\">
<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\"
@@ -64,7 +64,7 @@
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
- :html-postamble "<footer>Published by Neruda.</footer>"
+ :html-postamble "<footer>Published by Fronde.</footer>"
:html-head "<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\"
href=\"/assets/toto/css/style.css\">
<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\"
@@ -85,7 +85,7 @@
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
- :html-postamble "<footer>Published by Neruda.</footer>"
+ :html-postamble "<footer>Published by Fronde.</footer>"
:html-head "<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\"
href=\"/assets/toto/css/style.css\">
<link rel=\"stylesheet\" type=\"text/css\" media=\"screen\"
@@ -106,5 +106,5 @@
:publishing-function org-publish-attachment)
("website" :components ("org" "org-assets" "news" "news-assets" "test" "test-assets" "tata" "tata-assets" "theme-toto"))))
-;; Load neruda lib
-(load-file (expand-file-name "ox-neruda.el" "__BASE_DIR__/lib/neruda/config"))
+;; Load fronde lib
+(load-file (expand-file-name "ox-fronde.el" "__BASE_DIR__/lib/fronde/config"))
diff --git a/spec/data/org-config-proof.el b/spec/data/org-config-proof.el
index 8b980cc..5a680e1 100644
--- a/spec/data/org-config-proof.el
+++ b/spec/data/org-config-proof.el
@@ -1,11 +1,11 @@
;; Add org-mode to load path
-(add-to-list 'load-path (expand-file-name "org-__ORG_VERSION__/lisp" "__TEST_DIR__"))
+(add-to-list 'load-path (expand-file-name "org-__ORG_VERSION__/lisp" "__TEST_DIR__/lib"))
;; Load last version of htmlize.el
-(load-file (expand-file-name "htmlize.el" "__TEST_DIR__"))
+(load-file (expand-file-name "htmlize.el" "__TEST_DIR__/lib"))
;; Current project options
-(setq neruda/version "__VERSION__"
- neruda/current-work-dir "__TEST_DIR__"
+(setq fronde/version "__VERSION__"
+ fronde/current-work-dir "__TEST_DIR__"
user-mail-address ""
user-full-name "Tata"
org-html-metadata-timestamp-format "%A %-d of %B, %Y at %R"
@@ -19,7 +19,7 @@
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
- :html-postamble "<footer>Published by Neruda.</footer>"
+ :html-postamble "<footer>Published by Fronde.</footer>"
:html-head ""
:html-head-include-default-style t
:html-head-include-scripts t)
@@ -37,7 +37,7 @@
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
- :html-postamble "<footer>Published by Neruda.</footer>"
+ :html-postamble "<footer>Published by Fronde.</footer>"
:html-head "<link rel=\"alternate\" type=\"application/atom+xml\" title=\"Atom 1.0\"
href=\"/feeds/index.xml\" />"
:html-head-include-default-style t
@@ -57,7 +57,7 @@
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
- :html-postamble "<footer>Published by Neruda.</footer>"
+ :html-postamble "<footer>Published by Fronde.</footer>"
:html-head ""
:html-head-include-default-style t
:html-head-include-scripts t)
@@ -75,7 +75,7 @@
:publishing-function org-html-publish-to-html
:section-numbers nil
:with-toc nil
- :html-postamble "<footer>Published by Neruda.</footer>"
+ :html-postamble "<footer>Published by Fronde.</footer>"
:html-head ""
:html-head-include-default-style t
:html-head-include-scripts t)
@@ -87,5 +87,5 @@
:publishing-function org-publish-attachment)
("website" :components ("org" "org-assets" "news" "news-assets" "test" "test-assets" "tata" "tata-assets"))))
-;; Load neruda lib
-(load-file (expand-file-name "ox-neruda.el" "__BASE_DIR__/lib/neruda/config"))
+;; Load fronde lib
+(load-file (expand-file-name "ox-fronde.el" "__BASE_DIR__/lib/fronde/config"))
diff --git a/spec/neruda/config_spec.rb b/spec/fronde/config_spec.rb
index 17af203..27b7a1c 100644
--- a/spec/neruda/config_spec.rb
+++ b/spec/fronde/config_spec.rb
@@ -50,7 +50,7 @@ SAMPLE_CONFIG_5 = <<~CONF
theme: default
CONF
-describe Neruda::Config do
+describe Fronde::Config do
context 'with a config file' do
before do
FileUtils.mkdir_p 'tmp/config'
@@ -147,6 +147,34 @@ describe Neruda::Config do
expect(headers).to eq(head)
end
+ it 'exposes correct head header with boolean values in conf' do
+ IO.write('config.yml', SAMPLE_CONFIG_3)
+ described_class.send(:load_settings)
+ old_conf = described_class.settings.dup
+ old_conf['sources'][0] = {
+ 'path' => 'src',
+ 'org-html' => {
+ 'html-head-include-default-style' => true,
+ 'html-head-include-scripts' => false
+ }
+ }
+ described_class.load_test(old_conf)
+ projects = described_class.sources
+ headers = described_class.send(:build_project_org_headers, projects[0])
+ head = <<~HEAD.strip
+ :section-numbers nil
+ :with-toc nil
+ :html-postamble "<p><span class=\\\"author\\\">Written by %a</span>
+ with %c, and published with %N</p>
+ <p class=\\\"date\\\">Last modification on %C</p>
+ <p class=\\\"validation\\\">%v</p>"
+ :html-head ""
+ :html-head-include-default-style t
+ :html-head-include-scripts nil
+ HEAD
+ expect(headers).to eq(head)
+ end
+
it 'exposes correct head header with custom domain' do
IO.write('config.yml', SAMPLE_CONFIG_4)
described_class.send(:load_settings)
@@ -302,13 +330,13 @@ describe Neruda::Config do
context 'with config utils method' do
after do
- FileUtils.rm 'tmp/__last_org_version__', force: true
+ FileUtils.rm 'var/tmp/last_org_version', force: true
described_class.class_eval '@org_version = nil', __FILE__, __LINE__
end
it 'gives current org version' do
described_class.class_eval '@org_version = nil', __FILE__, __LINE__
- IO.write('tmp/__last_org_version__', 'test')
+ IO.write('var/tmp/last_org_version', 'test')
expect(described_class.org_last_version).to eq('test')
end
end
diff --git a/spec/neruda/index_spec.rb b/spec/fronde/index_spec.rb
index dd6b241..89d19c9 100644
--- a/spec/neruda/index_spec.rb
+++ b/spec/fronde/index_spec.rb
@@ -106,7 +106,7 @@ SAMPLE_ATOM = <<~ATOM.strip
<updated>%<date>s</updated>
<author><name>Test</name></author>
<id>urn:md5:75d53866bcb20465b3287cf237234464</id>
- <generator uri="https://git.umaneti.net/neruda/about/">Neruda</generator>
+ <generator uri="https://git.umaneti.net/fronde/about/">Fronde</generator>
<entry>
<title>My third article</title>
@@ -142,7 +142,7 @@ SAMPLE_ATOM = <<~ATOM.strip
</feed>
ATOM
-describe Neruda::Index do
+describe Fronde::Index do
context 'with blog settings' do
context 'with working org files' do
before do
@@ -160,12 +160,12 @@ describe Neruda::Index do
after do
Dir.chdir File.expand_path('../..', __dir__)
FileUtils.rm_r 'tmp/blog', force: true
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
end
context 'with recursive config' do
before do
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'title' => 'Blog',
'author' => 'Test',
'public_folder' => 'output',
@@ -185,9 +185,9 @@ describe Neruda::Index do
end
it 'excludes specified pattern from indexes', core: true do
- old_conf = Neruda::Config.settings.dup
+ old_conf = Fronde::Config.settings.dup
old_conf['sources'][0]['exclude'] = 'test3\.org$'
- Neruda::Config.load_test(old_conf)
+ Fronde::Config.load_test(old_conf)
index = described_class.new
expect(index.entries.length).to eq(1)
expect(index.entries.include?('toto')).to be(false)
@@ -286,7 +286,7 @@ describe Neruda::Index do
context 'without recursive config' do
before do
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'title' => 'Blog',
'author' => 'Test',
'public_folder' => 'output',
@@ -332,7 +332,7 @@ describe Neruda::Index do
FileUtils.mkdir_p 'tmp/blog/writings'
FileUtils.mkdir_p 'tmp/blog/output'
Dir.chdir 'tmp/blog'
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'title' => 'Blog',
'author' => 'Test',
'public_folder' => 'output',
@@ -348,7 +348,7 @@ describe Neruda::Index do
after do
Dir.chdir File.expand_path('../..', __dir__)
FileUtils.rm_r 'tmp/blog', force: true
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
end
it 'has generated no index', core: true do
@@ -406,7 +406,7 @@ describe Neruda::Index do
<updated>%<date>s</updated>
<author><name>Test</name></author>
<id>urn:md5:75d53866bcb20465b3287cf237234464</id>
- <generator uri="https://git.umaneti.net/neruda/about/">Neruda</generator>
+ <generator uri="https://git.umaneti.net/fronde/about/">Fronde</generator>
</feed>
ATOM
expect(index.to_atom).to(
@@ -466,7 +466,7 @@ describe Neruda::Index do
<updated>%<date>s</updated>
<author><name>Test</name></author>
<id>urn:md5:75d53866bcb20465b3287cf237234464</id>
- <generator uri="https://git.umaneti.net/neruda/about/">Neruda</generator>
+ <generator uri="https://git.umaneti.net/fronde/about/">Fronde</generator>
</feed>
ATOM
expect(IO.read('output/feeds/index.xml')).to(
@@ -494,7 +494,7 @@ describe Neruda::Index do
'tmp/txt/writings'
)
Dir.chdir 'tmp/txt'
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'title' => 'My site',
'author' => 'Test',
'public_folder' => 'output',
@@ -506,7 +506,7 @@ describe Neruda::Index do
after do
Dir.chdir File.expand_path('../..', __dir__)
FileUtils.rm_r 'tmp/txt', force: true
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
end
it 'does not have generated any indexes', core: true do
@@ -555,7 +555,7 @@ describe Neruda::Index do
<updated>%<date>s</updated>
<author><name>Test</name></author>
<id>urn:md5:75d53866bcb20465b3287cf237234464</id>
- <generator uri="https://git.umaneti.net/neruda/about/">Neruda</generator>
+ <generator uri="https://git.umaneti.net/fronde/about/">Fronde</generator>
</feed>
EMPTY_ATOM
expect(index.to_atom).to(
@@ -591,7 +591,7 @@ describe Neruda::Index do
FileUtils.mkdir_p 'tmp/txt/output'
FileUtils.cp 'spec/data/test1.org', 'tmp/txt/writings'
Dir.chdir 'tmp/txt'
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'public_folder' => 'output',
'domain' => 'http://perdu.com',
'sources' => [{ 'path' => 'writings', 'target' => '.' }]
@@ -601,7 +601,7 @@ describe Neruda::Index do
after do
Dir.chdir File.expand_path('../..', __dir__)
FileUtils.rm_r 'tmp/txt', force: true
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
end
it 'does not have generated any indexes', core: true do
@@ -650,7 +650,7 @@ describe Neruda::Index do
<updated>%<date>s</updated>
<author><name>alice</name></author>
<id>urn:md5:75d53866bcb20465b3287cf237234464</id>
- <generator uri="https://git.umaneti.net/neruda/about/">Neruda</generator>
+ <generator uri="https://git.umaneti.net/fronde/about/">Fronde</generator>
</feed>
EMPTY_ATOM
expect(index.to_atom).to(
diff --git a/spec/neruda/org_file_spec.rb b/spec/fronde/org_file_spec.rb
index be8ef87..5ea1e09 100644
--- a/spec/neruda/org_file_spec.rb
+++ b/spec/fronde/org_file_spec.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# rubocop:disable Style/FormatStringToken
-describe Neruda::OrgFile do
+describe Fronde::OrgFile do
context 'with working org files' do
it 'parses without date', core: true do
o = described_class.new('spec/data/test1.org')
@@ -118,11 +118,11 @@ describe Neruda::OrgFile do
context 'with configuration' do
after do
# Reset config
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
end
it 'respects author name', core: true do
- Neruda::Config.load_test('author' => 'Test')
+ Fronde::Config.load_test('author' => 'Test')
o = described_class.new('spec/data/test1.org')
expect(o.author).to eq('Test')
o = described_class.new('spec/data/test2.org')
@@ -134,13 +134,13 @@ describe Neruda::OrgFile do
it 'computes the right html_file path for existing sources', core: true do
o = described_class.new('spec/data/test1.org')
expect(o.html_file).to eq('data/test1.html')
- Neruda::Config.load_test('domain' => 'http://perdu.com')
+ Fronde::Config.load_test('domain' => 'http://perdu.com')
o = described_class.new('spec/data/test1.org')
expect(o.html_file).to eq('data/test1.html')
o = described_class.new('spec/data/content.org')
expect(o.html_file).to eq('data/content.html')
# The following are weird tests. We begin to test theoric stuff here
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'domain' => 'http://perdu.com',
'sources' => [
{ 'path' => 'data' }
@@ -155,13 +155,13 @@ describe Neruda::OrgFile do
it 'computes the right url for existing sources', core: true do
o = described_class.new('spec/data/test1.org')
expect(o.url).to eq('/data/test1.html')
- Neruda::Config.load_test('domain' => 'http://perdu.com')
+ Fronde::Config.load_test('domain' => 'http://perdu.com')
o = described_class.new('spec/data/test1.org')
expect(o.url).to eq('http://perdu.com/data/test1.html')
o = described_class.new('spec/data/content.org')
expect(o.url).to eq('http://perdu.com/data/content.html')
# The following are weird tests. We begin to test theoric stuff here
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'domain' => 'http://perdu.com',
'sources' => [
{ 'path' => 'data' }
@@ -224,7 +224,7 @@ describe Neruda::OrgFile do
['src/blog/test.org', 'src/blog/toto/tata.org',
'src/blog/toto/content.org', 'writings/notes.org']
)
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'sources' => [{ 'path' => 'src', 'target' => '.' }, 'writings']
)
end
@@ -254,7 +254,7 @@ describe Neruda::OrgFile do
it 'identifies a project for a given file path' do
ps = described_class.project_for_source('src/test.org')
- expect(ps).to eq(Neruda::Config.sources[0])
+ expect(ps).to eq(Fronde::Config.sources[0])
ps = described_class.project_for_source('not/known.org')
expect(ps).to be(nil)
end
diff --git a/spec/neruda/templater_spec.rb b/spec/fronde/templater_spec.rb
index bb969ee..5580f5b 100644
--- a/spec/neruda/templater_spec.rb
+++ b/spec/fronde/templater_spec.rb
@@ -1,8 +1,8 @@
# frozen_string_literal: true
-require 'neruda/templater'
+require 'fronde/templater'
-describe Neruda::Templater do
+describe Fronde::Templater do
let(:html_base) do
<<~HTML
<!DOCTYPE html>
@@ -25,7 +25,7 @@ describe Neruda::Templater do
<!DOCTYPE html>
<html>
<head>
- <!-- Neruda Template: #{metatag_digest} -->
+ <!-- Fronde Template: #{metatag_digest} -->
<meta property="test" content="TEST">
<title>My website</title>
@@ -54,11 +54,11 @@ describe Neruda::Templater do
after do
FileUtils.rm_r ['public_html', 'src'], force: true
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
end
it 'customizes a given html file with simple template' do
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'selector' => 'title',
'content' => metatag }
@@ -69,7 +69,7 @@ describe Neruda::Templater do
<!DOCTYPE html>
<html>
<head>
- <!-- Neruda Template: #{metatag_digest} -->
+ <!-- Fronde Template: #{metatag_digest} -->
<title>My website</title>
<meta property="test" content="TEST">
@@ -83,7 +83,7 @@ describe Neruda::Templater do
end
it 'customizes a given html file with a given org object' do
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'selector' => 'title',
'content' => metatag }
@@ -96,13 +96,13 @@ describe Neruda::Templater do
ORG
FileUtils.mkdir 'src'
IO.write('src/index.org', org_content)
- o = Neruda::OrgFile.new('src/index.org')
+ o = Fronde::OrgFile.new('src/index.org')
described_class.customize_output('public_html/customize_test.html', o)
local_result = <<~RESULT
<!DOCTYPE html>
<html>
<head>
- <!-- Neruda Template: #{metatag_digest} -->
+ <!-- Fronde Template: #{metatag_digest} -->
<title>My website</title>
<meta property="test" content="TEST">
@@ -116,7 +116,7 @@ describe Neruda::Templater do
end
it 'customizes a given html file with before' do
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'selector' => 'title',
'type' => 'before',
@@ -128,7 +128,7 @@ describe Neruda::Templater do
end
it 'customizes a given html file with after' do
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'selector' => 'title',
'type' => 'after',
@@ -140,7 +140,7 @@ describe Neruda::Templater do
<!DOCTYPE html>
<html>
<head>
- <!-- Neruda Template: #{metatag_digest} -->
+ <!-- Fronde Template: #{metatag_digest} -->
<title>My website</title>
<meta property="test" content="TEST">
@@ -154,7 +154,7 @@ describe Neruda::Templater do
end
it 'customizes a given html file with replace content' do
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'selector' => 'body>h1',
'type' => 'replace',
@@ -166,7 +166,7 @@ describe Neruda::Templater do
<!DOCTYPE html>
<html>
<head>
- <!-- Neruda Template: #{Digest::MD5.hexdigest('<p>Toto tata</p>')} -->
+ <!-- Fronde Template: #{Digest::MD5.hexdigest('<p>Toto tata</p>')} -->
<title>My website</title>
</head>
@@ -179,7 +179,7 @@ describe Neruda::Templater do
end
it 'customizes a given html file with previous comments in head' do
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'selector' => 'body>h1',
'type' => 'replace',
@@ -204,7 +204,7 @@ describe Neruda::Templater do
<!DOCTYPE html>
<html>
<head>
- <!-- Neruda Template: #{Digest::MD5.hexdigest('<p>Toto tata</p>')} -->
+ <!-- Fronde Template: #{Digest::MD5.hexdigest('<p>Toto tata</p>')} -->
<!-- This is a test comment -->
<title>My website</title>
@@ -219,7 +219,7 @@ describe Neruda::Templater do
it 'does not customize a given html file with wrong templates' do
result = IO.read('public_html/customize_test.html')
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'type' => 'replace',
'content' => '<p>Toto tata</p>' },
@@ -233,7 +233,7 @@ describe Neruda::Templater do
it 'does not customize a given html file with no templates' do
result = IO.read('public_html/customize_test.html')
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
described_class.customize_output('public_html/customize_test.html')
expect(IO.read('public_html/customize_test.html')).to eq(result)
end
@@ -254,7 +254,7 @@ describe Neruda::Templater do
</html>
HTML
IO.write('public_html/customize_test.html', other_html_base)
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'type' => 'before',
'selector' => 'div#content',
@@ -266,7 +266,7 @@ describe Neruda::Templater do
<!DOCTYPE html>
<html>
<head>
- <!-- Neruda Template: #{Digest::MD5.hexdigest('<nav>My menu</nav>')} -->
+ <!-- Fronde Template: #{Digest::MD5.hexdigest('<nav>My menu</nav>')} -->
<title>My website</title>
</head>
@@ -287,7 +287,7 @@ describe Neruda::Templater do
FileUtils.mkdir_p 'public_html/customize'
IO.write('public_html/customize_test.html', html_base)
IO.write('public_html/customize/test.html', html_base)
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'selector' => 'title',
'path' => '/customize/*',
@@ -299,7 +299,7 @@ describe Neruda::Templater do
after do
FileUtils.rm_r 'public_html', force: true
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
end
it 'customizes a file on a specific path' do
@@ -323,7 +323,7 @@ describe Neruda::Templater do
IO.write('public_html/customize_test.html', html_base)
IO.write('public_html/customize/test.html', html_base)
IO.write('public_html/other/file.html', html_base)
- Neruda::Config.load_test(
+ Fronde::Config.load_test(
'templates' => [
{ 'selector' => 'title',
'path' => ['/customize/*', '/other/*'],
@@ -337,7 +337,7 @@ describe Neruda::Templater do
after do
FileUtils.rm_r 'public_html', force: true
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
end
it 'customizes a file on a specific path' do
diff --git a/spec/neruda/utils_spec.rb b/spec/fronde/utils_spec.rb
index 38c9cee..c7a6def 100644
--- a/spec/neruda/utils_spec.rb
+++ b/spec/fronde/utils_spec.rb
@@ -1,9 +1,9 @@
# frozen_string_literal: true
-require 'neruda/utils'
+require 'fronde/utils'
-describe Neruda::Utils do
- context 'with theoritical pablo arguments' do
+describe Fronde::Utils do
+ context 'with theoritical fronde arguments' do
it 'returns decorated options' do
expect(described_class.decorate_option('-a')).to(
eq(['-aAUTHOR', '--author AUTHOR'])
@@ -19,7 +19,7 @@ describe Neruda::Utils do
it 'summarizes basic commands' do
basic_cmd = [
" -h, --help Display help for a command and exit.\n",
- ' -V, --version Display Neruda version and exit.'
+ ' -V, --version Display Fronde version and exit.'
].join
expect(described_class.summarize_command('basic')).to eq(basic_cmd)
end
@@ -29,7 +29,6 @@ describe Neruda::Utils do
" -aAUTHOR, --author AUTHOR \n",
" -h, --help Display help for a command and exit.\n",
" -lLOCALE, --lang LOCALE \n",
- " -pPATH, --path PATH Path to the new file.\n",
" -tTITLE, --title TITLE \n",
' -v, --verbose '
].join
@@ -38,7 +37,7 @@ describe Neruda::Utils do
it 'lists possible commands' do
basic_cmd = [
- " init Initialize your Neruda instance (you just need to do it once).\n",
+ " init Initialize your Fronde instance (you just need to do it once).\n",
" config Alias for init.\n",
" preview Start a test web server to preview your website on http://127.0.0.1:5000\n",
" open Open or create an org file.\n",
@@ -60,29 +59,29 @@ describe Neruda::Utils do
context 'with config' do
after do
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
end
it 'selects the right throbber' do
- Neruda::Config.load_test({})
+ Fronde::Config.load_test({})
frames = described_class.send(:select_throbber_frames)
expect(frames).to(
eq(['⠁ ⠂ ⠄ ⡀ ⠄ ⠂ ⠁', '⠂ ⠁ ⠂ ⠄ ⡀ ⠄ ⠂', '⠄ ⠂ ⠁ ⠂ ⠄ ⡀ ⠄',
'⡀ ⠄ ⠂ ⠁ ⠂ ⠄ ⡀', '⠄ ⡀ ⠄ ⠂ ⠁ ⠂ ⠄', '⠂ ⠄ ⡀ ⠄ ⠂ ⠁ ⠂'])
)
- Neruda::Config.load_test('throbber' => 'default')
+ Fronde::Config.load_test('throbber' => 'default')
frames = described_class.send(:select_throbber_frames)
expect(frames).to(
eq(['⠁ ⠂ ⠄ ⡀ ⠄ ⠂ ⠁', '⠂ ⠁ ⠂ ⠄ ⡀ ⠄ ⠂', '⠄ ⠂ ⠁ ⠂ ⠄ ⡀ ⠄',
'⡀ ⠄ ⠂ ⠁ ⠂ ⠄ ⡀', '⠄ ⡀ ⠄ ⠂ ⠁ ⠂ ⠄', '⠂ ⠄ ⡀ ⠄ ⠂ ⠁ ⠂'])
)
- Neruda::Config.load_test('throbber' => 'wrong')
+ Fronde::Config.load_test('throbber' => 'wrong')
frames = described_class.send(:select_throbber_frames)
expect(frames).to(
eq(['⠁ ⠂ ⠄ ⡀ ⠄ ⠂ ⠁', '⠂ ⠁ ⠂ ⠄ ⡀ ⠄ ⠂', '⠄ ⠂ ⠁ ⠂ ⠄ ⡀ ⠄',
'⡀ ⠄ ⠂ ⠁ ⠂ ⠄ ⡀', '⠄ ⡀ ⠄ ⠂ ⠁ ⠂ ⠄', '⠂ ⠄ ⡀ ⠄ ⠂ ⠁ ⠂'])
)
- Neruda::Config.load_test('throbber' => 'basic')
+ Fronde::Config.load_test('throbber' => 'basic')
frames = described_class.send(:select_throbber_frames)
expect(frames).to eq('-\|/')
end
diff --git a/spec/rake_org_spec.rb b/spec/rake_org_spec.rb
index 0ff294b..cbf78e7 100644
--- a/spec/rake_org_spec.rb
+++ b/spec/rake_org_spec.rb
@@ -3,54 +3,54 @@
require 'rake'
context 'with working org files' do
- let(:org_dir) { "org-#{Neruda::Config.org_last_version}" }
+ let(:org_dir) { "lib/org-#{Fronde::Config.org_last_version}" }
before do
init_testing_website
- Neruda::Config.send(:load_settings)
+ Fronde::Config.send(:load_settings)
end
after do
- Dir.glob('org-[0-9.]*').each { |ov| FileUtils.rm_r(ov, force: true) }
- FileUtils.rm ['.dir-locals.el', 'org-config.el'], force: true
- Neruda::Config.load_test({})
+ Dir.glob('lib/org-[0-9.]*').each { |ov| FileUtils.rm_r(ov, force: true) }
+ FileUtils.rm ['.dir-locals.el', 'var/lib/org-config.el'], force: true
+ Fronde::Config.load_test({})
Dir.chdir File.expand_path('..', __dir__)
FileUtils.rm_r 'tmp/website_testing', force: true
end
it 'compiles org-config.el', rake: true do
- rake.invoke_task('org-config.el')
- expect(File.exist?('org-config.el')).to be(true)
+ rake.invoke_task('var/lib/org-config.el')
+ expect(File.exist?('var/lib/org-config.el')).to be(true)
proof = File.expand_path('data/org-config-proof.el', __dir__)
base_dir = File.expand_path('../', __dir__)
proof_content = IO.read(proof)
.gsub(/__TEST_DIR__/, Dir.pwd)
.gsub(/__BASE_DIR__/, base_dir)
- .gsub(/__VERSION__/, Neruda::VERSION)
- .gsub(/__ORG_VERSION__/, Neruda::Config.org_last_version)
- expect(IO.read('org-config.el')).to eq(proof_content)
+ .gsub(/__VERSION__/, Fronde::VERSION)
+ .gsub(/__ORG_VERSION__/, Fronde::Config.org_last_version)
+ expect(IO.read('var/lib/org-config.el')).to eq(proof_content)
end
it 'compiles org-config.el for blog', rake: true do
- old_conf = Neruda::Config.settings.dup
+ old_conf = Fronde::Config.settings.dup
old_conf['theme'] = 'toto'
- Neruda::Config.load_test(old_conf)
- rake.invoke_task('org-config.el')
- expect(File.exist?('org-config.el')).to be(true)
+ Fronde::Config.load_test(old_conf)
+ rake.invoke_task('var/lib/org-config.el')
+ expect(File.exist?('var/lib/org-config.el')).to be(true)
proof = File.expand_path('data/org-config-blog-proof.el', __dir__)
base_dir = File.expand_path('../', __dir__)
proof_content = IO.read(proof)
.gsub(/__TEST_DIR__/, Dir.pwd)
.gsub(/__BASE_DIR__/, base_dir)
- .gsub(/__VERSION__/, Neruda::VERSION)
- .gsub(/__ORG_VERSION__/, Neruda::Config.org_last_version)
- expect(IO.read('org-config.el')).to eq(proof_content)
+ .gsub(/__VERSION__/, Fronde::VERSION)
+ .gsub(/__ORG_VERSION__/, Fronde::Config.org_last_version)
+ expect(IO.read('var/lib/org-config.el')).to eq(proof_content)
end
it 'creates .dir-locals.el', rake: true do
rake.invoke_task('.dir-locals.el')
expect(File.exist?('.dir-locals.el')).to be(true)
- proof = File.expand_path('org-config.el', Dir.pwd)
+ proof = File.expand_path('var/lib/org-config.el', Dir.pwd)
expect(IO.read('.dir-locals.el')).to(
eq("((org-mode . ((eval . (load-file \"#{proof}\")))))")
)
@@ -59,7 +59,7 @@ context 'with working org files' do
it 'installs Org', rake: true do
copy_org_tarball_to_fake_tmp
rake(verbose: false).invoke_task('org:install')
- expect(File.exist?('org-config.el')).to be(true)
+ expect(File.exist?('var/lib/org-config.el')).to be(true)
expect(File.exist?('.dir-locals.el')).to be(true)
expect(File.exist?("#{org_dir}/lisp/org-loaddefs.el")).to be(true)
end
@@ -69,17 +69,17 @@ context 'with working org files' do
FileUtils.rm_r org_dir, force: true
copy_org_tarball_to_fake_tmp
rake(verbose: true).invoke_task('org:install')
- expect(File.exist?('org-config.el')).to be(true)
+ expect(File.exist?('var/lib/org-config.el')).to be(true)
expect(File.exist?('.dir-locals.el')).to be(true)
expect(File.exist?("#{org_dir}/lisp/org-loaddefs.el")).to be(true)
end
it 'removes old Org version while installing', rake: true do
- FileUtils.mkdir 'org-2.3'
- expect(Dir.exist?('org-2.3')).to be(true)
+ FileUtils.mkdir_p 'lib/org-2.3'
+ expect(Dir.exist?('lib/org-2.3')).to be(true)
copy_org_tarball_to_fake_tmp
rake(verbose: true).invoke_task('org:install')
rake(verbose: false).invoke_task('org:install') # To check coverage
- expect(Dir.exist?('org-2.3')).to be(false)
+ expect(Dir.exist?('lib/org-2.3')).to be(false)
end
end
diff --git a/spec/rake_preview_spec.rb b/spec/rake_preview_spec.rb
index ab43314..e2bcadd 100644
--- a/spec/rake_preview_spec.rb
+++ b/spec/rake_preview_spec.rb
@@ -6,19 +6,19 @@ require 'net/http'
def init_preview
copy_org_tarball_to_fake_tmp
- Neruda::Config.send(:load_settings)
+ Fronde::Config.send(:load_settings)
rake.invoke_task('org:install')
FileUtils.cp(
- File.expand_path('../Firma_Pablo_Neruda.png', __dir__),
- 'src/firma.png'
+ File.expand_path('../tigre.png', __dir__),
+ 'src/tigre.png'
)
- Neruda::OrgFile.new(
+ Fronde::OrgFile.new(
'src/index.org',
title: 'My website',
content: <<~CONTENT
Nice content.
- [[http://mydomain.local/firma.png][Firma]]
+ [[http://mydomain.local/tigre.png][Tigre]]
CONTENT
).write
end
@@ -52,11 +52,11 @@ context 'when trying preview mode' do
proof = File.expand_path('data/index_proof.html', __dir__)
proof_content = IO.read(proof).gsub(/__PUB_DATE__/, now_str)
expect(home_page).to eq(proof_content)
- firma = URI('http://localhost:5000/firma.png')
- res = Net::HTTP.get_response(firma)
+ tigre = URI('http://localhost:5000/tigre.png')
+ res = Net::HTTP.get_response(tigre)
expect(res).to be_a(Net::HTTPOK)
expect(res['content-type']).to eq('image/png')
- expect(res['content-length']).to eq(File.size('src/firma.png').to_s)
+ expect(res['content-length']).to eq(File.size('src/tigre.png').to_s)
end
it 'serves index', rake: true do
@@ -84,9 +84,9 @@ context 'when trying preview mode' do
around do |test|
init_testing_website
init_preview
- old_conf = Neruda::Config.settings.dup
+ old_conf = Fronde::Config.settings.dup
old_conf['domain'] = 'http://mydomain.local'
- Neruda::Config.load_test(old_conf)
+ Fronde::Config.load_test(old_conf)
rake.invoke_task('site:build')
webrick_app = Thread.new do
rake.invoke_task('site:preview')
diff --git a/spec/rake_site_spec.rb b/spec/rake_site_spec.rb
index 26ef5e0..15dfaad 100644
--- a/spec/rake_site_spec.rb
+++ b/spec/rake_site_spec.rb
@@ -30,7 +30,7 @@ context 'with a testing website' do
before do
init_testing_website
copy_org_tarball_to_fake_tmp
- Neruda::Config.send(:load_settings)
+ Fronde::Config.send(:load_settings)
rake.invoke_task('org:install')
end
@@ -41,7 +41,7 @@ context 'with a testing website' do
context 'when building org files' do
before do
- o = Neruda::OrgFile.new('src/index.org',
+ o = Fronde::OrgFile.new('src/index.org',
title: 'My website',
content: 'Nice content.')
o.write
@@ -60,9 +60,9 @@ context 'with a testing website' do
it 'does not build again with successive call', rake: true do
rake(verbose: false).invoke_task('site:build')
old_content = IO.read('public_html/index.html')
- old_conf = Neruda::Config.settings.dup
+ old_conf = Fronde::Config.settings.dup
old_conf['org-html']['html-postamble'] = '<footer>Modified!</footer>'
- Neruda::Config.load_test(old_conf)
+ Fronde::Config.load_test(old_conf)
rake(verbose: false).invoke_task('site:build')
expect(IO.read('public_html/index.html')).to eql(old_content)
end
@@ -70,17 +70,17 @@ context 'with a testing website' do
it 'builds again when call with force option', rake: true do
rake(verbose: false).invoke_task('site:build')
old_content = IO.read('public_html/index.html')
- old_conf = Neruda::Config.settings.dup
+ old_conf = Fronde::Config.settings.dup
old_conf['org-html']['html-postamble'] = '<footer>Modified!</footer>'
- Neruda::Config.load_test(old_conf)
+ Fronde::Config.load_test(old_conf)
rake(verbose: false).invoke_task('site:build[true]')
expect(IO.read('public_html/index.html')).not_to eql(old_content)
end
it 'fails gracefully when something goes wrong', rake: true do
- old_conf = Neruda::Config.settings.dup
+ old_conf = Fronde::Config.settings.dup
old_conf['emacs'] = 'notemacsatall'
- Neruda::Config.load_test(old_conf)
+ Fronde::Config.load_test(old_conf)
expect { rake(verbose: false).invoke_task('site:build') }.to(
output(/Aborting/).to_stderr
)
@@ -92,9 +92,9 @@ context 'with a testing website' do
context 'without blog setting', rake: true do
before do
- old_conf = Neruda::Config.settings.dup
+ old_conf = Fronde::Config.settings.dup
old_conf['sources'][1]['is_blog'] = false
- Neruda::Config.load_test(old_conf)
+ Fronde::Config.load_test(old_conf)
end
it 'does not generate index', rake: true do
@@ -132,9 +132,9 @@ context 'with a testing website' do
context 'with wrong blog settings', rake: true do
before do
- old_conf = Neruda::Config.settings.dup
+ old_conf = Fronde::Config.settings.dup
old_conf['sources'][1]['path'] = 'src/test'
- Neruda::Config.load_test(old_conf)
+ Fronde::Config.load_test(old_conf)
end
it 'does not generate index', rake: true do
diff --git a/spec/requirements.rb b/spec/requirements.rb
index 626f0d7..112074e 100644
--- a/spec/requirements.rb
+++ b/spec/requirements.rb
@@ -15,14 +15,14 @@ SimpleCov.start do
# Remove dev only tools from coverage check
add_filter ['lib/tasks/sync.rake']
# Sort coverage results into usefull groups
- add_group 'Core libs', 'lib/neruda'
+ add_group 'Core libs', 'lib/fronde'
add_group 'Rake tasks', 'lib/tasks'
add_group 'Specs', 'spec'
end
# The following requires other components automatically
-require 'neruda/org_file'
-require 'neruda/utils'
+require 'fronde/org_file'
+require 'fronde/utils'
ENV['LANG'] = 'en'
ENV['USER'] = 'alice'
@@ -51,7 +51,7 @@ def init_testing_website
author: Tata
title: This is a website about test
org-html:
- html-postamble: '<footer>Published by Neruda.</footer>'
+ html-postamble: '<footer>Published by Fronde.</footer>'
sources:
- name: org
path: src
@@ -68,7 +68,7 @@ def init_testing_website
- type: before
selector: title
content: |
- <meta property="neruda-test" content="test"/>
+ <meta property="fronde-test" content="test"/>
preview:
routes:
/test: public_html/index.html
@@ -79,8 +79,8 @@ end
def copy_org_tarball_to_fake_tmp
tarball = File.expand_path('../tmp/org.tar.gz', __dir__)
- FileUtils.mkdir 'tmp'
- FileUtils.cp tarball, 'tmp'
+ FileUtils.mkdir_p 'var/tmp'
+ FileUtils.cp tarball, 'var/tmp'
end
def rake(verbose: false)
@@ -94,10 +94,11 @@ end
RSpec.configure do |config|
config.before(:suite) do
- Neruda::Utils.download_org
+ FileUtils.mkdir 'tmp'
+ Fronde::Utils.download_org('tmp')
end
config.after(:suite) do
- FileUtils.rm_r 'tmp', force: true
+ FileUtils.rm_r ['tmp', 'var'], force: true
end
end
diff --git a/tigre.png b/tigre.png
new file mode 100644
index 0000000..fa72eb0
--- /dev/null
+++ b/tigre.png
Binary files differ
diff --git a/tigre.svg b/tigre.svg
new file mode 100644
index 0000000..2fed91b
--- /dev/null
+++ b/tigre.svg
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="19.219334mm"
+ height="15.917334mm"
+ viewBox="0 0 19.219334 15.917334"
+ version="1.1"
+ id="svg8"
+ inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"
+ sodipodi:docname="tigre.svg"
+ inkscape:export-filename="/home/etienne/tigre.png"
+ inkscape:export-xdpi="528.63"
+ inkscape:export-ydpi="528.63">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="15.839192"
+ inkscape:cx="35.470104"
+ inkscape:cy="27.300347"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ inkscape:document-rotation="0"
+ showgrid="false"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1920"
+ inkscape:window-height="1030"
+ inkscape:window-x="0"
+ inkscape:window-y="25"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-48.780857,-44.362083)">
+ <path
+ style="fill:#4e1713;stroke-width:0.0846667"
+ d="m 60.276723,55.708416 c 0.747575,-0.128086 1.127786,-0.379886 1.364503,-0.903661 0.129893,-0.28741 0.217761,-0.393411 0.277004,-0.334168 0.05924,0.05924 0.04026,0.165485 -0.05983,0.33493 -0.142244,0.240799 -0.141041,0.25334 0.04053,0.422503 0.374713,0.349099 0.770208,0.109318 1.045071,-0.633608 0.219116,-0.592248 0.272042,-0.643455 0.601232,-0.581699 0.358573,0.06727 1.067694,-0.100507 1.344247,-0.318044 0.116957,-0.092 0.212649,-0.128998 0.212649,-0.08222 0,0.237287 -0.842846,0.617788 -1.406356,0.634895 -0.41363,0.01256 -0.425556,0.02266 -0.66369,0.562348 -0.170006,0.385288 -0.638114,0.753879 -0.993184,0.78204 -0.227279,0.01803 -0.27634,-0.0061 -0.256225,-0.125873 0.03274,-0.194959 -0.131,-0.189039 -0.307641,0.01112 -0.151415,0.171577 -0.943021,0.356233 -1.445858,0.33727 -0.231315,-0.0087 -0.172513,-0.03386 0.247543,-0.105833 z"
+ id="path196" />
+ <path
+ style="fill:#d5c4b7;stroke-width:0.0846667"
+ d="m 57.9478,57.859724 c -0.1397,-0.03592 -0.350986,-0.10431 -0.469524,-0.15199 -0.269237,-0.108296 -0.813747,-0.763106 -0.891209,-1.071739 -0.03193,-0.127223 -0.100779,-0.241144 -0.152995,-0.253158 -0.395192,-0.09093 -1.307367,-0.434684 -1.425919,-0.537358 -0.129078,-0.111789 -0.17724,-0.111529 -0.423334,0.0023 -0.152727,0.07063 -0.372936,0.155409 -0.489352,0.18839 -0.116417,0.03298 -0.535517,0.20634 -0.931334,0.385244 -0.769091,0.347618 -1.187878,0.44065 -1.245489,0.276683 -0.06825,-0.194258 0.746161,-0.619448 2.028656,-1.05912 0.267758,-0.09179 0.486833,-0.2042 0.486833,-0.24979 0,-0.04559 -0.0762,-0.06127 -0.169333,-0.03485 -0.09313,0.02642 -0.255058,0.06842 -0.359833,0.09334 -0.694007,0.165021 -1.658324,0.457683 -1.9685,0.597422 -0.522272,0.235292 -1.351952,0.452196 -1.430239,0.373909 -0.128538,-0.128539 0.277568,-0.398897 0.964572,-0.642147 1.392447,-0.49303 1.587211,-0.555065 2.1369,-0.68063 0.570688,-0.130362 0.741053,-0.236434 0.602416,-0.375071 -0.09335,-0.09335 -1.157418,0.04831 -1.553983,0.206869 -0.555666,0.222179 -1.89534,0.466879 -2.015082,0.368068 -0.175225,-0.144595 0.03478,-0.281616 0.660416,-0.430889 0.302683,-0.07222 0.855133,-0.209895 1.227666,-0.305947 0.372534,-0.09605 0.896409,-0.196035 1.164167,-0.222186 0.322993,-0.03155 0.486833,-0.08519 0.486833,-0.159398 0,-0.16306 -0.145744,-0.197617 -1.071601,-0.254087 -1.625762,-0.09916 -1.891732,-0.136224 -1.891732,-0.263618 0,-0.150097 -0.03959,-0.146784 1.4605,-0.122279 0.686858,0.01122 1.248833,-0.002 1.248833,-0.0294 0,-0.07012 -0.588007,-0.35658 -0.872349,-0.424978 -0.130542,-0.0314 -0.444867,-0.27479 -0.6985,-0.540862 -0.439642,-0.461205 -0.461151,-0.504712 -0.461151,-0.932792 0,-0.516616 0.124242,-0.79989 0.646055,-1.473024 0.268996,-0.347001 0.400329,-0.614638 0.46872,-0.95518 0.09441,-0.470103 0.09305,-0.475947 -0.213548,-0.92112 -0.169708,-0.246409 -0.30856,-0.482019 -0.30856,-0.523578 0,-0.04156 -0.180297,-0.258612 -0.40066,-0.482339 -0.330265,-0.335307 -0.384677,-0.43251 -0.30969,-0.553241 0.19923,-0.320769 0.538665,-0.395263 1.950533,-0.428073 1.512673,-0.03515 2.01763,0.05295 2.610899,0.455558 l 0.324225,0.220025 0.497362,-0.181347 c 0.71612,-0.26111 1.259987,-0.326557 2.04907,-0.246575 0.829331,0.08406 1.145027,0.207985 1.690128,0.663451 l 0.410866,0.343304 0.26471,-0.190071 c 0.757292,-0.543759 1.117092,-0.690392 2.398091,-0.977321 0.82895,-0.185674 0.8758,-0.141118 0.8758,0.832931 0,0.793372 -0.173371,1.374264 -0.520957,1.745498 -0.128014,0.136725 -0.15062,0.221687 -0.09011,0.338667 0.04443,0.08588 0.107178,0.302282 0.139446,0.480881 0.04455,0.246578 0.171717,0.429942 0.528401,0.761915 0.863203,0.803401 1.174942,1.84327 0.790601,2.637213 -0.104945,0.216786 -0.286351,0.507703 -0.403124,0.646481 -0.269693,0.320511 -0.92705,0.65551 -1.418449,0.722864 -0.361406,0.04954 -0.503416,0.169961 -0.274644,0.232897 0.962013,0.264652 2.2505,0.694199 2.345872,0.782051 0.09168,0.08445 0.09881,0.138209 0.02774,0.209278 -0.07107,0.07107 -0.385491,0.01484 -1.224039,-0.218889 -0.620621,-0.172987 -1.188643,-0.330576 -1.262269,-0.350196 -0.07363,-0.01962 -0.222332,0.04105 -0.330455,0.134826 -0.108124,0.09378 -0.228859,0.1705 -0.2683,0.1705 -0.177775,0 -0.04725,0.161252 0.168964,0.208741 0.360765,0.07924 1.874049,0.686785 1.983654,0.79639 0.06992,0.06992 0.07037,0.120697 0.0017,0.189386 -0.09669,0.09669 -0.978211,-0.152936 -2.256691,-0.639044 -0.668077,-0.254018 -1.066531,-0.230872 -1.408659,0.08183 -0.131209,0.119925 -0.387622,0.220757 -0.674568,0.265268 -0.444923,0.06902 -0.477043,0.09208 -0.827029,0.593805 -0.537885,0.771092 -1.18763,1.066508 -1.927403,0.876323 z"
+ id="path224" />
+ <path
+ style="fill:#c8b3a9;stroke-width:0.0846667"
+ d="m 57.609134,57.693649 c -0.366947,-0.16478 -0.845429,-0.701703 -0.986849,-1.10738 -0.05923,-0.169898 -0.162461,-0.270171 -0.312779,-0.303807 -0.418487,-0.09365 -1.155045,-0.384434 -1.296174,-0.511723 -0.122949,-0.110891 -0.170467,-0.111516 -0.381,-0.005 -0.132293,0.06692 -0.450082,0.189261 -0.706199,0.271859 -0.256116,0.0826 -0.637116,0.235847 -0.846666,0.340555 -0.534456,0.267055 -1.016186,0.393361 -1.015348,0.266216 0.0012,-0.177939 0.642678,-0.481774 2.306514,-1.092431 0.247065,-0.09068 0.300879,-0.197451 0.128479,-0.254918 -0.201927,-0.06731 -2.22416,0.475712 -2.636902,0.708074 -0.166891,0.09396 -1.006416,0.3286 -1.175684,0.3286 -0.06139,0 -0.04939,-0.04929 0.03175,-0.130425 0.177992,-0.177991 2.067698,-0.853026 2.953861,-1.055169 0.535113,-0.122065 0.686376,-0.216327 0.620909,-0.386929 -0.06241,-0.16265 -0.704682,-0.158198 -1.300957,0.009 -0.93555,0.262357 -1.479755,0.384952 -1.754713,0.395288 -0.154936,0.0058 -0.301396,0.04246 -0.325467,0.0814 -0.06803,0.110077 -0.203105,0.08336 -0.203105,-0.04018 0,-0.06362 0.18972,-0.157489 0.4445,-0.219928 0.244475,-0.05991 0.69215,-0.183348 0.994833,-0.274297 0.302684,-0.09095 0.835123,-0.201682 1.183198,-0.246073 0.816232,-0.104096 0.948763,-0.149766 0.916765,-0.315917 -0.01973,-0.102453 -0.206705,-0.163431 -0.745648,-0.243178 -0.395623,-0.05854 -0.890765,-0.108471 -1.100315,-0.110957 -0.482617,-0.0057 -1.016,-0.09251 -1.016,-0.16532 0,-0.03071 0.59055,-0.0489 1.312334,-0.04041 0.721783,0.0085 1.312333,-0.01767 1.312333,-0.05813 0,-0.110267 -0.324995,-0.299495 -0.84867,-0.494135 -0.62232,-0.231304 -1.268974,-0.963702 -1.266137,-1.43402 0.0024,-0.399975 0.224132,-0.874954 0.671242,-1.43797 0.614424,-0.773702 0.677416,-1.359866 0.215898,-2.009 -0.162983,-0.22924 -0.296333,-0.453579 -0.296333,-0.498532 0,-0.04495 -0.161183,-0.245967 -0.358185,-0.446697 -0.294005,-0.299569 -0.34183,-0.391168 -0.266906,-0.511205 0.178688,-0.286279 0.691748,-0.385014 2.022091,-0.389139 1.411463,-0.0044 1.820663,0.07551 2.405498,0.469599 l 0.373497,0.251681 0.642503,-0.239018 c 0.564616,-0.210043 0.745138,-0.237084 1.489169,-0.223066 1.008623,0.019 1.451083,0.156348 2.003058,0.62178 0.218893,0.184574 0.448303,0.33554 0.509799,0.335479 0.0615,-6.1e-5 0.328451,-0.150494 0.593236,-0.334296 0.504104,-0.349927 1.546887,-0.715293 2.325508,-0.814802 0.384775,-0.04917 0.447233,-0.03527 0.529167,0.117827 0.265615,0.496307 0.01153,1.844155 -0.451343,2.394249 l -0.196958,0.234072 0.17023,0.525647 c 0.138292,0.427024 0.268933,0.622718 0.696302,1.04303 1.007188,0.990554 1.092944,2.08923 0.242008,3.10051 -0.298173,0.354359 -0.983981,0.67465 -1.44684,0.675713 -0.296319,6.78e-4 -0.359834,0.02912 -0.359834,0.161102 0,0.160846 0.154833,0.263059 0.398483,0.263059 0.305501,0 2.056851,0.623334 2.056851,0.732068 0,0.06303 -0.01975,0.114598 -0.04389,0.114598 -0.05651,0 -1.228494,-0.311241 -1.770644,-0.470226 -0.229644,-0.06734 -0.507411,-0.12244 -0.617261,-0.12244 -0.196623,0 -0.700872,0.311303 -0.700872,0.43269 0,0.0342 0.142875,0.106183 0.3175,0.159968 0.744355,0.22926 1.88156,0.727905 1.882651,0.825509 6.77e-4,0.05821 -0.02739,0.105347 -0.06232,0.104752 -0.101029,-0.0017 -1.279554,-0.389792 -1.906933,-0.627927 -0.769819,-0.292201 -1.288883,-0.290234 -1.598143,0.0061 -0.169939,0.162812 -0.350566,0.234963 -0.663496,0.265032 -0.454614,0.04368 -0.483163,0.06701 -1.007916,0.823587 -0.451052,0.650317 -1.343099,0.888187 -2.083679,0.555625 z"
+ id="path222" />
+ <path
+ style="fill:#b19a95;stroke-width:0.0846667"
+ d="m 58.032467,57.801545 c -0.615629,-0.132705 -1.152808,-0.613914 -1.394264,-1.248991 -0.04667,-0.122762 -0.133058,-0.235967 -0.191965,-0.251567 -0.519132,-0.137478 -1.080145,-0.353551 -1.278605,-0.492452 -0.132092,-0.09245 -0.303542,-0.148459 -0.381,-0.124463 -0.481852,0.149277 -1.227687,0.440555 -1.664833,0.650184 -0.573347,0.274941 -0.973984,0.391787 -0.973014,0.28378 0.0013,-0.1488 1.09295,-0.659465 2.051335,-0.959629 0.660701,-0.20693 0.486433,-0.500053 -0.203641,-0.342529 -0.528554,0.120654 -1.845901,0.529422 -2.27168,0.704894 -0.162983,0.06717 -0.448733,0.148378 -0.635,0.180464 -0.323607,0.05574 -0.330476,0.05244 -0.15447,-0.07432 0.101308,-0.07296 0.406108,-0.206153 0.677333,-0.295977 0.271226,-0.08982 0.759837,-0.256441 1.085804,-0.370261 0.325966,-0.11382 0.814197,-0.252986 1.084956,-0.309258 0.526489,-0.109421 0.67541,-0.268647 0.456242,-0.487815 -0.116902,-0.116902 -0.212875,-0.120131 -0.794745,-0.02674 -0.363983,0.05842 -0.734611,0.144886 -0.823619,0.192148 -0.165905,0.08809 -1.179875,0.319347 -1.400236,0.319347 -0.219915,0 0.02288,-0.155931 0.376735,-0.241949 0.186267,-0.04528 0.608021,-0.159994 0.937232,-0.254922 0.329212,-0.09493 0.672112,-0.154929 0.762001,-0.133336 0.08989,0.02159 0.334884,-0.01296 0.544434,-0.07678 0.312091,-0.09505 0.381,-0.152421 0.381,-0.3172 0,-0.115654 -0.05398,-0.207582 -0.127,-0.216266 -0.06985,-0.0083 -0.52705,-0.06598 -1.016,-0.12816 l -0.889,-0.113055 0.972157,-0.04233 0.972157,-0.04233 -0.20245,-0.188166 c -0.111348,-0.103492 -0.393418,-0.251595 -0.626822,-0.32912 -0.445241,-0.147885 -1.091333,-0.674646 -1.281308,-1.044655 -0.07424,-0.144597 -0.09125,-0.342074 -0.05144,-0.597059 0.07203,-0.461267 0.175813,-0.663728 0.653404,-1.274659 0.267101,-0.341675 0.39418,-0.602312 0.464577,-0.952845 0.0965,-0.480513 0.09562,-0.48445 -0.211187,-0.946539 -0.16945,-0.25521 -0.308091,-0.498184 -0.308091,-0.539941 0,-0.04176 -0.180878,-0.251738 -0.401951,-0.466624 -0.335109,-0.32573 -0.386556,-0.415399 -0.309369,-0.539214 0.150283,-0.241068 0.760572,-0.346114 2.052956,-0.353364 1.346777,-0.0076 1.955633,0.111653 2.375736,0.465147 0.301514,0.253707 0.335249,0.253552 1.066295,-0.0049 0.462797,-0.163602 0.759642,-0.209461 1.354666,-0.209278 1.157295,3.56e-4 1.344087,0.06757 2.466009,0.887381 0.167091,0.122096 0.198351,0.116103 0.435556,-0.08349 0.14055,-0.118266 0.293006,-0.215028 0.33879,-0.215028 0.04579,0 0.130342,-0.05675 0.187905,-0.126109 0.123676,-0.14902 1.473836,-0.590281 2.065772,-0.675138 0.304805,-0.0437 0.432894,-0.0296 0.485536,0.05345 0.03933,0.06204 0.07209,0.423966 0.0728,0.80428 0.0014,0.727385 -0.141967,1.187684 -0.512509,1.645891 -0.171649,0.212258 -0.173333,0.23586 -0.044,0.616792 0.07396,0.217848 0.134651,0.442381 0.134866,0.498962 2.54e-4,0.05658 0.247755,0.348023 0.55009,0.647648 0.965735,0.957083 1.135735,1.866066 0.526976,2.81771 -0.357099,0.558234 -0.762937,0.809262 -1.542782,0.954273 -0.356917,0.06637 -0.515715,0.136236 -0.534792,0.235297 -0.01859,0.09651 0.04799,0.156323 0.211325,0.189866 0.4529,0.09301 2.186051,0.65855 2.270459,0.74087 0.113891,0.111078 -0.190444,0.05563 -1.474123,-0.268561 l -1.050789,-0.265377 -0.327658,0.227067 c -0.383167,0.265535 -0.377974,0.377677 0.022,0.475026 0.435482,0.105992 1.8568,0.689685 1.856858,0.762556 2.7e-5,0.03493 -0.03805,0.0635 -0.08461,0.0635 -0.0811,0 -1.033238,-0.309426 -2.043486,-0.664093 -0.641622,-0.225254 -1.106087,-0.195753 -1.368033,0.08689 -0.14213,0.15336 -0.328743,0.236341 -0.622295,0.276715 -0.513931,0.07068 -0.528138,0.08005 -0.85864,0.565906 -0.533019,0.783573 -1.143178,1.09833 -1.83855,0.948434 z"
+ id="path220" />
+ <path
+ style="fill:#ac876e;stroke-width:0.0846667"
+ d="m 57.60299,57.645004 c -0.30453,-0.133692 -0.820632,-0.736543 -0.939548,-1.097471 -0.05907,-0.179296 -0.1543,-0.267494 -0.330639,-0.30623 -0.38527,-0.08463 -1.139014,-0.405862 -1.27766,-0.544509 -0.141285,-0.141285 -0.333187,-0.16366 -0.405139,-0.04724 -0.02647,0.04283 -0.323991,0.162988 -0.661164,0.267028 -0.337172,0.104039 -0.74639,0.272222 -0.909373,0.373738 -0.32948,0.205222 -0.677334,0.31643 -0.677334,0.216541 0,-0.115591 1.037007,-0.573109 1.92955,-0.8513 0.46852,-0.14603 0.455684,-0.361149 -0.02537,-0.425162 -0.291512,-0.03879 -0.31172,-0.05409 -0.147347,-0.111539 0.205102,-0.07169 0.260389,-0.374749 0.09799,-0.537148 -0.0669,-0.0669 -0.06528,-0.143397 0.0059,-0.276345 0.137254,-0.256463 -0.02142,-0.424757 -0.410566,-0.435451 -0.168923,-0.0046 -0.402383,-0.03894 -0.518799,-0.07623 -0.16154,-0.05173 -0.09638,-0.06979 0.275166,-0.07623 0.361353,-0.0063 0.486834,-0.03959 0.486834,-0.129295 0,-0.182476 -0.367084,-0.434056 -0.817239,-0.560091 -0.301334,-0.08437 -0.514171,-0.230312 -0.850658,-0.583303 -0.399137,-0.418713 -0.44877,-0.510986 -0.44877,-0.834305 0,-0.432331 0.231488,-0.925618 0.696823,-1.484888 0.572791,-0.688418 0.636703,-1.342983 0.192177,-1.968217 -0.162983,-0.22924 -0.296333,-0.453579 -0.296333,-0.498532 0,-0.04495 -0.161184,-0.245967 -0.358186,-0.446697 -0.294616,-0.300192 -0.341878,-0.390918 -0.266303,-0.511205 0.140766,-0.224043 0.811385,-0.340834 2.008458,-0.349779 1.196826,-0.0089 1.774868,0.107298 2.297609,0.46204 0.380543,0.258244 0.435803,0.257569 1.222723,-0.01493 0.577414,-0.19995 0.725788,-0.217591 1.488032,-0.17692 0.960441,0.05125 1.263606,0.157386 1.850719,0.647949 0.226262,0.189053 0.452068,0.343733 0.501792,0.343733 0.04972,0 0.34085,-0.168094 0.646948,-0.373541 0.519194,-0.348474 0.950642,-0.508936 2.153785,-0.801022 0.580525,-0.140933 0.646423,-0.06401 0.646423,0.754577 0,0.706947 -0.188738,1.306021 -0.524399,1.664496 -0.115476,0.123325 -0.158396,0.251947 -0.127136,0.381 0.216083,0.892065 0.237069,0.93154 0.770646,1.449585 0.41505,0.402967 0.581845,0.640007 0.725642,1.031239 0.238495,0.648877 0.196017,1.060572 -0.173101,1.677698 -0.346521,0.579343 -0.902303,0.921828 -1.602985,0.987795 -0.426511,0.04015 -0.465667,0.06137 -0.465667,0.252338 0,0.167431 0.05837,0.223396 0.296333,0.284136 0.769521,0.196418 1.442274,0.417294 1.485871,0.487835 0.06606,0.106897 0.05553,0.105223 -0.842813,-0.133802 -0.985063,-0.2621 -1.011825,-0.261904 -1.368373,0.01005 -0.363931,0.277583 -0.36852,0.425643 -0.01552,0.500564 0.376862,0.07998 1.574345,0.542604 1.62761,0.628789 0.06711,0.108592 -0.619548,-0.06813 -1.1831,-0.304495 -1.101186,-0.461851 -1.682224,-0.494334 -2.061317,-0.115241 -0.194359,0.194358 -0.33063,0.254 -0.580341,0.254 -0.412045,0 -0.640513,0.160091 -0.927613,0.649992 -0.32855,0.560628 -0.860879,0.875958 -1.463815,0.867102 -0.258642,-0.0038 -0.587322,-0.0583 -0.730401,-0.121113 z"
+ id="path218" />
+ <path
+ style="fill:#c68135;stroke-width:0.0846667"
+ d="m 57.609134,57.615809 c -0.371006,-0.178449 -0.720946,-0.579982 -0.919401,-1.054953 -0.0912,-0.218282 -0.19601,-0.321085 -0.366187,-0.35919 -0.463878,-0.103869 -1.002641,-0.321519 -1.175203,-0.474757 -0.09613,-0.08537 -0.215577,-0.155219 -0.265429,-0.155219 -0.04985,0 -0.153049,-0.09525 -0.229328,-0.211667 -0.07628,-0.116416 -0.199626,-0.211666 -0.274105,-0.211666 -0.109246,0 -0.115549,-0.02394 -0.03262,-0.123865 0.08114,-0.09776 0.07752,-0.174543 -0.01717,-0.364356 -0.08808,-0.176564 -0.09594,-0.278598 -0.02955,-0.383843 0.06558,-0.103963 0.06151,-0.189644 -0.01479,-0.311829 -0.05787,-0.09266 -0.105216,-0.218959 -0.105216,-0.28066 0,-0.210813 -0.335483,-0.472523 -0.842875,-0.657528 -0.685744,-0.250035 -1.358458,-0.937991 -1.358458,-1.389237 0,-0.41886 0.17957,-0.810912 0.639631,-1.396497 0.631442,-0.803724 0.70992,-1.467214 0.249369,-2.108268 -0.162983,-0.226861 -0.296333,-0.444582 -0.296333,-0.483824 0,-0.03924 -0.157561,-0.231893 -0.350134,-0.428111 -0.219201,-0.22335 -0.331646,-0.404941 -0.300694,-0.485601 0.09004,-0.234649 0.729136,-0.344489 2.005494,-0.344681 1.358963,-2.03e-4 1.899113,0.119505 2.385353,0.528649 l 0.26343,0.221662 0.644109,-0.22134 c 0.853693,-0.29336 1.19566,-0.333764 2.024658,-0.239215 0.784495,0.08947 1.118442,0.222823 1.608502,0.642297 0.332237,0.284383 0.634344,0.371186 0.733497,0.210752 0.187013,-0.302593 1.137863,-0.750709 1.992452,-0.939002 0.256116,-0.05643 0.569893,-0.133781 0.697281,-0.17189 0.367002,-0.10979 0.488052,0.08153 0.488052,0.771353 0,0.608283 -0.213177,1.221841 -0.587077,1.6897 l -0.169158,0.211667 0.176659,0.550333 c 0.130371,0.406141 0.271805,0.643466 0.539802,0.905788 0.559241,0.547399 0.774416,0.871962 0.925824,1.396478 0.110126,0.381504 0.120278,0.551893 0.04872,0.817654 -0.241505,0.89688 -1.115897,1.621414 -1.956776,1.621414 -0.334723,0 -0.415564,0.03041 -0.460946,0.173396 -0.03027,0.09537 -0.0091,0.228718 0.047,0.296334 0.05611,0.06761 0.06619,0.122936 0.02239,0.122936 -0.141625,0 -0.787758,0.540612 -0.787758,0.659108 0,0.08638 -0.127228,0.109678 -0.512966,0.09394 -0.458154,-0.0187 -0.53488,0.0027 -0.718059,0.200249 -0.140732,0.151773 -0.331804,0.239339 -0.608867,0.279038 -0.44947,0.0644 -0.708023,0.259054 -0.97496,0.734003 -0.398929,0.7098 -1.402255,1.02441 -2.138148,0.670453 z"
+ id="path216" />
+ <path
+ style="fill:#c27c32;stroke-width:0.0846667"
+ d="m 57.609134,57.615809 c -0.371006,-0.178449 -0.720946,-0.579982 -0.919401,-1.054953 -0.0912,-0.218282 -0.19601,-0.321085 -0.366187,-0.35919 -0.463878,-0.103869 -1.002641,-0.321519 -1.175203,-0.474757 -0.09613,-0.08537 -0.215577,-0.155219 -0.265429,-0.155219 -0.04985,0 -0.153049,-0.09525 -0.229328,-0.211667 -0.07628,-0.116416 -0.199626,-0.211666 -0.274105,-0.211666 -0.109246,0 -0.115549,-0.02394 -0.03262,-0.123865 0.08114,-0.09776 0.07752,-0.174543 -0.01717,-0.364356 -0.08808,-0.176564 -0.09594,-0.278598 -0.02955,-0.383843 0.06558,-0.103963 0.06151,-0.189644 -0.01479,-0.311829 -0.05787,-0.09266 -0.105216,-0.218959 -0.105216,-0.28066 0,-0.210813 -0.335483,-0.472523 -0.842875,-0.657528 -0.685744,-0.250035 -1.358458,-0.937991 -1.358458,-1.389237 0,-0.41886 0.17957,-0.810912 0.639631,-1.396497 0.631442,-0.803724 0.70992,-1.467214 0.249369,-2.108268 -0.162983,-0.226861 -0.296333,-0.444582 -0.296333,-0.483824 0,-0.03924 -0.157561,-0.231893 -0.350134,-0.428111 -0.219201,-0.22335 -0.331646,-0.404941 -0.300694,-0.485601 0.09004,-0.234649 0.729136,-0.344489 2.005494,-0.344681 1.358963,-2.03e-4 1.899113,0.119505 2.385353,0.528649 l 0.26343,0.221662 0.644109,-0.22134 c 0.853693,-0.29336 1.19566,-0.333764 2.024658,-0.239215 0.784495,0.08947 1.118442,0.222823 1.608502,0.642297 0.332237,0.284383 0.634344,0.371186 0.733497,0.210752 0.187013,-0.302593 1.137863,-0.750709 1.992452,-0.939002 0.256116,-0.05643 0.569893,-0.133781 0.697281,-0.17189 0.367002,-0.10979 0.488052,0.08153 0.488052,0.771353 0,0.608283 -0.213177,1.221841 -0.587077,1.6897 l -0.169158,0.211667 0.176659,0.550333 c 0.130371,0.406141 0.271805,0.643466 0.539802,0.905788 0.559241,0.547399 0.774416,0.871962 0.925824,1.396478 0.110126,0.381504 0.120278,0.551893 0.04872,0.817654 -0.241505,0.89688 -1.115897,1.621414 -1.956776,1.621414 -0.334723,0 -0.415564,0.03041 -0.460946,0.173396 -0.03027,0.09537 -0.0091,0.228718 0.047,0.296334 0.05611,0.06761 0.06619,0.122936 0.02239,0.122936 -0.141625,0 -0.787758,0.540612 -0.787758,0.659108 0,0.08638 -0.127228,0.109678 -0.512966,0.09394 -0.458154,-0.0187 -0.53488,0.0027 -0.718059,0.200249 -0.140732,0.151773 -0.331804,0.239339 -0.608867,0.279038 -0.44947,0.0644 -0.708023,0.259054 -0.97496,0.734003 -0.398929,0.7098 -1.402255,1.02441 -2.138148,0.670453 z m -3.231293,-4.514145 c 0.0634,-0.242436 -0.01052,-0.348393 -0.207172,-0.296967 -0.111209,0.02908 -0.202888,-0.03137 -0.301986,-0.199132 -0.117761,-0.199354 -0.183249,-0.232702 -0.379787,-0.193394 -0.179193,0.03584 -0.251938,0.0098 -0.296358,-0.105914 -0.03471,-0.09047 -0.01788,-0.167075 0.04103,-0.186712 0.05494,-0.01832 0.0999,-0.06703 0.0999,-0.108253 0,-0.04122 -0.05229,-0.05489 -0.116191,-0.03037 -0.146407,0.05618 -0.245083,-0.385413 -0.119936,-0.536734 0.109301,-0.132161 0.320793,-0.138562 0.320793,-0.0097 0,0.05287 0.09525,0.184399 0.211667,0.292291 0.151448,0.140357 0.211667,0.161185 0.211667,0.07321 0,-0.06763 0.03676,-0.122958 0.08169,-0.122958 0.145204,0 0.283805,-0.345707 0.180155,-0.449356 -0.118014,-0.118015 -0.121447,-0.340522 -0.0041,-0.268018 0.09712,0.06002 0.334958,-0.103046 0.334958,-0.229648 0,-0.04379 -0.07242,-0.0677 -0.160937,-0.05313 -0.09248,0.01522 -0.254707,-0.07458 -0.381373,-0.21111 -0.121241,-0.13068 -0.263262,-0.211132 -0.315603,-0.178784 -0.06415,0.03965 -0.04793,0.08525 0.04979,0.139936 0.133129,0.0745 0.129358,0.09772 -0.04622,0.284617 -0.105146,0.111923 -0.267375,0.203496 -0.360508,0.203496 -0.1624,0 -0.161357,-0.0085 0.02547,-0.207358 0.118548,-0.126189 0.174022,-0.261516 0.141714,-0.345708 -0.07218,-0.188086 -0.24138,-0.117199 -0.37512,0.157152 -0.06075,0.124619 -0.161388,0.226581 -0.22364,0.226581 -0.153466,0 -0.385574,0.60577 -0.385574,1.006295 0,0.516472 0.318289,0.821409 1.016,0.973378 0.116417,0.02536 0.337844,0.161803 0.492059,0.303215 0.333491,0.305801 0.403914,0.316808 0.467649,0.07309 z m 2.901766,-1.488141 c 0.06186,-0.08149 0.113686,-0.214841 0.115167,-0.296333 0.0037,-0.204425 0.262352,-0.187146 0.316828,0.02117 0.02435,0.09313 0.07794,0.169333 0.119073,0.169333 0.04114,0 0.07479,-0.0762 0.07479,-0.169333 0,-0.09313 -0.03016,-0.169334 -0.06703,-0.169334 -0.09069,0 -0.694973,-0.574712 -0.694973,-0.660965 0,-0.03777 -0.04886,-0.135489 -0.108577,-0.217158 -0.0934,-0.127732 -0.103879,-0.09923 -0.07497,0.203906 0.02555,0.2679 -0.0117,0.413679 -0.155369,0.607995 -0.137871,0.186481 -0.161434,0.272624 -0.08713,0.318545 0.05601,0.03462 0.09577,0.0953 0.08835,0.134838 -0.0074,0.03954 0.056,0.09928 0.140936,0.132749 0.217957,0.08589 0.208906,0.08794 0.332905,-0.07541 z m -1.27914,-1.77565 c 0.297699,-0.07373 0.635,-0.232122 0.635,-0.298185 0,-0.0352 -0.09645,-0.064 -0.214324,-0.064 -0.274974,0 -0.356861,-0.213181 -0.163822,-0.426487 0.192115,-0.212285 0.293479,-0.211196 0.293479,0.0032 0,0.112888 0.05645,0.169333 0.169334,0.169333 0.189481,0 0.21726,-0.08754 0.07342,-0.231376 -0.05275,-0.05275 -0.07047,-0.1622 -0.03938,-0.243222 0.05125,-0.133561 0.06857,-0.130126 0.185481,0.03679 0.07092,0.101257 0.105445,0.222137 0.07672,0.268622 -0.02956,0.04784 0.0418,0.08452 0.164428,0.08452 0.217992,0 0.289345,-0.11442 0.131997,-0.211666 -0.04657,-0.02878 -0.08467,-0.14977 -0.08467,-0.268867 0,-0.189333 -0.02858,-0.211077 -0.227467,-0.173057 -0.260784,0.04985 -0.449867,-0.0034 -0.449867,-0.126647 0,-0.04663 0.08573,-0.06385 0.1905,-0.03825 0.214782,0.05246 0.606741,-0.187957 0.420111,-0.257689 -0.07172,-0.0268 -0.0047,-0.139214 0.195876,-0.328336 0.439689,-0.41468 0.226551,-0.653387 -0.249234,-0.279135 -0.288888,0.22724 -0.638671,0.169715 -1.023715,-0.168357 -0.428858,-0.376543 -1.363584,-0.555322 -2.534661,-0.484788 -0.509735,0.0307 -0.945653,0.07468 -0.968706,0.09774 -0.06943,0.06943 0.856212,0.966032 1.196074,1.158546 0.174118,0.09863 0.340209,0.253776 0.36909,0.344773 0.0409,0.128849 0.06817,0.140104 0.123318,0.05088 0.03894,-0.06301 0.101393,-0.08398 0.138777,-0.0466 0.03738,0.03738 -0.0061,0.122148 -0.09668,0.188366 -0.120566,0.08816 -0.139507,0.145537 -0.07074,0.2143 0.111461,0.111461 0.277993,0.02899 0.277993,-0.137663 0,-0.06479 0.05799,-0.15025 0.128869,-0.189915 0.114625,-0.06415 0.11342,-0.103089 -0.0109,-0.352304 -0.117198,-0.234928 -0.120919,-0.291979 -0.02304,-0.353203 0.08579,-0.05366 0.12384,-0.0175 0.143529,0.13643 0.03125,0.244288 0.184877,0.28525 0.184877,0.04929 0,-0.169244 0.35637,-0.314557 0.521359,-0.212588 0.114105,0.07052 0.237652,-0.119485 0.239344,-0.36809 0.0016,-0.236074 0.13439,-0.247083 0.255297,-0.02117 0.04984,0.09313 0.141671,0.169333 0.204062,0.169333 0.06239,0 0.136298,0.1143 0.164238,0.254 0.03079,0.153941 0.103631,0.254 0.184913,0.254 0.07376,0 0.109032,0.04058 0.07838,0.09018 -0.03696,0.0598 -0.105065,0.04554 -0.202164,-0.04233 -0.08054,-0.07288 -0.185874,-0.132515 -0.234086,-0.132515 -0.130863,0 -0.210068,0.745616 -0.100877,0.94964 0.08468,0.158234 0.07394,0.16915 -0.118855,0.120762 -0.323516,-0.0812 -0.43969,0.344017 -0.174154,0.637431 0.126409,0.139681 0.126898,0.154834 0.005,0.154834 -0.07432,0 -0.162674,0.04457 -0.196345,0.09905 -0.04314,0.0698 -0.01336,0.07947 0.100837,0.03273 0.08913,-0.03648 0.238256,-0.0852 0.331389,-0.108266 z"
+ id="path214" />
+ <path
+ style="fill:#ba7832;stroke-width:0.0846667"
+ d="m 57.609134,57.615809 c -0.371006,-0.178449 -0.720946,-0.579982 -0.919401,-1.054953 -0.0912,-0.218282 -0.19601,-0.321085 -0.366187,-0.35919 -0.463878,-0.103869 -1.002641,-0.321519 -1.175203,-0.474757 -0.09613,-0.08537 -0.215577,-0.155219 -0.265429,-0.155219 -0.04985,0 -0.153049,-0.09525 -0.229328,-0.211667 -0.07628,-0.116416 -0.199626,-0.211666 -0.274105,-0.211666 -0.109246,0 -0.115549,-0.02394 -0.03262,-0.123865 0.08114,-0.09776 0.07752,-0.174543 -0.01717,-0.364356 -0.08808,-0.176564 -0.09594,-0.278598 -0.02955,-0.383843 0.06558,-0.103963 0.06151,-0.189644 -0.01479,-0.311829 -0.05787,-0.09266 -0.105216,-0.218959 -0.105216,-0.28066 0,-0.210813 -0.335483,-0.472523 -0.842875,-0.657528 -0.685744,-0.250035 -1.358458,-0.937991 -1.358458,-1.389237 0,-0.41886 0.17957,-0.810912 0.639631,-1.396497 0.631442,-0.803724 0.70992,-1.467214 0.249369,-2.108268 -0.162983,-0.226861 -0.296333,-0.444582 -0.296333,-0.483824 0,-0.03924 -0.157561,-0.231893 -0.350134,-0.428111 -0.219201,-0.22335 -0.331646,-0.404941 -0.300694,-0.485601 0.09004,-0.234649 0.729136,-0.344489 2.005494,-0.344681 1.358963,-2.03e-4 1.899113,0.119505 2.385353,0.528649 l 0.26343,0.221662 0.644109,-0.22134 c 0.853693,-0.29336 1.19566,-0.333764 2.024658,-0.239215 0.784495,0.08947 1.118442,0.222823 1.608502,0.642297 0.332237,0.284383 0.634344,0.371186 0.733497,0.210752 0.187013,-0.302593 1.137863,-0.750709 1.992452,-0.939002 0.256116,-0.05643 0.569893,-0.133781 0.697281,-0.17189 0.367002,-0.10979 0.488052,0.08153 0.488052,0.771353 0,0.608283 -0.213177,1.221841 -0.587077,1.6897 l -0.169158,0.211667 0.176659,0.550333 c 0.130371,0.406141 0.271805,0.643466 0.539802,0.905788 0.559241,0.547399 0.774416,0.871962 0.925824,1.396478 0.110126,0.381504 0.120278,0.551893 0.04872,0.817654 -0.241505,0.89688 -1.115897,1.621414 -1.956776,1.621414 -0.334723,0 -0.415564,0.03041 -0.460946,0.173396 -0.03027,0.09537 -0.0091,0.228718 0.047,0.296334 0.05611,0.06761 0.06619,0.122936 0.02239,0.122936 -0.141625,0 -0.787758,0.540612 -0.787758,0.659108 0,0.08638 -0.127228,0.109678 -0.512966,0.09394 -0.458154,-0.0187 -0.53488,0.0027 -0.718059,0.200249 -0.140732,0.151773 -0.331804,0.239339 -0.608867,0.279038 -0.44947,0.0644 -0.708023,0.259054 -0.97496,0.734003 -0.398929,0.7098 -1.402255,1.02441 -2.138148,0.670453 z M 58.8595,57.16984 c 0.303359,-0.159733 0.422819,-0.412816 0.194856,-0.412816 -0.06661,0 -0.133287,-0.08573 -0.148167,-0.1905 -0.02162,-0.152236 -0.07382,-0.185605 -0.259889,-0.166129 -0.16363,0.01713 -0.232833,-0.01433 -0.232833,-0.105834 0,-0.07161 0.04762,-0.131393 0.105833,-0.132847 0.05821,-0.0015 -0.04463,-0.09507 -0.228526,-0.208041 -0.252357,-0.155025 -0.362054,-0.182414 -0.447283,-0.111681 -0.09072,0.07529 -0.05826,0.139812 0.165026,0.328078 0.223627,0.188556 0.257266,0.255577 0.172117,0.342923 -0.05821,0.05971 -0.105834,0.139044 -0.105834,0.176297 0,0.09845 0.31915,0.08314 0.381854,-0.01831 0.08649,-0.13995 0.198664,-0.01278 0.150656,0.170799 -0.04393,0.167985 -0.221364,0.213804 -0.701843,0.181237 -0.185039,-0.01254 -0.194564,-8.89e-4 -0.07572,0.09266 0.183731,0.144626 0.796717,0.176867 1.029751,0.05416 z m -1.847129,-1.548649 c 0.15774,-0.06591 0.332107,-0.204491 0.387484,-0.307963 0.09485,-0.177233 0.08669,-0.185454 -0.141006,-0.141928 l -0.24169,0.0462 0.190154,-0.153978 c 0.2512,-0.203409 0.239888,-0.320694 -0.04268,-0.442486 -0.128059,-0.0552 -0.393908,-0.244879 -0.590775,-0.421519 -0.378049,-0.339203 -0.638104,-0.394961 -0.903888,-0.193799 -0.145294,0.109967 -0.147379,0.127267 -0.02117,0.175699 0.077,0.02955 0.139996,0.125845 0.139996,0.213996 0,0.140817 -0.06681,0.160275 -0.550333,0.160275 -0.451556,0 -0.550333,0.0247 -0.550333,0.137583 0,0.109601 0.05506,0.126573 0.270697,0.08345 0.687289,-0.137459 1.128854,-0.148385 1.283859,-0.03177 0.141236,0.106258 0.144174,0.131916 0.02837,0.247725 -0.07105,0.07105 -0.122905,0.201825 -0.115223,0.290604 0.01017,0.117507 -0.04937,0.1687 -0.218866,0.188203 -0.280989,0.03233 -0.30653,0.158904 -0.04233,0.209792 0.406069,0.07821 0.842961,0.05473 1.117737,-0.06008 z m 2.079726,-0.494001 c 9.56e-4,-0.07787 0.02052,-0.07549 0.07408,0.009 0.05215,0.0823 0.08962,0.08763 0.132162,0.0188 0.0789,-0.127667 -0.307944,-0.443998 -0.414975,-0.339331 -0.04424,0.04326 -0.139488,0.07745 -0.211667,0.07596 -0.110429,-0.0023 -0.107744,-0.02052 0.01693,-0.115167 0.197342,-0.149804 0.188073,-0.305474 -0.01819,-0.305474 -0.0915,0 -0.207905,-0.07764 -0.258691,-0.172531 -0.09755,-0.182273 -0.04122,-0.497518 0.09208,-0.515385 0.04343,-0.0058 0.113886,-0.01535 0.156573,-0.02117 0.04269,-0.0058 0.10936,-0.04463 0.148166,-0.08625 0.126641,-0.135805 -0.505091,0.02999 -0.664722,0.174456 -0.249717,0.22599 -0.196843,0.631662 0.121444,0.931781 0.440912,0.415745 0.823974,0.575706 0.826797,0.345258 z m 2.098437,0.0042 c 0.185433,-0.185433 0.10614,-0.237066 -0.364067,-0.237066 -0.256117,0 -0.465667,-0.03712 -0.465667,-0.08249 0,-0.141817 0.483326,-0.340229 0.863629,-0.35453 0.240877,-0.0091 0.149205,-0.03209 -0.270962,-0.06808 -0.34925,-0.02991 -0.674378,-0.02593 -0.722506,0.0088 -0.119109,0.08607 -0.32946,-0.05439 -0.257011,-0.171614 0.032,-0.05177 0.149386,-0.09413 0.260863,-0.09413 0.262231,0 0.64167,-0.173073 0.584003,-0.266381 -0.02457,-0.03976 -0.135429,-0.07229 -0.246349,-0.07229 -0.237792,0 -0.313267,-0.08961 -0.212631,-0.25244 0.0512,-0.08284 0.0079,-0.150879 -0.14718,-0.231341 -0.174911,-0.09074 -0.233086,-0.09234 -0.285313,-0.0078 -0.03608,0.05838 -0.02632,0.130427 0.02169,0.1601 0.05244,0.03241 0.03375,0.0745 -0.0468,0.105411 -0.08039,0.03085 -0.134099,0.151424 -0.134099,0.30106 0,0.137281 -0.04762,0.266959 -0.105834,0.288172 -0.06871,0.02504 -0.0053,0.144395 0.180639,0.340251 0.196785,0.207232 0.272498,0.35512 0.241835,0.472373 -0.0398,0.152211 0.0025,0.174025 0.390861,0.201477 0.239524,0.01693 0.475504,0.03783 0.524399,0.04644 0.04889,0.0086 0.13462,-0.03006 0.1905,-0.08594 z m -3.315736,-1.730395 c 0.163862,-0.129697 0.297151,-0.60563 0.18843,-0.672824 -0.04607,-0.02847 -0.153781,0.01159 -0.239357,0.08904 -0.09897,0.08957 -0.175322,0.108887 -0.209807,0.05309 -0.02982,-0.04825 0.0426,-0.171899 0.160928,-0.274784 0.262889,-0.22858 0.272874,-0.32586 0.03345,-0.32586 -0.173366,0 -0.171224,-0.0097 0.0467,-0.211667 0.238976,-0.221476 0.389001,-0.270455 0.389001,-0.127 0,0.04657 0.04277,0.08467 0.09503,0.08467 0.06395,0 0.0591,-0.0433 -0.01482,-0.132371 -0.06507,-0.07841 -0.112443,-0.371692 -0.1162,-0.719443 -0.0065,-0.60567 -0.0284,-0.658598 -0.200759,-0.486237 -0.0786,0.0786 -0.129194,0.06438 -0.225907,-0.0635 -0.121655,-0.160855 -0.124689,-0.160242 -0.127317,0.02572 -0.0015,0.104775 -0.04252,0.1905 -0.09121,0.1905 -0.101843,0 -0.419136,-0.315994 -0.552533,-0.550271 -0.07368,-0.129389 -0.08379,-0.100034 -0.05387,0.15627 0.03086,0.264294 -0.02073,0.399485 -0.317415,0.831806 -0.229197,0.333985 -0.303108,0.496593 -0.209367,0.460621 0.198358,-0.07612 0.459702,0.01803 0.459702,0.165612 0,0.134272 0.0389,0.142594 0.3175,0.06793 0.112052,-0.03003 0.1905,-0.116717 0.1905,-0.210511 0,-0.190057 0.109667,-0.206369 0.250069,-0.03719 0.08152,0.09823 0.06691,0.143844 -0.0743,0.232033 -0.09667,0.06037 -0.175769,0.175464 -0.175769,0.255758 0,0.08029 -0.0762,0.186769 -0.169333,0.236612 -0.19791,0.105918 -0.227003,0.338667 -0.04233,0.338667 0.06985,0 0.127,0.03538 0.127,0.07862 0,0.04324 0.06232,0.14094 0.138491,0.21711 0.10336,0.103359 0.114098,0.162882 0.04233,0.234648 -0.07176,0.07176 -0.09616,0.06985 -0.09616,-0.0075 0,-0.05703 -0.09525,-0.13991 -0.211667,-0.184171 -0.116416,-0.04426 -0.212825,-0.148094 -0.214241,-0.230738 -0.0024,-0.142551 -0.007,-0.142659 -0.08887,-0.0021 -0.09736,0.167161 -0.152457,0.178749 -0.326441,0.06866 -0.09917,-0.06275 -0.101722,-0.100815 -0.01388,-0.206662 0.05922,-0.07136 0.0799,-0.174695 0.04594,-0.229636 -0.04265,-0.06901 -0.111094,-0.03743 -0.221365,0.102124 -0.341328,0.43197 -0.339756,0.455181 0.05065,0.747698 0.201862,0.151249 0.476339,0.420498 0.609949,0.598331 l 0.242927,0.323334 0.241313,-0.395006 c 0.132723,-0.217254 0.296081,-0.438355 0.363018,-0.491335 z m 6.766475,0.161652 c 0.421979,-0.201227 0.442655,-0.361657 0.04661,-0.361657 -0.305275,0 -0.321752,-0.01317 -0.2813,-0.224778 0.03877,-0.202825 0.02316,-0.219476 -0.159907,-0.170489 -0.111582,0.02986 -0.238734,0.05481 -0.282559,0.05544 -0.04383,6.35e-4 -0.0058,0.0552 0.08456,0.121256 0.15693,0.11475 0.152936,0.122609 -0.08965,0.176405 -0.451949,0.100225 -0.486227,0.123337 -0.440762,0.29719 0.02468,0.09437 9.99e-4,0.172012 -0.05389,0.176744 -0.05385,0.0046 -0.0027,0.04012 0.11376,0.07883 0.264272,0.08788 0.692235,0.02793 1.063139,-0.148946 z m -10.20714,-0.400978 c 0,-0.06821 0.08271,-0.168286 0.183798,-0.222387 0.15231,-0.08151 0.203076,-0.072 0.296333,0.05554 0.09937,0.135893 0.112536,0.106497 0.112536,-0.251206 0,-0.333904 0.02976,-0.412893 0.169334,-0.449391 0.218501,-0.05714 0.214369,-0.07858 -0.06075,-0.315229 -0.19412,-0.166975 -0.213002,-0.218487 -0.12081,-0.329573 0.0601,-0.07242 0.164122,-0.110617 0.23116,-0.08489 0.06704,0.02572 0.179474,-10e-4 0.249856,-0.05943 0.07038,-0.05841 0.155622,-0.07845 0.189422,-0.04452 0.0338,0.03393 -0.02509,0.131852 -0.130866,0.21761 -0.105776,0.08576 -0.158461,0.17685 -0.117078,0.202426 0.06458,0.03991 0.775065,-0.656181 0.775065,-0.759362 0,-0.02029 -0.07565,-0.0369 -0.168119,-0.0369 -0.09246,0 -0.337644,-0.04534 -0.544843,-0.100759 -0.382686,-0.102353 -0.535719,-0.06884 -0.905364,0.198285 -0.07516,0.05432 -0.201192,0.07399 -0.280067,0.04373 -0.127379,-0.04888 -0.118361,-0.08787 0.08067,-0.348822 0.123247,-0.161584 0.300751,-0.318123 0.394455,-0.347863 0.156099,-0.04954 0.148378,-0.06745 -0.09218,-0.213742 -0.472367,-0.287264 -0.262024,-0.540526 0.278307,-0.335093 0.148664,0.05652 0.356653,0.0437 0.686976,-0.04233 0.260567,-0.06787 0.544499,-0.123398 0.63096,-0.123398 0.08646,0 0.31144,-0.08233 0.499953,-0.182951 0.283755,-0.15146 0.365285,-0.164249 0.473668,-0.0743 0.072,0.05976 0.130916,0.211004 0.130916,0.336102 0,0.247065 0.204947,0.591091 0.297183,0.498854 0.03137,-0.03137 0.0079,-0.192811 -0.05208,-0.358769 -0.07664,-0.211937 -0.08464,-0.371312 -0.0269,-0.535505 0.08333,-0.236936 0.354411,-0.336151 0.305606,-0.111849 -0.03532,0.162305 0.217176,0.813574 0.362022,0.933785 0.08886,0.07375 0.145168,0.05218 0.248356,-0.09514 0.09121,-0.130214 0.261104,-0.210153 0.536795,-0.252568 0.396034,-0.06093 0.394134,-0.0617 -0.10467,-0.04248 l -0.508026,0.01957 0.190526,-0.190525 c 0.2292,-0.2292 0.238878,-0.330977 0.04236,-0.44544 -0.08223,-0.04789 -0.101069,-0.08745 -0.04233,-0.08887 0.05821,-0.0014 0.105834,-0.05972 0.105834,-0.129574 0,-0.149069 0.07767,-0.15766 0.381388,-0.04219 0.171175,0.06508 0.252662,0.05523 0.350226,-0.04233 0.188222,-0.188222 0.294464,-0.154447 0.236805,0.07528 -0.02794,0.111337 -0.0096,0.227885 0.04072,0.258997 0.05034,0.03111 0.09153,0.171793 0.09153,0.312626 0,0.167651 0.03654,0.243597 0.105834,0.219966 0.05821,-0.01985 0.09347,-0.120901 0.07836,-0.224557 -0.02432,-0.166792 0.0049,-0.18536 0.254,-0.161463 0.209945,0.02014 0.329889,-0.02455 0.471977,-0.175862 0.224666,-0.239247 0.232411,-0.291953 0.0635,-0.432137 -0.108451,-0.09001 -0.127,-0.06527 -0.127,0.169334 0,0.234608 -0.01855,0.259339 -0.127,0.169333 -0.134642,-0.111743 -0.168747,-0.353365 -0.06458,-0.457531 0.03433,-0.03433 0.06291,-0.126407 0.0635,-0.204612 6.77e-4,-0.08781 0.07394,-0.145865 0.191579,-0.151797 0.104775,-0.0053 0.1905,0.02329 0.1905,0.0635 0,0.04021 0.04277,0.07311 0.09503,0.07311 0.177153,0 -0.09983,-0.244775 -0.39968,-0.353202 -0.158411,-0.05728 -0.28802,-0.134595 -0.28802,-0.171807 0,-0.118785 0.277529,-0.07261 0.438353,0.07293 0.244156,0.220958 0.268682,0.07703 0.03433,-0.201477 -0.289822,-0.344433 -1.163233,-0.724377 -1.770015,-0.769977 -0.588035,-0.04419 -1.717557,0.11996 -1.980525,0.287825 -0.291701,0.186206 -0.645576,0.14779 -0.873502,-0.09483 -0.38866,-0.41371 -1.421101,-0.612541 -2.918311,-0.56202 -0.777725,0.02624 -0.823063,0.09687 -0.377009,0.587268 0.207355,0.227971 0.557984,0.536768 0.779176,0.686215 0.420102,0.28384 0.548963,0.603733 0.2432,0.603733 -0.225896,0 -0.333983,0.164163 -0.392985,0.596868 -0.0932,0.683476 -0.12487,0.753274 -0.538772,1.187225 -0.225704,0.236637 -0.453624,0.574617 -0.50649,0.751068 -0.267242,0.891973 0.01034,1.363071 0.91988,1.561179 0.116417,0.02536 0.337844,0.161803 0.492059,0.303215 0.301552,0.276515 0.523941,0.333006 0.523941,0.133091 z m 9.887526,-0.807312 c 0.172413,0 0.199097,-0.02258 0.120075,-0.1016 -0.05588,-0.05588 -0.1016,-0.172974 -0.1016,-0.260208 0,-0.258155 0.29188,-0.140997 0.323123,0.129698 0.03161,0.273863 0.255704,0.311958 0.466287,0.07927 0.128604,-0.142106 0.124202,-0.179279 -0.06267,-0.529166 -0.110547,-0.206978 -0.259217,-0.38808 -0.330377,-0.402449 -0.07116,-0.01437 -0.19033,-0.119144 -0.264823,-0.232833 -0.221748,-0.338431 -0.300601,-0.243991 -0.268566,0.32165 0.02631,0.464543 0.0032,0.563673 -0.191689,0.820741 -0.179342,0.236612 -0.192031,0.281178 -0.06652,0.233642 0.0853,-0.03231 0.254845,-0.05874 0.376767,-0.05874 z"
+ id="path212" />
+ <path
+ style="fill:#936d5f;stroke-width:0.0846667"
+ d="m 57.609134,57.615809 c -0.371006,-0.178449 -0.720946,-0.579982 -0.919401,-1.054953 -0.0912,-0.218282 -0.19601,-0.321085 -0.366187,-0.35919 -0.463878,-0.103869 -1.002641,-0.321519 -1.175203,-0.474757 -0.09613,-0.08537 -0.215577,-0.155219 -0.265429,-0.155219 -0.04985,0 -0.153049,-0.09525 -0.229328,-0.211667 -0.07628,-0.116416 -0.199626,-0.211666 -0.274105,-0.211666 -0.109246,0 -0.115549,-0.02394 -0.03262,-0.123865 0.08114,-0.09776 0.07752,-0.174543 -0.01717,-0.364356 -0.08808,-0.176564 -0.09594,-0.278598 -0.02955,-0.383843 0.06558,-0.103963 0.06151,-0.189644 -0.01479,-0.311829 -0.05787,-0.09266 -0.105216,-0.218959 -0.105216,-0.28066 0,-0.210813 -0.335483,-0.472523 -0.842875,-0.657528 -0.685744,-0.250035 -1.358458,-0.937991 -1.358458,-1.389237 0,-0.41886 0.17957,-0.810912 0.639631,-1.396497 0.631442,-0.803724 0.70992,-1.467214 0.249369,-2.108268 -0.162983,-0.226861 -0.296333,-0.444582 -0.296333,-0.483824 0,-0.03924 -0.157561,-0.231893 -0.350134,-0.428111 -0.219201,-0.22335 -0.331646,-0.404941 -0.300694,-0.485601 0.09004,-0.234649 0.729136,-0.344489 2.005494,-0.344681 1.358963,-2.03e-4 1.899113,0.119505 2.385353,0.528649 l 0.26343,0.221662 0.644109,-0.22134 c 0.853693,-0.29336 1.19566,-0.333764 2.024658,-0.239215 0.784495,0.08947 1.118442,0.222823 1.608502,0.642297 0.332237,0.284383 0.634344,0.371186 0.733497,0.210752 0.187013,-0.302593 1.137863,-0.750709 1.992452,-0.939002 0.256116,-0.05643 0.569893,-0.133781 0.697281,-0.17189 0.367002,-0.10979 0.488052,0.08153 0.488052,0.771353 0,0.608283 -0.213177,1.221841 -0.587077,1.6897 l -0.169158,0.211667 0.176659,0.550333 c 0.130371,0.406141 0.271805,0.643466 0.539802,0.905788 0.559241,0.547399 0.774416,0.871962 0.925824,1.396478 0.110126,0.381504 0.120278,0.551893 0.04872,0.817654 -0.241505,0.89688 -1.115897,1.621414 -1.956776,1.621414 -0.334723,0 -0.415564,0.03041 -0.460946,0.173396 -0.03027,0.09537 -0.0091,0.228718 0.047,0.296334 0.05611,0.06761 0.06619,0.122936 0.02239,0.122936 -0.141625,0 -0.787758,0.540612 -0.787758,0.659108 0,0.08638 -0.127228,0.109678 -0.512966,0.09394 -0.463956,-0.01894 -0.533547,0.0013 -0.728389,0.211389 -0.118483,0.127779 -0.267428,0.212368 -0.330989,0.187977 -0.06356,-0.02439 -0.138086,-0.0079 -0.165608,0.03662 -0.02752,0.04453 -0.154966,0.08097 -0.283205,0.08097 -0.251947,0 -0.553778,0.272444 -0.822252,0.742195 -0.382457,0.669187 -1.394137,0.968717 -2.109591,0.624591 z m 1.169331,-0.391889 c 0.340058,-0.142086 0.566335,-0.416627 0.566335,-0.687131 0,-0.123015 0.08284,-0.21687 0.254,-0.287766 0.352976,-0.146207 0.317045,-0.254 -0.08467,-0.254 -0.186267,0 -0.329142,0.02857 -0.3175,0.0635 0.01164,0.03493 -0.01693,0.07303 -0.0635,0.08467 -0.04657,0.01164 -0.08477,-0.02646 -0.08489,-0.08467 -8.5e-5,-0.05821 -0.05727,-0.107253 -0.127,-0.108988 -0.06973,-0.0017 -0.22988,-0.07169 -0.355891,-0.155465 -0.126011,-0.08377 -0.268886,-0.127727 -0.3175,-0.09768 -0.04861,0.03005 -0.08839,-0.0048 -0.08839,-0.07737 0,-0.0726 -0.03453,-0.131997 -0.07674,-0.131997 -0.04221,0 -0.06084,0.08572 -0.0414,0.1905 0.01944,0.104775 0.01217,0.141285 -0.01616,0.08113 -0.06858,-0.145617 -0.289038,0.02966 -0.289038,0.229801 0,0.210103 -0.172328,0.345233 -0.440267,0.345233 -0.283005,0 -0.295119,0.0727 -0.06159,0.369582 0.120843,0.153627 0.259239,0.224937 0.4445,0.229036 0.202261,0.0045 0.230215,0.02122 0.112646,0.06749 -0.219332,0.08631 -0.02214,0.239992 0.368381,0.287095 0.162798,0.01964 0.300866,0.0418 0.306821,0.04925 0.006,0.0075 0.146282,-0.04305 0.311838,-0.11222 z m -1.732876,-1.614489 c 0.31901,-0.127642 0.607038,-0.51584 0.462044,-0.622733 -0.07957,-0.05866 -0.124975,-0.207921 -0.169747,-0.558008 -0.04687,-0.366475 0.484638,-1.034114 1.052687,-1.322308 0.760767,-0.385967 1.090514,-0.828774 0.873125,-1.17249 -0.06274,-0.09919 -0.0968,-0.07601 -0.169581,0.115408 -0.07654,0.201314 -0.127838,0.232512 -0.32146,0.195498 -0.126713,-0.02422 -0.297468,-0.0081 -0.379456,0.03574 -0.109969,0.05885 -0.149067,0.04806 -0.149067,-0.04114 0,-0.06651 0.06128,-0.144435 0.136172,-0.173175 0.124386,-0.04773 0.123892,-0.071 -0.0057,-0.268787 -0.07803,-0.119093 -0.148835,-0.37588 -0.157339,-0.570638 -0.01421,-0.32539 0.0017,-0.354104 0.196207,-0.354104 0.183477,0 0.215166,0.04228 0.237945,0.3175 0.02059,0.24873 0.06185,0.3175 0.1905,0.3175 0.09032,0 0.164222,-0.04067 0.164222,-0.09037 0,-0.114348 0.329998,-0.019 0.524367,0.151499 0.07885,0.06917 0.167605,0.236114 0.197227,0.370986 0.02962,0.134871 0.07161,0.24522 0.09331,0.24522 0.09782,0 0.455091,-0.429019 0.455091,-0.546485 0,-0.07197 0.05124,-0.130848 0.113877,-0.130848 0.132693,0 0.416001,0.288567 0.349044,0.355523 -0.025,0.025 0.05112,0.02699 0.169148,0.0044 0.155392,-0.02971 0.214597,-0.0046 0.214597,0.09085 0,0.187338 -0.155098,0.259081 -0.300041,0.138789 -0.139246,-0.115563 -0.160588,-0.01772 -0.06993,0.320578 0.06739,0.251461 0.185448,0.241469 0.286473,-0.02425 0.05035,-0.13244 0.219914,-0.276174 0.442404,-0.375019 l 0.360758,-0.160274 -0.275167,-0.006 c -0.284683,-0.0062 -0.358702,-0.142579 -0.176342,-0.324938 0.07532,-0.07532 0.07029,-0.108956 -0.02117,-0.141422 -0.066,-0.02343 -0.218875,-0.07864 -0.339732,-0.122702 -0.20541,-0.07488 -0.217471,-0.06538 -0.184943,0.145655 l 0.0348,0.22576 -0.181854,-0.232699 c -0.140167,-0.179356 -0.228779,-0.220921 -0.386557,-0.181321 -0.152941,0.03839 -0.204703,0.01694 -0.204703,-0.0848 0,-0.08103 0.07059,-0.136178 0.174331,-0.136178 0.09588,0 0.150783,-0.0381 0.122003,-0.08467 -0.06885,-0.111398 -0.525141,-0.109259 -0.594389,0.0028 -0.02973,0.0481 0.02518,0.221727 0.122003,0.385839 0.197106,0.334071 0.226199,0.542708 0.07568,0.542708 -0.117877,0 -0.49229,-0.335262 -0.49229,-0.440812 0,-0.03995 -0.06323,-0.214278 -0.140514,-0.387408 -0.07728,-0.173129 -0.143957,-0.351451 -0.148167,-0.396271 -0.0042,-0.04482 -0.150528,-0.115279 -0.325153,-0.156577 -0.174625,-0.0413 -0.3175,-0.104737 -0.3175,-0.140976 0,-0.128103 0.248612,-0.269677 0.524719,-0.298805 0.153788,-0.01622 0.523302,-0.0721 0.821142,-0.124165 0.491469,-0.08591 1.975476,-0.05269 2.138187,0.04787 0.111513,0.06892 0.496516,-0.06437 0.441775,-0.152943 -0.03335,-0.05397 0.04364,-0.06361 0.212251,-0.02657 0.180325,0.03961 0.264593,0.02612 0.264593,-0.04234 0,-0.05835 -0.05824,-0.0781 -0.138975,-0.04712 -0.112118,0.04302 -0.119726,0.03014 -0.03936,-0.0667 0.05479,-0.06601 0.09376,-0.152612 0.08662,-0.192438 -0.0071,-0.03983 -0.0038,-0.110512 0.0074,-0.157079 0.01119,-0.04657 0.02523,-0.233102 0.03119,-0.414524 0.01062,-0.323079 0.01809,-0.330547 0.363436,-0.363459 0.193928,-0.01848 0.377151,0.0061 0.407164,0.05469 0.09933,0.16073 0.383238,0.100696 0.383238,-0.08104 0,-0.127967 -0.05644,-0.169334 -0.231053,-0.169334 h -0.231053 l 0.209886,-0.200762 c 0.236539,-0.226256 0.336887,-0.211203 0.336887,0.05054 0,0.27583 0.07513,0.137734 0.212962,-0.391423 0.142265,-0.546194 0.153119,-0.723387 0.05389,-0.879782 -0.104658,-0.164957 -0.769401,-0.03106 -1.002367,0.20191 -0.105922,0.105923 -0.214613,0.156947 -0.241534,0.113387 -0.07739,-0.125219 -0.176568,-0.09496 -0.454059,0.138535 -0.14232,0.119754 -0.292629,0.196804 -0.33402,0.171223 -0.04139,-0.02558 -0.286893,0.105039 -0.545559,0.290266 -0.258667,0.185227 -0.5148,0.336776 -0.569185,0.336776 -0.05438,0 -0.251804,-0.130896 -0.438709,-0.29088 -0.454173,-0.388755 -1.260886,-0.701451 -1.888424,-0.731986 -0.583052,-0.02837 -1.670322,0.1414 -2.006629,0.313323 -0.327583,0.167463 -0.450044,0.147406 -0.763258,-0.125011 -0.507332,-0.441251 -1.441034,-0.63698 -2.658932,-0.557384 -0.471251,0.0308 -0.90583,0.08629 -0.965731,0.123308 -0.137787,0.08516 0.660107,0.93961 1.12405,1.203728 0.368348,0.209697 0.413151,0.448284 0.110109,0.58636 -0.176482,0.08041 -0.222488,0.188078 -0.308686,0.722416 -0.0908,0.562849 -0.135853,0.660354 -0.434762,0.940858 -0.637548,0.598292 -0.867808,1.419188 -0.538888,1.921183 0.08471,0.129284 0.379179,0.328696 0.693889,0.469897 0.3007,0.134915 0.673048,0.34165 0.827441,0.459411 0.338318,0.258048 0.359884,0.260367 0.416263,0.04478 0.06137,-0.234687 0.398801,-0.229978 0.398801,0.0056 0,0.0962 -0.03769,0.245316 -0.08375,0.331381 -0.07341,0.137169 -0.04136,0.163642 0.259705,0.214506 0.188898,0.03191 0.36428,0.0372 0.389737,0.01174 0.02546,-0.02546 -0.03257,-0.173874 -0.128945,-0.329816 -0.09638,-0.155941 -0.200706,-0.442839 -0.231841,-0.63755 -0.05235,-0.327363 -0.03988,-0.360382 0.165573,-0.438495 0.122201,-0.04646 0.222184,-0.144199 0.222184,-0.217197 0,-0.073 0.17145,-0.316016 0.381,-0.540042 0.20955,-0.224026 0.381,-0.428595 0.381,-0.454598 0,-0.026 -0.161925,-0.0741 -0.359834,-0.106885 -0.197908,-0.03278 -0.429965,-0.09647 -0.515681,-0.141532 -0.175761,-0.09239 -0.645032,0.05905 -0.758526,0.244784 -0.08622,0.141101 -0.314151,0.144749 -0.310617,0.005 0.0041,-0.163114 0.372849,-0.544915 0.594058,-0.615124 0.190644,-0.06051 0.186342,-0.06889 -0.114663,-0.22331 -0.407723,-0.209174 -0.433291,-0.459489 -0.03757,-0.367828 0.442039,0.10239 0.949733,0.123582 1.268447,0.01509 0.162983,-0.05548 0.428404,-0.119272 0.591387,-0.134743 0.162984,-0.01547 0.330165,-0.02109 0.381639,-0.08753 0.05147,-0.06644 0.136675,-0.180352 0.201617,-0.154422 0.130188,0.05199 0.467893,1.055769 0.383566,1.140096 -0.06982,0.06981 -0.392489,-0.225443 -0.392489,-0.359143 0,-0.05747 -0.05219,-0.248508 -0.149218,-0.358441 -0.150604,-0.17063 -0.259196,-0.272365 -0.187895,-0.01611 -0.03561,0.0413 0.112103,0.374515 0.104223,0.57686 -0.01183,0.303777 -0.0818,0.446879 -0.401453,0.821036 -0.313878,0.367398 -0.376863,0.494031 -0.332882,0.669267 0.03496,0.139283 0.0191,0.21613 -0.0446,0.21613 -0.05436,0 -0.07529,-0.0381 -0.04651,-0.08467 0.02878,-0.04657 -0.0083,-0.08467 -0.08233,-0.08467 -0.154133,0 -0.183889,0.07088 -0.24197,0.576408 -0.03839,0.334101 -0.023,0.37193 0.183154,0.45031 0.341375,0.12979 0.759633,0.475956 1.035932,0.857376 0.459588,0.634442 0.285409,0.755468 -0.334714,0.232572 -0.272539,-0.229807 -0.482892,-0.338666 -0.654423,-0.338666 -0.139032,0 -0.293674,-0.04089 -0.34365,-0.09087 -0.134628,-0.134628 -0.2326,0.326955 -0.102635,0.483552 0.161714,0.194855 -0.03066,0.306765 -0.467578,0.272015 -0.446015,-0.03547 -0.474813,0.02649 -0.21611,0.464954 0.160905,0.272715 0.195655,0.289586 0.509708,0.247463 0.287206,-0.03852 0.329181,-0.02475 0.28393,0.09317 -0.0292,0.07611 -0.09474,0.138377 -0.145642,0.138377 -0.164827,0 0.05716,0.152992 0.279992,0.192968 0.458131,0.08219 0.943082,0.05496 1.256789,-0.07056 z M 59.8528,55.442595 c 0,-0.02444 -0.09754,-0.08151 -0.216761,-0.126842 -0.119219,-0.04533 -0.192787,-0.121205 -0.163483,-0.168619 0.0293,-0.04741 0.09736,-0.05896 0.15124,-0.02566 0.05388,0.0333 0.407646,0.07163 0.786147,0.08518 0.598081,0.02141 0.708146,0.0026 0.840643,-0.14383 0.149931,-0.165671 0.146276,-0.168626 -0.220496,-0.178214 -0.205127,-0.0054 -0.439631,-0.003 -0.521123,0.0053 -0.08149,0.0083 -0.147869,-0.0159 -0.147506,-0.05375 0.001,-0.105697 0.428902,-0.280489 0.686628,-0.280489 0.282958,0 0.498045,-0.07736 0.498045,-0.179131 0,-0.0425 -0.201401,-0.05268 -0.454292,-0.02296 -0.457904,0.05382 -0.606892,-0.01115 -0.483488,-0.210817 0.07142,-0.115555 2.186398,-0.353134 3.071143,-0.344986 0.651244,0.006 1.33797,-0.281363 1.33797,-0.559874 0,-0.107934 0.0381,-0.219791 0.08467,-0.248571 0.168242,-0.103979 0.07919,-0.211666 -0.175039,-0.211666 -0.22498,0 -0.252189,0.02368 -0.203491,0.177116 0.04491,0.141497 0.02477,0.170641 -0.100128,0.144923 -0.08599,-0.01771 -0.15105,-0.09741 -0.144583,-0.177117 0.0123,-0.151554 -0.186073,-0.186713 -0.53109,-0.09413 -0.127345,0.03417 -0.168158,0.0963 -0.138291,0.21051 0.03235,0.123722 -0.0021,0.162031 -0.145895,0.162031 -0.127314,0 -0.17342,-0.03869 -0.142409,-0.119503 0.03649,-0.09509 -0.0043,-0.105108 -0.19985,-0.04903 -0.332766,0.09544 -0.432695,0.165066 -0.373755,0.260434 0.02726,0.04411 0.08159,0.0604 0.120741,0.03621 0.109746,-0.06783 0.340456,0.04628 0.340456,0.168392 0,0.118674 -0.234874,0.164387 -1.590606,0.309574 -0.892798,0.09561 -1.090782,0.06631 -0.831769,-0.123081 0.139384,-0.10192 0.138429,-0.116223 -0.01718,-0.25705 -0.158826,-0.143735 -0.166735,-0.141333 -0.21889,0.06647 -0.0356,0.141834 -0.112513,0.215595 -0.22481,0.215595 -0.142528,0 -0.156234,-0.02703 -0.08305,-0.163767 0.135932,-0.253991 0.106564,-0.368929 -0.08169,-0.3197 -0.103768,0.02714 -0.169333,0.0026 -0.169333,-0.06337 0,-0.05921 0.0762,-0.204528 0.169333,-0.322928 0.09313,-0.1184 0.169334,-0.275938 0.169334,-0.350085 0,-0.204599 -0.238344,-0.161178 -0.269278,0.04906 -0.04111,0.279372 -0.238722,0.297708 -0.238722,0.02215 0,-0.225632 -0.0064,-0.222647 -0.254,0.119211 -0.300605,0.414972 -0.30483,0.43677 -0.08467,0.43677 0.193839,0 0.203595,0.03178 0.08042,0.261937 -0.0489,0.09138 -0.130988,0.140136 -0.182409,0.108356 -0.187087,-0.115626 -0.490677,-0.103391 -0.490677,0.01978 0,0.08355 -0.05943,0.106241 -0.191483,0.0731 -0.105316,-0.02643 -0.329762,0.0097 -0.498769,0.08033 -0.396744,0.165769 -0.551182,0.541755 -0.368017,0.895957 0.153012,0.295891 0.506834,0.58121 0.796859,0.642577 0.120493,0.02549 0.352427,0.09716 0.51541,0.159266 0.323679,0.123331 0.508,0.154148 0.508,0.08494 z m 5.270501,-3.129025 c 0.314264,-0.131496 0.127777,-0.606667 -0.463441,-1.180851 -0.332961,-0.323368 -0.573177,-0.380059 -0.74306,-0.175362 -0.128198,0.154468 -0.311199,0.165181 -0.361574,0.02117 -0.02699,-0.07717 -0.08331,-0.06479 -0.207963,0.04572 -0.165382,0.146621 -0.172538,0.145451 -0.219979,-0.03597 -0.02974,-0.113738 -0.0012,-0.223335 0.07259,-0.278552 0.190403,-0.142516 0.06792,-0.461741 -0.158204,-0.412337 -0.404695,0.08842 -0.44484,0.123658 -0.233475,0.204947 0.194054,0.07463 0.196295,0.08378 0.04722,0.192786 -0.149746,0.109497 -0.146663,0.126128 0.07144,0.385333 0.125369,0.148992 0.227943,0.325123 0.227943,0.3914 0,0.1845 0.179253,0.143192 0.230596,-0.05314 0.03707,-0.141753 0.09004,-0.163842 0.288407,-0.120273 0.15044,0.03304 0.242997,0.01856 0.242997,-0.03802 0,-0.05027 0.04019,-0.09139 0.08931,-0.09139 0.05372,0 0.07902,0.160263 0.0635,0.402167 -0.03015,0.469836 -0.245107,0.566593 -0.329174,0.148167 -0.0392,-0.195125 -0.06524,-0.221713 -0.112317,-0.114708 -0.03371,0.07661 -0.02114,0.288379 0.02792,0.470596 l 0.08921,0.331305 0.614941,-0.01549 c 0.338219,-0.0085 0.681618,-0.04339 0.76311,-0.07749 z m -1.237836,-2.469839 c -0.129519,-1.089497 -0.157714,-1.214708 -0.273523,-1.214708 -0.06516,0 -0.118475,0.07588 -0.118475,0.168616 0,0.09274 -0.0762,0.216204 -0.169333,0.274366 -0.200817,0.125412 -0.226065,0.403685 -0.03663,0.403685 0.09247,0 0.117015,0.04943 0.08096,0.163049 -0.0339,0.106817 5.93e-4,0.194396 0.100128,0.253938 0.145107,0.08684 0.144693,0.09645 -0.0093,0.215621 -0.166199,0.128631 -0.167897,0.126636 0.203496,0.239101 0.212617,0.06438 0.273755,-0.07391 0.222665,-0.503668 z"
+ id="path210"
+ sodipodi:nodetypes="scscssscsscsssssssccscscsssssscssscsscssccscsssscsssssccccssssssscccccccsssccccscssscsssssssscsssssccsscscscsscccssccssccsccssccccscsscsscsssssssssssccsscsssscsscsccssssccscccssssccsscsscssscsssscscsscsscccssssccscsscssscssscscsscscssssssccssscscscssscscccccsscsscssssssssscscccccccsssscccccc" />
+ <path
+ style="fill:#b8752d;stroke-width:0.0846667"
+ d="m 57.9478,57.698028 c -0.1397,-0.03571 -0.336011,-0.109002 -0.436246,-0.162864 -0.242431,-0.130271 -0.688883,-0.701607 -0.802155,-1.026539 -0.06186,-0.177461 -0.162447,-0.276195 -0.315226,-0.309429 -0.410291,-0.08925 -1.154744,-0.403378 -1.223413,-0.516233 -0.03724,-0.0612 -0.107678,-0.111273 -0.156531,-0.111273 -0.156669,0 -0.580096,-0.519479 -0.580096,-0.711688 0,-0.102178 -0.04205,-0.227827 -0.09344,-0.279218 -0.06466,-0.06466 -0.06694,-0.140799 -0.0074,-0.247179 0.06275,-0.112124 0.04404,-0.264258 -0.06911,-0.562045 -0.150679,-0.396553 -0.150649,-0.40688 10e-4,-0.358739 0.116909,0.0371 0.163101,7.62e-4 0.183715,-0.144615 0.0379,-0.267288 0.408538,-0.328531 0.408538,-0.0675 0,0.09943 -0.03769,0.251204 -0.08375,0.337269 -0.07341,0.137169 -0.04136,0.163642 0.259705,0.214506 0.188898,0.03191 0.36428,0.0372 0.389737,0.01174 0.02546,-0.02546 -0.03257,-0.173874 -0.128945,-0.329816 -0.09638,-0.155941 -0.200706,-0.442839 -0.231841,-0.63755 -0.05235,-0.327363 -0.03988,-0.360382 0.165573,-0.438495 0.122201,-0.04646 0.222184,-0.144199 0.222184,-0.217197 0,-0.073 0.17145,-0.316016 0.381,-0.540042 0.20955,-0.224026 0.381,-0.428595 0.381,-0.454598 0,-0.026 -0.161925,-0.0741 -0.359834,-0.106885 -0.197908,-0.03278 -0.429965,-0.09647 -0.515681,-0.141532 -0.175761,-0.09239 -0.645032,0.05905 -0.758526,0.244784 -0.08622,0.141101 -0.314151,0.144749 -0.310617,0.005 0.0041,-0.163114 0.372849,-0.544915 0.594058,-0.615124 0.190644,-0.06051 0.186342,-0.06889 -0.114663,-0.22331 -0.407516,-0.209069 -0.432902,-0.458695 -0.03757,-0.369442 0.432545,0.09766 1.075104,0.119319 1.125398,0.03794 0.0355,-0.05744 0.738915,-0.195239 0.970102,-0.190047 0.02328,5.25e-4 0.08445,-0.05664 0.135923,-0.127041 0.05147,-0.07039 0.146725,-0.106774 0.211667,-0.08084 0.130188,0.05199 0.467893,1.055769 0.383566,1.140096 -0.06982,0.06981 -0.392489,-0.225443 -0.392489,-0.359143 0,-0.05747 -0.07861,-0.194444 -0.174697,-0.304377 l -0.174696,-0.19988 0.05291,0.324861 c 0.04969,0.30508 0.04164,0.321284 -0.132207,0.266107 -0.190383,-0.06043 -0.329485,0.06 -0.332018,0.287449 -9.39e-4,0.08433 0.06872,0.102413 0.252704,0.06562 0.352578,-0.07052 0.324736,0.05558 -0.129733,0.587542 -0.31084,0.363842 -0.373429,0.49022 -0.329489,0.665295 0.03496,0.139283 0.0191,0.21613 -0.0446,0.21613 -0.05436,0 -0.07529,-0.0381 -0.04651,-0.08467 0.02878,-0.04657 -0.0083,-0.08467 -0.08233,-0.08467 -0.154133,0 -0.183889,0.07088 -0.24197,0.576408 -0.03839,0.334101 -0.023,0.37193 0.183154,0.45031 0.341375,0.12979 0.759633,0.475956 1.035932,0.857376 0.459588,0.634442 0.285409,0.755468 -0.334714,0.232572 -0.272539,-0.229807 -0.482892,-0.338666 -0.654423,-0.338666 -0.139032,0 -0.293674,-0.04089 -0.34365,-0.09087 -0.129879,-0.129879 -0.233806,0.325502 -0.108692,0.476256 0.175792,0.211816 -0.002,0.313046 -0.480226,0.273389 -0.250113,-0.02074 -0.45475,-0.0072 -0.45475,0.03015 0,0.03732 0.07944,0.22026 0.176524,0.406528 0.174013,0.333851 0.181868,0.337936 0.55219,0.287178 0.324986,-0.04454 0.368482,-0.03277 0.322417,0.08727 -0.02929,0.07632 -0.09489,0.138762 -0.14579,0.138762 -0.06131,0 -0.06414,0.0284 -0.0084,0.08414 0.169903,0.169903 1.109072,0.20279 1.502321,0.05261 0.357659,-0.136591 0.66233,-0.521015 0.504905,-0.637072 -0.07957,-0.05866 -0.124975,-0.207921 -0.169746,-0.558008 -0.04687,-0.366475 0.484638,-1.034114 1.052686,-1.322308 0.760768,-0.385967 1.090515,-0.828774 0.873125,-1.17249 -0.06274,-0.09919 -0.0968,-0.07601 -0.169581,0.115408 -0.07654,0.201314 -0.127838,0.232512 -0.32146,0.195498 -0.126713,-0.02422 -0.297468,-0.0081 -0.379456,0.03574 -0.109969,0.05885 -0.149067,0.04806 -0.149067,-0.04114 0,-0.06651 0.06128,-0.144435 0.136172,-0.173175 0.124386,-0.04773 0.123892,-0.071 -0.0057,-0.268787 -0.07803,-0.119093 -0.148835,-0.37588 -0.157339,-0.570638 -0.01421,-0.32539 0.0017,-0.354104 0.196207,-0.354104 0.183477,0 0.215166,0.04228 0.237945,0.3175 0.02059,0.24873 0.06185,0.3175 0.1905,0.3175 0.09032,0 0.164222,-0.04067 0.164222,-0.09037 0,-0.114348 0.329998,-0.019 0.524367,0.151499 0.07885,0.06917 0.167605,0.236114 0.197227,0.370986 0.02962,0.134871 0.07161,0.24522 0.09331,0.24522 0.09782,0 0.455091,-0.429019 0.455091,-0.546485 0,-0.07197 0.05124,-0.130848 0.113877,-0.130848 0.132693,0 0.416001,0.288567 0.349044,0.355523 -0.025,0.025 0.05112,0.02699 0.169148,0.0044 0.155392,-0.02971 0.214597,-0.0046 0.214597,0.09085 0,0.187338 -0.155098,0.259081 -0.300041,0.138789 -0.139246,-0.115563 -0.160588,-0.01772 -0.06993,0.320578 0.06739,0.251461 0.185448,0.241469 0.286473,-0.02425 0.05035,-0.13244 0.219914,-0.276174 0.442404,-0.375019 l 0.360758,-0.160274 -0.275167,-0.006 c -0.284472,-0.0062 -0.358722,-0.142558 -0.176712,-0.324568 0.09516,-0.09516 0.04902,-0.108381 -0.48499,-0.29342 -0.05701,-0.01976 -0.0817,0.03667 -0.06035,0.175237 l 0.03467,0.225104 -0.181854,-0.232699 c -0.140167,-0.179356 -0.228779,-0.220921 -0.386557,-0.181321 -0.152941,0.03839 -0.204703,0.01694 -0.204703,-0.0848 0,-0.08103 0.07059,-0.136178 0.174331,-0.136178 0.09588,0 0.150783,-0.0381 0.122003,-0.08467 -0.06885,-0.111398 -0.525141,-0.109259 -0.594389,0.0028 -0.02973,0.0481 0.02518,0.221727 0.122003,0.385839 0.202094,0.342525 0.225631,0.542708 0.06381,0.542708 -0.115329,0 -0.480425,-0.344009 -0.480425,-0.452677 0,-0.03342 -0.06323,-0.202413 -0.140514,-0.375543 -0.07728,-0.173129 -0.143957,-0.351451 -0.148167,-0.396271 -0.0042,-0.04482 -0.150528,-0.115279 -0.325153,-0.156577 -0.174625,-0.0413 -0.3175,-0.104737 -0.3175,-0.140976 0,-0.128103 0.248612,-0.269677 0.524719,-0.298805 0.153788,-0.01622 0.523302,-0.0721 0.821142,-0.124165 0.491469,-0.08591 1.975476,-0.05269 2.138187,0.04787 0.111513,0.06892 0.496516,-0.06437 0.441775,-0.152943 -0.03335,-0.05397 0.04364,-0.06361 0.212251,-0.02657 0.180325,0.03961 0.264593,0.02612 0.264593,-0.04234 0,-0.05835 -0.05824,-0.0781 -0.138975,-0.04712 -0.112118,0.04302 -0.119726,0.03014 -0.03936,-0.0667 0.05479,-0.06601 0.09376,-0.152612 0.08662,-0.192438 -0.0071,-0.03983 -0.0038,-0.110512 0.0074,-0.157079 0.01119,-0.04657 0.02523,-0.233102 0.03119,-0.414524 0.01062,-0.323079 0.01809,-0.330547 0.363436,-0.363459 0.193928,-0.01848 0.377151,0.0061 0.407164,0.05469 0.09933,0.16073 0.383238,0.100696 0.383238,-0.08104 0,-0.127967 -0.05644,-0.169334 -0.231053,-0.169334 h -0.231053 l 0.209886,-0.200762 c 0.236539,-0.226256 0.336887,-0.211203 0.336887,0.05054 0,0.27583 0.07513,0.137734 0.212962,-0.391423 0.142265,-0.546194 0.153119,-0.723387 0.05389,-0.879782 -0.104658,-0.164957 -0.769401,-0.03106 -1.002367,0.20191 -0.105922,0.105923 -0.214613,0.156947 -0.241534,0.113387 -0.07739,-0.125219 -0.176568,-0.09496 -0.454059,0.138535 -0.14232,0.119754 -0.292629,0.196804 -0.33402,0.171223 -0.04139,-0.02558 -0.286893,0.105039 -0.545559,0.290266 -0.258667,0.185227 -0.5148,0.336776 -0.569185,0.336776 -0.05438,0 -0.251804,-0.130896 -0.438709,-0.29088 -0.454173,-0.388755 -1.260886,-0.701451 -1.888424,-0.731986 -0.583052,-0.02837 -1.670322,0.1414 -2.006629,0.313323 -0.327583,0.167463 -0.450044,0.147406 -0.763258,-0.125011 -0.507332,-0.441251 -1.441034,-0.63698 -2.658932,-0.557384 -0.471251,0.0308 -0.90583,0.08629 -0.965731,0.123308 -0.137787,0.08516 0.660107,0.93961 1.12405,1.203728 0.368348,0.209697 0.413151,0.448284 0.110109,0.58636 -0.176482,0.08041 -0.222488,0.188078 -0.308686,0.722416 -0.0908,0.562849 -0.135853,0.660354 -0.434762,0.940858 -0.460841,0.432465 -0.683036,0.895171 -0.688989,1.434768 -0.0054,0.491155 -0.0674,0.54655 -0.26837,0.239835 -0.245978,-0.37541 -0.02683,-1.048122 0.578698,-1.776446 0.315924,-0.379989 0.5675,-1.007487 0.5675,-1.415499 0,-0.07831 -0.13335,-0.340531 -0.296333,-0.582723 -0.162984,-0.242192 -0.296334,-0.476253 -0.296334,-0.520135 0,-0.04388 -0.174173,-0.265991 -0.387051,-0.493576 l -0.387051,-0.413789 0.235097,-0.154083 c 0.195916,-0.128404 0.454501,-0.159014 1.551567,-0.183668 1.44885,-0.03256 2.008222,0.06645 2.58435,0.457419 0.373132,0.253214 0.508748,0.256903 1.031569,0.02806 0.507161,-0.221985 1.729784,-0.307292 2.402431,-0.167628 0.435103,0.09034 1.015545,0.422071 1.384452,0.791229 0.08144,0.08149 0.178399,0.148167 0.215473,0.148167 0.03708,0 0.323555,-0.171766 0.636624,-0.381701 0.589454,-0.395273 1.706925,-0.783443 2.374908,-0.82496 l 0.337965,-0.02101 0.0243,0.680649 c 0.0263,0.736659 -0.141931,1.290381 -0.486897,1.60257 -0.212285,0.192116 -0.213588,0.375299 -0.0071,0.992375 0.125589,0.375233 0.281016,0.599618 0.70376,1.016 0.822663,0.810282 1.029845,1.618724 0.620452,2.421054 -0.355926,0.697544 -0.987664,1.130043 -1.682526,1.151885 -0.446744,0.01404 -0.569036,0.09043 -0.569036,0.355443 0,0.139918 -0.132905,0.333653 -0.402167,0.586235 -0.394049,0.369639 -0.569728,0.432108 -1.119906,0.398225 -0.122082,-0.0075 -0.302332,0.07579 -0.431285,0.199335 -0.1223,0.117171 -0.369692,0.235069 -0.552259,0.263185 -0.485577,0.07478 -0.588904,0.14983 -0.961295,0.698199 -0.18579,0.273588 -0.464574,0.575784 -0.61952,0.671546 -0.327319,0.202294 -0.842422,0.284055 -1.205235,0.191304 z m 0.830665,-0.474108 c 0.340058,-0.142086 0.566335,-0.416627 0.566335,-0.687131 0,-0.123015 0.08284,-0.21687 0.254,-0.287766 0.352976,-0.146207 0.317045,-0.254 -0.08467,-0.254 -0.186267,0 -0.329142,0.02857 -0.3175,0.0635 0.01164,0.03493 -0.01693,0.07303 -0.0635,0.08467 -0.04657,0.01164 -0.08477,-0.02646 -0.08489,-0.08467 -8.5e-5,-0.05821 -0.05727,-0.107253 -0.127,-0.108988 -0.06973,-0.0017 -0.22988,-0.07169 -0.355891,-0.155465 -0.126011,-0.08377 -0.268886,-0.127727 -0.3175,-0.09768 -0.04861,0.03005 -0.08839,-0.0048 -0.08839,-0.07737 0,-0.0726 -0.03453,-0.131997 -0.07674,-0.131997 -0.04221,0 -0.06084,0.08572 -0.0414,0.1905 0.01944,0.104775 0.01217,0.141285 -0.01616,0.08113 -0.06858,-0.145617 -0.289038,0.02966 -0.289038,0.229801 0,0.210103 -0.172328,0.345233 -0.440267,0.345233 -0.283005,0 -0.295119,0.0727 -0.06159,0.369582 0.120843,0.153627 0.259239,0.224937 0.4445,0.229036 0.202261,0.0045 0.230215,0.02122 0.112646,0.06749 -0.219332,0.08631 -0.02214,0.239992 0.368381,0.287095 0.162798,0.01964 0.300866,0.0418 0.306821,0.04925 0.006,0.0075 0.146282,-0.04305 0.311838,-0.11222 z M 59.8528,55.442595 c 0,-0.02444 -0.09754,-0.08151 -0.216761,-0.126842 -0.119219,-0.04533 -0.192787,-0.121205 -0.163483,-0.168619 0.0293,-0.04741 0.09736,-0.05896 0.15124,-0.02566 0.05388,0.0333 0.407646,0.07163 0.786147,0.08518 0.598081,0.02141 0.708146,0.0026 0.840643,-0.14383 0.149931,-0.165671 0.146276,-0.168626 -0.220496,-0.178214 -0.205127,-0.0054 -0.439631,-0.003 -0.521123,0.0053 -0.08149,0.0083 -0.147869,-0.0159 -0.147506,-0.05375 0.001,-0.105697 0.428902,-0.280489 0.686628,-0.280489 0.282958,0 0.498045,-0.07736 0.498045,-0.179131 0,-0.0425 -0.201401,-0.05268 -0.454292,-0.02296 -0.457904,0.05382 -0.606892,-0.01115 -0.483488,-0.210817 0.07142,-0.115555 2.186398,-0.353134 3.071143,-0.344986 0.651244,0.006 1.33797,-0.281363 1.33797,-0.559874 0,-0.107934 0.0381,-0.219791 0.08467,-0.248571 0.168242,-0.103979 0.07919,-0.211666 -0.175039,-0.211666 -0.22498,0 -0.252189,0.02368 -0.203491,0.177116 0.04491,0.141497 0.02477,0.170641 -0.100128,0.144923 -0.08599,-0.01771 -0.15105,-0.09741 -0.144583,-0.177117 0.0123,-0.151554 -0.186073,-0.186713 -0.53109,-0.09413 -0.127345,0.03417 -0.168158,0.0963 -0.138291,0.21051 0.03235,0.123722 -0.0021,0.162031 -0.145895,0.162031 -0.127314,0 -0.17342,-0.03869 -0.142409,-0.119503 0.03649,-0.09509 -0.0043,-0.105108 -0.19985,-0.04903 -0.332766,0.09544 -0.432695,0.165066 -0.373755,0.260434 0.02726,0.04411 0.08159,0.0604 0.120741,0.03621 0.109746,-0.06783 0.340456,0.04628 0.340456,0.168392 0,0.118674 -0.234874,0.164387 -1.590606,0.309574 -0.892798,0.09561 -1.090782,0.06631 -0.831769,-0.123081 0.139384,-0.10192 0.138429,-0.116223 -0.01718,-0.25705 -0.158826,-0.143735 -0.166735,-0.141333 -0.21889,0.06647 -0.0356,0.141834 -0.112513,0.215595 -0.22481,0.215595 -0.142528,0 -0.156234,-0.02703 -0.08305,-0.163767 0.135932,-0.253991 0.106564,-0.368929 -0.08169,-0.3197 -0.103768,0.02714 -0.169333,0.0026 -0.169333,-0.06337 0,-0.05921 0.0762,-0.204528 0.169333,-0.322928 0.09313,-0.1184 0.169334,-0.275938 0.169334,-0.350085 0,-0.204599 -0.238344,-0.161178 -0.269278,0.04906 -0.04111,0.279372 -0.238722,0.297708 -0.238722,0.02215 0,-0.225632 -0.0064,-0.222647 -0.254,0.119211 -0.300605,0.414972 -0.30483,0.43677 -0.08467,0.43677 0.193839,0 0.203595,0.03178 0.08042,0.261937 -0.0489,0.09138 -0.130988,0.140136 -0.182409,0.108356 -0.187087,-0.115626 -0.490677,-0.103391 -0.490677,0.01978 0,0.08355 -0.05943,0.106241 -0.191483,0.0731 -0.105316,-0.02643 -0.329762,0.0097 -0.498769,0.08033 -0.396744,0.165769 -0.551182,0.541755 -0.368017,0.895957 0.153012,0.295891 0.506834,0.58121 0.796859,0.642577 0.120493,0.02549 0.352427,0.09716 0.51541,0.159266 0.323679,0.123331 0.508,0.154148 0.508,0.08494 z m 5.270501,-3.129025 c 0.314264,-0.131496 0.127777,-0.606667 -0.463441,-1.180851 -0.332961,-0.323368 -0.573177,-0.380059 -0.74306,-0.175362 -0.128198,0.154468 -0.311199,0.165181 -0.361574,0.02117 -0.02699,-0.07717 -0.08331,-0.06479 -0.207963,0.04572 -0.165382,0.146621 -0.172538,0.145451 -0.219979,-0.03597 -0.02974,-0.113738 -0.0012,-0.223335 0.07259,-0.278552 0.190403,-0.142516 0.06792,-0.461741 -0.158204,-0.412337 -0.404695,0.08842 -0.44484,0.123658 -0.233475,0.204947 0.194054,0.07463 0.196295,0.08378 0.04722,0.192786 -0.149746,0.109497 -0.146663,0.126128 0.07144,0.385333 0.125369,0.148992 0.227943,0.325123 0.227943,0.3914 0,0.1845 0.179253,0.143192 0.230596,-0.05314 0.03707,-0.141753 0.09004,-0.163842 0.288407,-0.120273 0.15044,0.03304 0.242997,0.01856 0.242997,-0.03802 0,-0.05027 0.04019,-0.09139 0.08931,-0.09139 0.05372,0 0.07902,0.160263 0.0635,0.402167 -0.03015,0.469836 -0.245107,0.566593 -0.329174,0.148167 -0.0392,-0.195125 -0.06524,-0.221713 -0.112317,-0.114708 -0.03371,0.07661 -0.02114,0.288379 0.02792,0.470596 l 0.08921,0.331305 0.614941,-0.01549 c 0.338219,-0.0085 0.681618,-0.04339 0.76311,-0.07749 z m -3.019045,-1.539641 0.0078,-0.352761 -0.41933,-0.05142 c -0.237117,-0.0024 -0.489393,0.01919 -0.559243,0.0104 -0.289574,-0.03645 -0.353505,0.115516 -0.321654,0.211069 0.01857,0.05572 0.07214,0.180787 0.312116,0.315422 0.245265,0.137601 0.439869,0.264782 0.670368,0.245434 0.292585,-0.02456 0.302412,-0.03655 0.309954,-0.378124 z m 1.781209,-0.930198 c -0.129519,-1.089497 -0.157714,-1.214708 -0.273523,-1.214708 -0.06516,0 -0.118475,0.07588 -0.118475,0.168616 0,0.09274 -0.0762,0.216204 -0.169333,0.274366 -0.200817,0.125412 -0.226065,0.403685 -0.03663,0.403685 0.09247,0 0.117015,0.04943 0.08096,0.163049 -0.0339,0.106817 5.93e-4,0.194396 0.100128,0.253938 0.145107,0.08684 0.144693,0.09645 -0.0093,0.215621 -0.166199,0.128631 -0.167897,0.126636 0.203496,0.239101 0.212617,0.06438 0.273755,-0.07391 0.222665,-0.503668 z"
+ id="path208"
+ sodipodi:nodetypes="cscssssscscssscsccssssccsccccsccscsccscscscssscsssscsssccssssscsccccscssscsssssssscssssscsscccscsscccssccssccsccssccccscsscsscsssssssssssccsscsccssssccssscscssccsscssssscsssscccsssssccccssssssscccccccssssccscsscssscssscscsscscssssssccssscscscssscscccccsscsscssssssssscscccccccccccsscccsssscccccc" />
+ <path
+ style="fill:#754f4c;stroke-width:0.0846667"
+ d="m 57.9478,57.698028 c -0.1397,-0.03571 -0.336011,-0.109002 -0.436246,-0.162864 -0.242431,-0.130271 -0.688883,-0.701607 -0.802155,-1.026539 -0.06186,-0.177461 -0.162447,-0.276195 -0.315226,-0.309429 -0.410291,-0.08925 -1.154744,-0.403378 -1.223413,-0.516233 -0.03724,-0.0612 -0.107678,-0.111273 -0.156531,-0.111273 -0.156669,0 -0.580096,-0.519479 -0.580096,-0.711688 0,-0.102178 -0.04205,-0.227827 -0.09344,-0.279218 -0.06466,-0.06466 -0.06694,-0.140799 -0.0074,-0.247179 0.06275,-0.112124 0.04404,-0.264258 -0.06911,-0.562045 -0.150563,-0.396248 -0.150546,-0.406848 5.75e-4,-0.358884 0.108542,0.03445 0.172344,-0.003 0.210588,-0.123448 0.03018,-0.09508 0.112799,-0.172871 0.183604,-0.172871 0.103284,0 0.117424,0.06696 0.07152,0.338666 -0.05095,0.301581 -0.03862,0.338667 0.112633,0.338667 0.09342,0 0.230117,0.02313 0.303776,0.05139 0.248211,0.09525 0.13643,0.202608 -0.210951,0.202608 -0.281334,0 -0.339678,0.02698 -0.316671,0.146446 0.02244,0.11653 0.101545,0.141152 0.387208,0.120527 0.215947,-0.01559 0.359005,0.0104 0.359005,0.06522 0,0.05157 -0.165401,0.09114 -0.381,0.09114 -0.20955,0 -0.381,0.03693 -0.381,0.08206 0,0.04513 0.08005,0.235633 0.177882,0.423334 0.150104,0.287981 0.219516,0.341475 0.4445,0.342569 0.184851,8.98e-4 0.230834,0.02396 0.149937,0.0752 -0.179223,0.113518 -0.05111,0.231796 0.3644,0.336422 0.785905,0.197894 1.329745,0.0752 1.777557,-0.401033 0.228569,-0.243074 0.237075,-0.274287 0.11243,-0.412594 -0.45996,-0.510372 -0.07746,-1.328678 0.825627,-1.766323 0.848199,-0.411046 1.114281,-0.828468 0.832342,-1.305753 -0.08036,-0.136037 -0.119768,-0.273678 -0.08758,-0.30587 0.106895,-0.106895 0.397591,0.244504 0.491852,0.594561 0.07843,0.291283 0.06878,0.389818 -0.06202,0.632696 -0.169112,0.314021 -0.573415,0.604351 -1.067437,0.766528 -0.354792,0.116471 -0.657652,0.446803 -0.657175,0.716787 8.78e-4,0.496141 0.576738,0.965347 1.481351,1.20699 0.546639,0.14602 0.790704,0.143235 1.089178,-0.01243 0.133381,-0.06956 0.326764,-0.126479 0.429741,-0.126479 0.200623,0 0.594888,-0.355637 0.499744,-0.450781 -0.03147,-0.03147 -0.146119,-0.05722 -0.254775,-0.05722 -0.240436,0 -0.266324,-0.165036 -0.02822,-0.179917 0.09313,-0.0058 0.207434,-0.02011 0.254,-0.03175 0.04657,-0.01164 0.122767,-0.02593 0.169334,-0.03175 0.04657,-0.0058 0.08467,-0.09102 0.08467,-0.189339 0,-0.155559 -0.03571,-0.172221 -0.275166,-0.128399 -0.319476,0.05846 -0.615049,-0.06526 -0.349854,-0.146451 0.08764,-0.02683 0.571516,-0.06865 1.07527,-0.09293 0.503754,-0.02428 0.9768,-0.07822 1.051213,-0.119865 0.07441,-0.04164 0.281218,-0.05614 0.459567,-0.03222 0.829819,0.111303 1.590766,-0.387794 1.753755,-1.150268 0.08566,-0.400705 0.07688,-0.49661 -0.07748,-0.846667 -0.25189,-0.571242 -0.809085,-1.11444 -1.143158,-1.11444 -0.355858,0 -0.398805,-0.06478 -0.231137,-0.348618 0.118315,-0.200292 0.127064,-0.307316 0.05266,-0.644286 -0.04907,-0.222253 -0.117099,-0.468425 -0.151172,-0.547049 -0.04168,-0.09618 -0.002,-0.19314 0.121108,-0.296333 0.27038,-0.226545 0.411769,-0.543132 0.557693,-1.248744 0.158212,-0.765034 0.08269,-1.01103 -0.285524,-0.93001 -1.06178,0.23363 -1.654984,0.492789 -2.387053,1.042856 -0.254377,0.191134 -0.486453,0.347517 -0.515724,0.347517 -0.02927,0 -0.176598,-0.117904 -0.32739,-0.26201 C 60.524565,47.4444 59.67396,47.08779 59.004627,47.0399 c -0.616705,-0.04413 -1.587329,0.0984 -1.962786,0.288207 -0.340554,0.172165 -0.607137,0.140828 -0.831235,-0.09771 -0.293795,-0.31273 -1.147301,-0.548704 -1.984635,-0.548704 -0.968654,0 -1.739937,0.09003 -1.735325,0.202561 0.0062,0.152438 0.771131,0.939181 1.160324,1.193486 0.197908,0.129317 0.359833,0.260994 0.359833,0.292615 0,0.03162 -0.111867,0.1402 -0.248593,0.241286 -0.194044,0.143463 -0.260082,0.27236 -0.300956,0.587422 -0.08834,0.680921 -0.110137,0.728882 -0.534723,1.176324 -0.453441,0.477851 -0.653209,0.991886 -0.584272,1.50343 0.04773,0.354188 -0.04764,0.394597 -0.239654,0.101544 -0.245978,-0.37541 -0.02683,-1.048122 0.578698,-1.776446 0.315924,-0.379989 0.5675,-1.007487 0.5675,-1.415499 0,-0.07831 -0.13335,-0.340531 -0.296333,-0.582723 -0.162984,-0.242192 -0.296334,-0.476253 -0.296334,-0.520135 0,-0.04388 -0.174173,-0.265991 -0.387051,-0.493576 l -0.387051,-0.413789 0.235097,-0.154083 c 0.195916,-0.128404 0.454501,-0.159014 1.551567,-0.183668 1.44885,-0.03256 2.008222,0.06645 2.58435,0.457419 0.373132,0.253214 0.508748,0.256903 1.031569,0.02806 0.507161,-0.221985 1.729784,-0.307292 2.402431,-0.167628 0.435103,0.09034 1.015545,0.422071 1.384452,0.791229 0.08144,0.08149 0.178399,0.148167 0.215473,0.148167 0.03708,0 0.323555,-0.171766 0.636624,-0.381701 0.589454,-0.395273 1.706925,-0.783443 2.374908,-0.82496 l 0.337965,-0.02101 0.0243,0.680649 c 0.0263,0.736659 -0.141931,1.290381 -0.486897,1.60257 -0.212285,0.192116 -0.213588,0.375299 -0.0071,0.992375 0.125589,0.375233 0.281016,0.599618 0.70376,1.016 0.822663,0.810282 1.029845,1.618724 0.620452,2.421054 -0.355926,0.697544 -0.987664,1.130043 -1.682526,1.151885 -0.446744,0.01404 -0.569036,0.09043 -0.569036,0.355443 0,0.139918 -0.132905,0.333653 -0.402167,0.586235 -0.393915,0.369513 -0.569592,0.432034 -1.119234,0.398317 -0.114988,-0.0071 -0.291859,0.06495 -0.393047,0.160016 -0.10119,0.09506 -0.197609,0.134547 -0.214266,0.08774 -0.01877,-0.05274 -0.142939,-0.05954 -0.32662,-0.01787 l -0.296333,0.06723 0.211667,0.09097 0.211666,0.09097 -0.238399,0.0054 c -0.364101,0.0082 -0.532411,0.134627 -0.900179,0.676188 -0.18579,0.273589 -0.464574,0.575784 -0.61952,0.671547 -0.327319,0.202294 -0.842422,0.284055 -1.205235,0.191304 z m 1.242343,-0.69027 c 0.131629,-0.15767 0.239324,-0.333797 0.239324,-0.391394 0,-0.0576 0.137395,-0.209519 0.305322,-0.337604 0.26951,-0.205565 0.286889,-0.240131 0.148167,-0.294692 -0.08644,-0.03399 -0.279551,-0.06449 -0.429146,-0.06776 -0.337376,-0.0074 -1.158558,-0.308006 -1.296996,-0.474815 -0.14529,-0.175063 -0.200394,-0.155953 -0.314378,0.10903 -0.22725,0.528298 -0.389549,0.695243 -0.677802,0.697204 -0.254768,0.0017 -0.241202,0.18205 0.03872,0.514723 0.397248,0.472102 0.681102,0.600656 1.245951,0.564278 0.448151,-0.02886 0.526973,-0.0628 0.740833,-0.31897 z M 56.63589,54.126599 c -0.16275,-0.139081 -0.438587,-0.27569 -0.612971,-0.303575 -0.33649,-0.05381 -0.712088,-0.363991 -0.836739,-0.691012 -0.115981,-0.304279 -0.09212,-0.692989 0.04255,-0.692989 0.0645,0 0.185042,-0.104775 0.267883,-0.232833 0.08284,-0.128058 0.320451,-0.432858 0.528022,-0.677333 0.207571,-0.244475 0.363249,-0.447694 0.345951,-0.451596 -0.0173,-0.0039 -0.260051,-0.06337 -0.539451,-0.132145 -0.654357,-0.161076 -0.819966,-0.161601 -1.136689,-0.0036 -0.318927,0.159101 -0.340552,0.04891 -0.03723,-0.189683 0.26449,-0.208048 0.519374,-0.221292 0.932975,-0.04848 0.547073,0.228581 0.731537,0.151317 0.531426,-0.222595 -0.0795,-0.148546 -0.145036,-0.162317 -0.538526,-0.113153 -0.352124,0.044 -0.509431,0.02249 -0.734985,-0.100472 l -0.286974,-0.156447 0.635,-0.05481 c 0.34925,-0.03014 0.810756,-0.08214 1.025568,-0.115537 0.34936,-0.05432 0.405193,-0.03985 0.529167,0.137145 0.197691,0.282243 0.180143,0.438795 -0.04131,0.36851 -0.184914,-0.05869 -0.3243,0.06462 -0.3268,0.289105 -9.41e-4,0.08453 0.06883,0.10239 0.254771,0.0652 0.224058,-0.04481 0.246058,-0.0329 0.175995,0.09525 -0.04404,0.08055 -0.310405,0.413163 -0.591923,0.73913 -0.391167,0.452929 -0.512513,0.656367 -0.514661,0.862837 -0.0015,0.148593 -0.04153,0.294101 -0.08886,0.32335 -0.128082,0.07916 -0.02159,0.198943 0.294154,0.330869 0.353741,0.147802 0.949264,0.680946 1.111882,0.995415 0.167122,0.323178 0.0039,0.314533 -0.388232,-0.02056 z m 4.620684,-0.406616 c -0.05923,-0.09584 0.03627,-0.124314 0.79756,-0.237847 0.395739,-0.05902 0.469792,-0.09853 0.493141,-0.263142 0.03084,-0.217412 0.01638,-0.216329 -0.895586,0.06705 -0.267606,0.08315 -0.51698,0.132749 -0.554167,0.110214 -0.13829,-0.08381 0.126701,-0.261722 0.597791,-0.401358 0.807016,-0.239209 0.86655,-0.27569 0.869638,-0.532892 l 0.0028,-0.234648 0.174977,0.210328 0.174977,0.210329 -0.02963,-0.294995 c -0.02199,-0.218942 0.0031,-0.294996 0.09737,-0.294996 0.07147,0 0.139391,0.09256 0.155336,0.211667 0.04234,0.316232 0.104252,0.34266 0.609985,0.260349 0.496265,-0.08077 0.955602,-0.03482 0.879696,0.088 -0.02549,0.04124 -0.13992,0.07499 -0.254292,0.07499 -0.261531,0 -1.228236,0.256864 -1.369558,0.363906 -0.05821,0.04409 -0.105834,0.168498 -0.105834,0.276465 0,0.225407 -0.109282,0.313338 -0.41759,0.336003 -0.119575,0.0088 -0.431879,0.04417 -0.694008,0.07861 -0.312625,0.04108 -0.495874,0.03144 -0.532628,-0.02803 z m -1.658702,-2.318126 c -0.09227,-0.151342 -0.168498,-0.370417 -0.169385,-0.486834 -0.0022,-0.292929 -0.09998,-0.419691 -0.381719,-0.495041 -0.30569,-0.08175 -0.367136,-0.248796 -0.110149,-0.299441 0.889257,-0.175249 1.758441,-0.240314 2.457088,-0.183934 0.964731,0.07785 1.312165,0.06674 1.528219,-0.04889 0.119377,-0.06389 0.193721,-0.0613 0.263131,0.0092 0.129125,0.131083 -0.122833,0.318687 -0.601757,0.448061 -0.197908,0.05346 -0.359833,0.146452 -0.359833,0.206644 0,0.06019 0.03402,0.109439 0.07561,0.109439 0.151162,0 0.17407,0.270767 0.04416,0.521982 -0.127304,0.246178 -0.150064,0.254808 -0.528568,0.200404 -0.217545,-0.03127 -0.655172,-0.189841 -0.972504,-0.352382 -0.717222,-0.367368 -1.03702,-0.363923 -1.020518,0.011 0.0061,0.1397 0.03917,0.339725 0.07337,0.4445 0.09502,0.291055 -0.102358,0.234815 -0.29715,-0.08467 z m 1.755339,-0.991536 c -0.06985,-0.0081 -0.547903,-0.02307 -0.780736,-0.01473 l -0.423333,0.0152 0.338666,0.158291 c 0.186267,0.08706 0.403229,0.228029 0.566212,0.351528 0.227737,0.172566 0.468594,0.230931 0.728864,0.211825 0.28692,0.0081 0.258408,-0.29588 0.256724,-0.476204 -7.78e-4,-0.08331 0.0047,-0.215985 -0.122699,-0.217758"
+ id="path206"
+ sodipodi:nodetypes="cscssssscsscssscsssssscsssssssccsssssssscscscsssccssscscssssscccscssscsscssssccssscscssccsscsssssccscccccsscccssccssccsccccssssccsssscsccccsscssccsscccssccsccccsscssssscccccccssscsssssscccccccsscac" />
+ <path
+ style="fill:#915427;stroke-width:0.0846667"
+ d="m 57.651467,57.553869 c -0.331913,-0.143212 -0.636609,-0.484928 -0.889,-0.997014 -0.124671,-0.25295 -0.236327,-0.358329 -0.423333,-0.399537 -0.426066,-0.09389 -1.030861,-0.391912 -1.085786,-0.535046 -0.02855,-0.07439 -0.115402,-0.135249 -0.193015,-0.135249 -0.322872,0 -0.817697,-0.912259 -0.62244,-1.14753 0.0544,-0.06554 0.04351,-0.191971 -0.03199,-0.371536 -0.09833,-0.233857 -0.09595,-0.312982 0.01687,-0.561893 0.189475,-0.418029 0.381436,-0.387485 0.307699,0.04896 -0.05095,0.301581 -0.03862,0.338667 0.112633,0.338667 0.09342,0 0.230117,0.02313 0.303776,0.05139 0.248211,0.09525 0.13643,0.202608 -0.210951,0.202608 -0.281334,0 -0.339678,0.02698 -0.316671,0.146446 0.02244,0.11653 0.101545,0.141152 0.387208,0.120527 0.215947,-0.01559 0.359005,0.0104 0.359005,0.06522 0,0.05157 -0.165401,0.09114 -0.381,0.09114 -0.428769,0 -0.455044,0.05611 -0.252864,0.539994 0.114658,0.274414 0.161414,0.306809 0.4445,0.307969 0.213225,8.72e-4 0.278324,0.02539 0.199683,0.0752 -0.179223,0.113518 -0.05111,0.231796 0.3644,0.336422 0.785905,0.197894 1.329745,0.0752 1.777557,-0.401033 0.228569,-0.243074 0.237075,-0.274287 0.11243,-0.412594 -0.45996,-0.510372 -0.07746,-1.328678 0.825627,-1.766323 0.848199,-0.411046 1.114281,-0.828468 0.832342,-1.305753 -0.08036,-0.136037 -0.119768,-0.273678 -0.08758,-0.30587 0.106895,-0.106895 0.397591,0.244504 0.491852,0.594561 0.07843,0.291283 0.06878,0.389818 -0.06202,0.632696 -0.169112,0.314021 -0.573415,0.604351 -1.067437,0.766528 -0.354792,0.116471 -0.657652,0.446803 -0.657175,0.716787 8.78e-4,0.496141 0.576738,0.965347 1.481351,1.20699 0.546639,0.14602 0.790704,0.143235 1.089178,-0.01243 0.133381,-0.06956 0.326764,-0.126479 0.429741,-0.126479 0.200623,0 0.594888,-0.355637 0.499744,-0.450781 -0.03147,-0.03147 -0.146119,-0.05722 -0.254775,-0.05722 -0.240436,0 -0.266324,-0.165036 -0.02822,-0.179917 0.09313,-0.0058 0.207434,-0.02011 0.254,-0.03175 0.04657,-0.01164 0.122767,-0.02593 0.169334,-0.03175 0.04657,-0.0058 0.08467,-0.09102 0.08467,-0.189339 0,-0.155559 -0.03571,-0.172221 -0.275166,-0.128399 -0.319476,0.05846 -0.615049,-0.06526 -0.349854,-0.146451 0.08764,-0.02683 0.571516,-0.06865 1.07527,-0.09293 0.503754,-0.02428 0.9768,-0.07822 1.051213,-0.119865 0.07441,-0.04164 0.281218,-0.05614 0.459567,-0.03222 0.829819,0.111303 1.590766,-0.387794 1.753755,-1.150268 0.08566,-0.400705 0.07688,-0.49661 -0.07748,-0.846667 -0.25189,-0.571242 -0.809085,-1.11444 -1.143158,-1.11444 -0.355858,0 -0.398805,-0.06478 -0.231137,-0.348618 0.118315,-0.200292 0.127064,-0.307316 0.05266,-0.644286 -0.04907,-0.222253 -0.117099,-0.468425 -0.151172,-0.547049 -0.04168,-0.09618 -0.002,-0.19314 0.121108,-0.296333 0.27038,-0.226545 0.411769,-0.543132 0.557693,-1.248744 0.158212,-0.765034 0.08269,-1.01103 -0.285524,-0.93001 -1.06178,0.23363 -1.654984,0.492789 -2.387053,1.042856 -0.254377,0.191134 -0.486453,0.347517 -0.515724,0.347517 -0.02927,0 -0.176598,-0.117904 -0.32739,-0.26201 -0.433851,-0.414612 -1.284456,-0.771222 -1.953789,-0.819112 -0.616705,-0.04413 -1.587329,0.0984 -1.962786,0.288207 -0.340554,0.172165 -0.607137,0.140828 -0.831235,-0.09771 -0.293795,-0.31273 -1.147301,-0.548704 -1.984635,-0.548704 -0.968654,0 -1.739937,0.09003 -1.735325,0.202561 0.0062,0.152438 0.771131,0.939181 1.160324,1.193486 0.197908,0.129317 0.359833,0.260994 0.359833,0.292615 0,0.03162 -0.111867,0.1402 -0.248593,0.241286 -0.194044,0.143463 -0.260082,0.27236 -0.300956,0.587422 -0.08834,0.680921 -0.110137,0.728882 -0.534723,1.176324 -0.43435,0.457732 -0.666152,1.021585 -0.588015,1.430332 0.03213,0.168101 0.01022,0.212205 -0.0955,0.192181 -0.176853,-0.0335 -0.223273,-0.433708 -0.09858,-0.849899 0.0528,-0.17623 0.260984,-0.522975 0.462632,-0.770544 0.494087,-0.606606 0.550308,-0.727551 0.611833,-1.316189 0.05073,-0.48535 0.03989,-0.525115 -0.25489,-0.935433 -0.169329,-0.235694 -0.307872,-0.467397 -0.307872,-0.514897 0,-0.0475 -0.152712,-0.252036 -0.339362,-0.454526 -0.387248,-0.420115 -0.362721,-0.477297 0.271021,-0.631833 0.50641,-0.123486 2.407983,-0.126116 2.786207,-0.0039 0.470736,0.152168 0.807987,0.318959 0.921504,0.455738 0.150892,0.181813 0.461666,0.159628 1.144297,-0.08169 0.625879,-0.221253 1.502074,-0.275537 2.215979,-0.137291 0.344985,0.06681 1.159009,0.544092 1.378002,0.807963 0.174832,0.21066 0.394215,0.157817 1.001917,-0.241335 0.522111,-0.342932 0.846329,-0.462389 2.19171,-0.80752 0.375165,-0.09624 0.451393,0.0191 0.451393,0.683013 0,0.624614 -0.192913,1.189423 -0.552016,1.616193 -0.21331,0.253504 -0.264423,0.476377 -0.142602,0.621793 0.03706,0.04424 0.118468,0.232834 0.180905,0.4191 0.06954,0.207465 0.31123,0.53547 0.623855,0.846667 0.535613,0.533166 0.776399,0.960066 0.869341,1.541293 0.04436,0.277399 0.0097,0.449446 -0.169478,0.840774 -0.123887,0.270603 -0.290144,0.563769 -0.36946,0.65148 -0.254759,0.281717 -0.80773,0.515409 -1.329546,0.561879 -0.493821,0.04398 -0.508709,0.05251 -0.533423,0.305559 -0.01398,0.143175 -0.109233,0.340501 -0.211667,0.438504 -0.682589,0.653062 -0.652165,0.637175 -1.126435,0.588227 -0.409415,-0.04226 -0.457716,-0.02828 -0.58771,0.170122 -0.08353,0.127483 -0.16427,0.179537 -0.19681,0.126887 -0.03485,-0.05639 -0.163985,-0.0648 -0.350565,-0.02284 l -0.29539,0.06643 0.211667,0.09097 c 0.205534,0.08834 0.203082,0.09118 -0.08467,0.09822 -0.361403,0.0088 -0.573042,0.175359 -0.895966,0.704945 -0.450195,0.738305 -1.297405,1.02027 -2.067367,0.688052 z m 1.538676,-0.546111 c 0.131629,-0.15767 0.239324,-0.333797 0.239324,-0.391394 0,-0.0576 0.137395,-0.209519 0.305322,-0.337604 0.26951,-0.205565 0.286889,-0.240131 0.148167,-0.294692 -0.08644,-0.03399 -0.279551,-0.06449 -0.429146,-0.06776 -0.337376,-0.0074 -1.158558,-0.308006 -1.296996,-0.474815 -0.14529,-0.175063 -0.200394,-0.155953 -0.314378,0.10903 -0.22725,0.528298 -0.389549,0.695243 -0.677802,0.697204 -0.254768,0.0017 -0.241202,0.18205 0.03872,0.514723 0.397248,0.472102 0.681102,0.600656 1.245951,0.564278 0.448151,-0.02886 0.526973,-0.0628 0.740833,-0.31897 z M 56.63589,54.126599 c -0.16275,-0.139081 -0.438587,-0.27569 -0.612971,-0.303575 -0.33649,-0.05381 -0.712088,-0.363991 -0.836739,-0.691012 -0.115981,-0.304279 -0.09212,-0.692989 0.04255,-0.692989 0.0645,0 0.185042,-0.104775 0.267883,-0.232833 0.08284,-0.128058 0.320451,-0.432858 0.528022,-0.677333 0.207571,-0.244475 0.363249,-0.447694 0.345951,-0.451596 -0.0173,-0.0039 -0.260051,-0.06337 -0.539451,-0.132145 -0.654357,-0.161076 -0.819966,-0.161601 -1.136689,-0.0036 -0.318927,0.159102 -0.340552,0.04891 -0.03723,-0.189682 0.264317,-0.207912 0.505816,-0.220623 0.939369,-0.04944 0.181762,0.07176 0.525287,0.117336 0.797792,0.105833 0.568159,-0.02398 0.570219,-0.03384 -0.172773,0.826466 -0.391167,0.452929 -0.512513,0.656366 -0.514661,0.862836 -0.0015,0.148594 -0.04153,0.294101 -0.08886,0.323351 -0.128082,0.07916 -0.02159,0.198942 0.294154,0.330868 0.353741,0.147803 0.949264,0.680946 1.111882,0.995415 0.167122,0.323179 0.0039,0.314534 -0.388232,-0.02056 z m 4.620684,-0.406616 c -0.05923,-0.09584 0.03627,-0.124314 0.79756,-0.237847 0.395739,-0.05902 0.469792,-0.09853 0.493141,-0.263142 0.03084,-0.217412 0.01638,-0.216329 -0.895586,0.06705 -0.267606,0.08315 -0.51698,0.132749 -0.554167,0.110214 -0.13829,-0.08381 0.126701,-0.261722 0.597791,-0.401358 0.807016,-0.239209 0.86655,-0.27569 0.869638,-0.532892 l 0.0028,-0.234648 0.174977,0.210328 0.174977,0.210329 -0.02963,-0.294995 c -0.02199,-0.218942 0.0031,-0.294996 0.09737,-0.294996 0.07147,0 0.139391,0.09256 0.155336,0.211667 0.04234,0.316232 0.104252,0.34266 0.609985,0.260349 0.496265,-0.08077 0.955602,-0.03482 0.879696,0.088 -0.02549,0.04124 -0.13992,0.07499 -0.254292,0.07499 -0.261531,0 -1.228236,0.256864 -1.369558,0.363906 -0.05821,0.04409 -0.105834,0.168498 -0.105834,0.276465 0,0.225407 -0.109282,0.313338 -0.41759,0.336003 -0.119575,0.0088 -0.431879,0.04417 -0.694008,0.07861 -0.312625,0.04108 -0.495874,0.03144 -0.532628,-0.02803 z m -1.658702,-2.318126 c -0.09227,-0.151342 -0.168498,-0.370417 -0.169385,-0.486834 -0.0022,-0.292929 -0.09998,-0.419691 -0.381719,-0.495041 -0.30569,-0.08175 -0.367136,-0.248796 -0.110149,-0.299441 0.889257,-0.175249 1.758441,-0.240314 2.457088,-0.183934 0.964731,0.07785 1.312165,0.06674 1.528219,-0.04889 0.119377,-0.06389 0.193721,-0.0613 0.263131,0.0092 0.129125,0.131083 -0.122833,0.318687 -0.601757,0.448061 -0.197908,0.05346 -0.359833,0.146452 -0.359833,0.206644 0,0.06019 0.03402,0.109439 0.07561,0.109439 0.151162,0 0.17407,0.270767 0.04416,0.521982 -0.127304,0.246178 -0.150064,0.254808 -0.528568,0.200404 -0.217545,-0.03127 -0.655172,-0.189841 -0.972504,-0.352382 -0.717222,-0.367368 -1.03702,-0.363923 -1.020518,0.011 0.0061,0.1397 0.03917,0.339725 0.07337,0.4445 0.09502,0.291055 -0.102358,0.234815 -0.29715,-0.08467 z M 62.1388,50.776308 c 0,-0.408881 -0.09018,-0.405923 -0.389151,-0.392655 -0.279253,0.01291 -0.668799,-0.04137 -0.964737,-0.01323 l -0.613383,0.06044 0.281388,0.118314 c 0.154763,0.06507 0.413661,0.219205 0.575329,0.342516 0.286655,0.218642 0.792258,0.367143 1.004721,0.295097 0.06331,-0.02147 0.105833,-0.186393 0.105833,-0.410487 z"
+ id="path204"
+ sodipodi:nodetypes="csccscsssscsssssssssssssccsssssssscscscsssccssscscssssscccscssscsccssscscscsccsssssssssccssscssscccscccssccssccsccccssssccssccsccsscccssccsccccsscssssscccccccssscsssssscccccccccsscc" />
+ <path
+ style="fill:#78442a;stroke-width:0.0846667"
+ d="m 57.651467,57.553869 c -0.331913,-0.143212 -0.636609,-0.484928 -0.889,-0.997014 -0.124671,-0.25295 -0.236327,-0.358329 -0.423333,-0.399537 -0.32541,-0.07171 -1.058334,-0.393506 -1.058334,-0.464677 0,-0.02992 0.06667,-0.02864 0.148167,0.0028 0.33954,0.131186 0.993653,0.210291 1.314556,0.158977 0.217332,-0.03475 0.459111,-0.159159 0.657296,-0.338207 0.36115,-0.326277 0.419981,-0.343612 0.419981,-0.12375 0,0.182676 -0.614155,0.771852 -0.804577,0.771852 -0.390302,0 0.236537,0.928139 0.780691,1.155943 0.65528,0.274326 1.322724,0.04404 1.632553,-0.563276 0.173776,-0.34063 0.599211,-0.679289 0.846667,-0.673973 0.08681,0.0019 0.0581,0.06205 -0.09072,0.190184 -0.119748,0.1031 -0.329298,0.369763 -0.465667,0.592583 -0.451964,0.738482 -1.298622,1.020138 -2.068279,0.688051 z m 1.524,-1.755433 c -0.59949,-0.140046 -0.93536,-0.32144 -1.310608,-0.707821 -0.363456,-0.374238 -0.431037,-0.597664 -0.300457,-0.993325 0.112419,-0.340631 0.461086,-0.663088 0.98149,-0.907708 0.197629,-0.0929 0.521722,-0.318825 0.720205,-0.502064 0.407119,-0.375851 0.41737,-0.380947 0.41737,-0.207497 0,0.230736 -0.483841,0.670889 -1.069246,0.972698 -0.885359,0.456452 -1.005668,0.863153 -0.433451,1.465272 0.398177,0.418986 1.13978,0.680715 1.914803,0.675781 0.54645,-0.0035 0.666138,-0.03396 0.965545,-0.24586 0.187975,-0.133039 0.369587,-0.299039 0.403582,-0.368889 0.08758,-0.17995 0.225675,-0.52092 0.29147,-0.719666 0.05535,-0.167198 0.05758,-0.167261 0.177011,-0.005 0.14848,0.201753 0.154195,0.419719 0.01678,0.639764 -0.08615,0.13794 -0.07905,0.191948 0.041,0.311997 0.184122,0.184123 0.596582,0.0644 0.642594,-0.186526 0.0169,-0.09217 0.08349,-0.227234 0.147984,-0.30014 0.06449,-0.07291 0.141677,-0.254673 0.171528,-0.403929 0.07008,-0.350395 0.119236,-0.375113 0.786474,-0.395467 0.852987,-0.02602 1.457296,-0.404461 1.65311,-1.035235 0.110484,-0.355902 0.06773,-0.837519 -0.104281,-1.174688 -0.237704,-0.465934 -0.886454,-1.049123 -1.167067,-1.049123 -0.179503,0 -0.21045,-0.02869 -0.159794,-0.148166 0.03455,-0.08149 0.08849,-0.281517 0.119854,-0.4445 0.05524,-0.287055 0.05921,-0.289706 0.126708,-0.08467 0.03832,0.116417 0.29952,0.440267 0.580442,0.719667 0.535964,0.533063 0.776794,0.959827 0.869774,1.541293 0.04436,0.277399 0.0097,0.449445 -0.169478,0.840774 -0.123887,0.270603 -0.290144,0.563769 -0.36946,0.651479 -0.254319,0.281231 -0.807378,0.515372 -1.327204,0.56188 -0.500338,0.04476 -0.506598,0.0486 -0.594943,0.364787 -0.05563,0.199105 -0.23203,0.450051 -0.468009,0.665794 -0.365688,0.334331 -0.394186,0.344653 -0.828037,0.299907 -0.328741,-0.03391 -0.460856,-0.01626 -0.492323,0.06574 -0.02366,0.06164 -0.126264,0.111806 -0.22802,0.111469 -0.101755,-3.39e-4 -0.48981,0.02219 -0.862343,0.05006 -0.431073,0.03225 -0.846638,0.01113 -1.143,-0.05811 z m -2.45268,-1.705216 c -0.05651,-0.06809 -0.318351,-0.204198 -0.581867,-0.302459 -0.591132,-0.220424 -0.841324,-0.445784 -0.911766,-0.821269 -0.06121,-0.326287 0.09367,-0.591659 0.181979,-0.311793 0.102292,0.324192 0.187249,0.419134 0.512314,0.572524 0.346771,0.163633 0.838409,0.586098 0.975948,0.838634 0.09867,0.181169 -0.03156,0.199134 -0.176608,0.02436 z m -4.602876,-2.133974 c -0.100914,-0.100914 -0.05964,-0.618683 0.07501,-0.940942 0.0723,-0.173038 0.275701,-0.486139 0.452003,-0.695781 0.441366,-0.524831 0.511063,-0.678521 0.571971,-1.261258 0.05073,-0.48535 0.03989,-0.525115 -0.25489,-0.935433 -0.169329,-0.235694 -0.307872,-0.467397 -0.307872,-0.514897 0,-0.0475 -0.152712,-0.252036 -0.339362,-0.454526 -0.258324,-0.280249 -0.313923,-0.388078 -0.232833,-0.451555 0.221578,-0.173452 0.93555,-0.277164 1.908038,-0.277164 1.120447,0 1.88363,0.182929 2.329933,0.558468 0.133036,0.111943 0.278208,0.203532 0.322605,0.203532 0.0444,0 0.317699,-0.09991 0.607337,-0.222031 0.628591,-0.265026 1.657951,-0.356976 2.345518,-0.209519 0.435423,0.09338 1.201011,0.523664 1.436412,0.807305 0.174832,0.210661 0.394215,0.157818 1.001917,-0.241334 0.522111,-0.342933 0.846329,-0.462389 2.19171,-0.80752 0.17,-0.04361 0.301813,-0.03528 0.359833,0.02274 0.147412,0.147412 0.105294,0.240335 -0.06711,0.148065 -0.115607,-0.06187 -0.354144,-0.03114 -0.878884,0.113232 -0.810094,0.222879 -1.424835,0.530251 -1.936604,0.968306 -0.237232,0.203062 -0.379997,0.272169 -0.451715,0.21866 -0.05767,-0.04303 -0.266953,-0.200823 -0.465064,-0.350652 -0.64489,-0.487718 -1.204562,-0.655841 -2.162727,-0.649676 -0.638518,0.0041 -0.976104,0.05047 -1.373163,0.188603 -0.669396,0.232867 -0.797055,0.229918 -1.03552,-0.02392 -0.338708,-0.360538 -1.011157,-0.512969 -2.247984,-0.509574 -1.150311,0.0032 -1.566334,0.06229 -1.566334,0.222644 0,0.186427 0.989566,1.166588 1.438062,1.424395 0.103258,0.05936 0.08487,0.104414 -0.102917,0.252123 -0.233605,0.183753 -0.402495,0.620744 -0.403339,1.04361 -3.22e-4,0.161526 -0.117681,0.362759 -0.370331,0.635 -0.488354,0.526223 -0.67351,0.90465 -0.681719,1.393314 -0.0065,0.388296 -0.04255,0.465208 -0.161978,0.345782 z m 7.508021,-0.642056 c -0.03604,-0.05821 -0.08591,-0.257746 -0.11083,-0.443417 -0.03512,-0.261695 -0.09764,-0.362657 -0.278135,-0.44912 -0.300937,-0.14416 -0.29763,-0.27163 0.007,-0.27163 0.131933,0 0.453177,-0.04284 0.713875,-0.09519 0.315803,-0.06342 0.891468,-0.07432 1.724876,-0.03266 1.208163,0.0604 1.242333,0.06713 1.000624,0.197091 -0.203616,0.109483 -0.497455,0.13073 -1.576708,0.114011 -1.261105,-0.01954 -1.716831,0.05728 -1.191795,0.200874 l 0.232249,0.06352 -0.211667,0.05663 c -0.184766,0.04943 -0.210738,0.101686 -0.204359,0.411178 0.0079,0.382143 -0.0045,0.411354 -0.105176,0.248717 z"
+ id="path202" />
+ <path
+ style="fill:#6c3629;stroke-width:0.0846667"
+ d="m 57.609134,57.526343 c -0.324217,-0.151541 -0.579294,-0.45282 -0.878017,-1.03705 -0.106926,-0.209122 -0.238762,-0.302201 -0.585732,-0.413537 -0.59974,-0.192445 -0.612459,-0.228841 -0.06408,-0.183365 0.651524,0.05403 1.008774,-0.03356 1.319049,-0.323399 0.14796,-0.138216 0.30309,-0.251302 0.344732,-0.251302 0.249663,0 -0.154309,0.501814 -0.595932,0.740267 -0.159854,0.08631 -0.305916,0.202747 -0.324581,0.258743 -0.01867,0.056 0.173876,0.318064 0.42787,0.582373 0.444532,0.462585 0.480713,0.48193 0.967173,0.517118 0.645506,0.04669 0.94658,-0.103119 1.211737,-0.602945 0.167344,-0.315446 0.528712,-0.648889 0.703233,-0.648889 0.0242,0 -0.114117,0.243378 -0.307364,0.54084 -0.603902,0.929579 -1.375202,1.215117 -2.21809,0.821146 z m 1.857989,-1.70021 c -0.842272,-0.123183 -1.587294,-0.584953 -1.855429,-1.150005 -0.140668,-0.296435 -0.139161,-0.315564 0.0545,-0.691876 0.161188,-0.313219 0.314816,-0.453038 0.805711,-0.733287 0.333601,-0.190451 0.723627,-0.434594 0.866724,-0.54254 0.143097,-0.107946 0.260175,-0.160709 0.260175,-0.117252 0,0.203482 -0.385534,0.524795 -0.963462,0.802973 -0.348737,0.16786 -0.674673,0.381071 -0.724302,0.473805 -0.324252,0.605871 0.218028,1.307047 1.254274,1.621797 1.205447,0.366144 2.092712,0.07478 2.46675,-0.810037 0.107575,-0.254479 0.2275,-0.462688 0.266499,-0.462688 0.109011,0 0.08404,0.488789 -0.03493,0.683639 -0.09005,0.147498 -0.08133,0.191507 0.05851,0.295184 0.222207,0.164738 0.50218,0.153487 0.655001,-0.02632 0.1613,-0.189785 0.408317,-0.729067 0.408317,-0.891428 0,-0.213849 0.190275,-0.292081 0.813497,-0.334474 1.010405,-0.06873 1.536897,-0.50743 1.683225,-1.402553 0.08419,-0.515002 -0.243519,-1.164262 -0.818877,-1.622368 -0.23648,-0.188289 -0.486214,-0.342343 -0.554963,-0.342343 -0.0792,0 -0.106168,-0.04907 -0.07361,-0.133925 0.02827,-0.07366 0.05139,-0.228307 0.05139,-0.343664 0,-0.118266 0.03693,-0.186917 0.08467,-0.157411 0.04657,0.02878 0.08467,0.109239 0.08467,0.178798 0,0.06956 0.223737,0.333612 0.497192,0.586784 0.565915,0.523937 0.880431,1.134947 0.892254,1.733388 0.0058,0.294107 -0.06081,0.497333 -0.288779,0.88092 -0.364481,0.613282 -0.924045,0.956928 -1.623367,0.996961 -0.432701,0.02477 -0.454839,0.03782 -0.546585,0.322149 -0.05259,0.162983 -0.26214,0.462381 -0.465667,0.665329 -0.361696,0.360668 -0.380054,0.367974 -0.813405,0.323736 -0.243846,-0.02489 -0.463522,-0.01263 -0.488168,0.02725 -0.02465,0.03988 -0.263285,0.09582 -0.530309,0.124323 -0.267025,0.0285 -0.599799,0.0644 -0.739499,0.07978 -0.1397,0.01538 -0.446605,-1.69e-4 -0.682011,-0.03464 z m -7.340156,-3.859295 c -0.107105,-0.108011 -0.07066,-0.616795 0.06795,-0.948534 0.0723,-0.173038 0.275701,-0.486139 0.452003,-0.695781 0.441366,-0.524831 0.511063,-0.678521 0.571971,-1.261258 0.05073,-0.48535 0.03989,-0.525115 -0.25489,-0.935433 -0.169329,-0.235694 -0.307872,-0.467397 -0.307872,-0.514897 0,-0.0475 -0.152712,-0.252036 -0.339362,-0.454526 -0.410919,-0.445795 -0.368663,-0.504852 0.465121,-0.65005 1.231944,-0.214533 2.96878,0.04034 3.517415,0.516172 0.243672,0.211335 0.509566,0.211716 0.921975,0.0013 0.473256,-0.241437 1.213797,-0.336365 1.996518,-0.255927 0.372534,0.03828 0.753534,0.09942 0.846667,0.135853 0.232668,0.09102 0.841056,0.507125 0.971784,0.664643 0.172147,0.207425 0.393766,0.153454 0.999447,-0.243394 0.493755,-0.323513 1.748634,-0.804028 1.845852,-0.706809 0.01826,0.01826 -0.185416,0.101704 -0.45261,0.185437 -0.647041,0.20277 -1.074461,0.422345 -1.594294,0.819025 -0.237135,0.180955 -0.480167,0.32901 -0.540071,0.32901 -0.05991,0 -0.251426,-0.128748 -0.425603,-0.286106 -0.852959,-0.770597 -2.657788,-0.940969 -4.040967,-0.381459 -0.254601,0.102989 -0.289189,0.0951 -0.50988,-0.116338 -0.510674,-0.489257 -1.687006,-0.684257 -3.206953,-0.531615 -0.860621,0.08643 -0.887237,0.121971 -0.467115,0.623761 0.36132,0.431557 0.788242,0.826982 1.07851,0.99894 0.154365,0.09145 0.151735,0.104412 -0.06176,0.30434 -0.208286,0.195049 -0.412005,0.813961 -0.412005,1.251701 0,0.08886 -0.13609,0.267956 -0.302422,0.398 -0.387813,0.303204 -0.641633,0.794661 -0.705423,1.365869 -0.02777,0.248651 -0.07906,0.423276 -0.113988,0.388055 z m 7.414171,-1.357563 c -0.02879,-0.07503 -0.167156,-0.184689 -0.307477,-0.243689 -0.24633,-0.103574 -0.227053,-0.11233 0.558886,-0.253842 0.789267,-0.14211 1.230667,-0.140078 2.37443,0.01093 0.791193,0.104461 0.198573,0.202069 -1.106019,0.18217 -0.905553,-0.01381 -1.319428,0.01025 -1.389991,0.08081 -0.07753,0.07753 -0.06835,0.112811 0.04019,0.154462 0.07737,0.02969 0.119592,0.08809 0.09383,0.129776 -0.07372,0.119282 -0.206519,0.08877 -0.263846,-0.06062 z"
+ id="path200" />
+ <path
+ style="fill:#6d3119;stroke-width:0.0846667"
+ d="m 57.778467,57.558915 c -0.186267,-0.0671 -0.346446,-0.122582 -0.355955,-0.123283 -0.05568,-0.0041 -0.617712,-0.803316 -0.617712,-0.878391 0,-0.04992 0.208316,0.114962 0.462924,0.366407 0.436966,0.431538 0.490803,0.45919 0.960092,0.493135 0.636622,0.04605 0.939511,-0.10584 1.203539,-0.603537 0.110257,-0.207838 0.303692,-0.438862 0.429854,-0.513388 0.320268,-0.189187 0.38981,-0.168885 0.188385,0.055 -0.09427,0.104775 -0.287115,0.362579 -0.428558,0.572898 -0.282408,0.419928 -0.853235,0.76305 -1.259176,0.756886 -0.1346,-0.002 -0.397126,-0.05862 -0.583393,-0.125726 z m 1.688656,-1.731759 c -0.844343,-0.125504 -1.587578,-0.586574 -1.855429,-1.151028 -0.140668,-0.296435 -0.139161,-0.315564 0.0545,-0.691876 0.161188,-0.313219 0.314816,-0.453038 0.805711,-0.733287 0.333601,-0.190451 0.723627,-0.434594 0.866724,-0.54254 0.293676,-0.221538 0.32379,-0.191199 0.119577,0.120469 -0.07733,0.118019 -0.437756,0.363989 -0.800949,0.546599 -0.363194,0.18261 -0.699975,0.406053 -0.748402,0.496542 -0.322031,0.601719 0.22336,1.303919 1.256459,1.617713 1.205447,0.366144 2.092712,0.07478 2.46675,-0.810037 0.107575,-0.254479 0.2275,-0.462688 0.266499,-0.462688 0.109011,0 0.08404,0.488789 -0.03493,0.683639 -0.09005,0.147498 -0.08133,0.191507 0.05851,0.295184 0.222207,0.164738 0.50218,0.153487 0.655001,-0.02632 0.1613,-0.189785 0.408317,-0.729067 0.408317,-0.891428 0,-0.212906 0.189424,-0.291956 0.804333,-0.335662 1.032918,-0.07342 1.557002,-0.496793 1.686853,-1.362707 0.05203,-0.346942 0.02742,-0.479054 -0.16098,-0.864121 -0.223835,-0.457504 -0.946317,-1.139248 -1.207324,-1.139248 -0.0792,0 -0.106168,-0.04907 -0.07361,-0.133925 0.02827,-0.07366 0.05255,-0.197484 0.05397,-0.275167 0.0021,-0.116283 0.01967,-0.111319 0.09931,0.02809 0.0532,0.09313 0.175872,0.224657 0.272593,0.292275 0.691039,0.483108 1.149524,1.28876 1.149524,2.019952 0,0.397954 -0.452251,1.162991 -0.834394,1.411479 -0.365194,0.237467 -0.972918,0.411607 -1.192847,0.341804 -0.197674,-0.06274 -0.428093,0.160552 -0.428093,0.414849 0,0.299964 -0.69012,0.883194 -1.081133,0.91368 -0.261146,0.02036 -0.311557,-10e-4 -0.290988,-0.123539 0.03582,-0.213321 -0.143017,-0.182268 -0.331694,0.05759 -0.125002,0.158915 -0.272349,0.217946 -0.647185,0.259276 -0.266933,0.02943 -0.580583,0.06578 -0.697,0.08078 -0.116416,0.015 -0.404271,-0.0014 -0.639677,-0.03635 z m 0.07402,-5.217881 c -0.02879,-0.07503 -0.167156,-0.184689 -0.307477,-0.243689 -0.246232,-0.103533 -0.226576,-0.112416 0.563595,-0.25469 0.712481,-0.128285 0.941943,-0.134513 1.768227,-0.048 0.881729,0.09232 1.194655,0.157089 0.904929,0.187295 -0.06597,0.0069 -0.699731,0.01707 -1.408359,0.02265 -0.876791,0.0069 -1.320866,0.0426 -1.389991,0.11172 -0.07899,0.07899 -0.0703,0.113579 0.03909,0.155557 0.07737,0.02969 0.119592,0.08809 0.09383,0.129776 -0.07372,0.119282 -0.206519,0.08877 -0.263846,-0.06062 z m 1.319815,-2.945143 c -0.822659,-0.765309 -2.652692,-0.93898 -4.027187,-0.382181 -0.25109,0.101715 -0.286064,0.09189 -0.574446,-0.16131 -0.168893,-0.14829 -0.272318,-0.269618 -0.229833,-0.269618 0.04248,0 0.126403,0.05923 0.186483,0.131623 0.241969,0.291554 0.395703,0.303043 0.946226,0.07071 0.872403,-0.368174 2.746487,-0.371613 3.135364,-0.0058 0.238296,0.224191 0.942925,0.734754 1.014034,0.734754 0.04199,0 0.159559,-0.04364 0.261272,-0.09699 0.183596,-0.09628 0.183767,-0.09567 0.02365,0.08467 -0.220617,0.248471 -0.379165,0.225644 -0.735558,-0.105905 z"
+ id="path198" />
+ </g>
+</svg>