erbook 6.1.0 → 7.0.0

data/lang/de.yaml

@@ -9,20 +9,20 @@ Example: Beispiel
 Examples: Beispiele
 Figure: Abbildung
 Figures: Abbildungen
+Focus next segment: Folgendes Segment des Fokus
+Focus previous segment: Vorhergehendes Segment des Fokus
+Focus this segment: Fokussieren Sie dieses Segment
 Generated by %s on %s.: Erzeugt durch %s auf %s.
 Important: Wichtig
 Importants: Importants
-Jump to next segment: Springen Sie, um zunächst zu segmentieren
-Jump to previous segment: Springen Sie zum vorhergehenden Segment
-Jump to this segment: Springen Sie zu diesem Segment
-Note: Merken Sie
+Note: Anmerkung
 Notes: Anmerkungen
 Part: Teil
 Procedure: Verfahren
 Procedures: Verfahren
 Reference: Hinweis
 References: Hinweise
-Reverse jump to listing: Rücksprung zur Auflistung
+Return to listing: Gehen Sie zur Auflistung zurück
 Section: Abschnitt
 Table: Tabelle
 Tables: Tabellen

data/lang/el.yaml

@@ -9,12 +9,12 @@ Example: Παράδειγμα
 Examples: Παραδείγματα
 Figure: Αριθμός
 Figures: Αριθμοί
+Focus next segment: Επόμενο τμήμα εστίασης
+Focus previous segment: Προηγούμενο τμήμα εστίασης
+Focus this segment: Στρέψτε αυτό το τμήμα
 Generated by %s on %s.: Παραγμένος από %s %s.
 Important: Σημαντικός
 Importants: Importants
-Jump to next segment: Άλμα στο επόμενο τμήμα
-Jump to previous segment: Άλμα στο προηγούμενο τμήμα
-Jump to this segment: Άλμα σε αυτό το τμήμα
 Note: Σημείωση
 Notes: Σημειώσεις
 Part: Μέρος
@@ -22,7 +22,7 @@ Procedure: Διαδικασία
 Procedures: Διαδικασίες
 Reference: Αναφορά
 References: Αναφορές
-Reverse jump to listing: Αντίστροφο άλμα στη λίστα
+Return to listing: Επιστροφή στη λίστα
 Section: Τμήμα
 Table: Πίνακας
 Tables: Πίνακες

data/lang/es.yaml

@@ -9,20 +9,20 @@ Example: Ejemplo
 Examples: Ejemplos
 Figure: Figura
 Figures: Figuras
+Focus next segment: Segmento siguiente del foco
+Focus previous segment: Segmento anterior del foco
+Focus this segment: Enfoque este segmento
 Generated by %s on %s.: Generado por %s en %s.
 Important: Importante
 Importants: Importants
-Jump to next segment: Salte para dividir en segmentos después
-Jump to previous segment: Salte al segmento anterior
-Jump to this segment: Salte a este segmento
-Note: Observe
+Note: Nota
 Notes: Notas
 Part: Parte
 Procedure: Procedimiento
 Procedures: Procedimientos
 Reference: Referencia
 References: Referencias
-Reverse jump to listing: Salto reverso al listado
+Return to listing: Vuelva al listado
 Section: Sección
 Table: Tabla
 Tables: Tablas

data/lang/fr.yaml

@@ -9,20 +9,20 @@ Example: Exemple
 Examples: Exemples
 Figure: Figure
 Figures: Figures
+Focus next segment: Prochain segment de foyer
+Focus previous segment: Segment précédent de foyer
+Focus this segment: Focalisez ce segment
 Generated by %s on %s.: Produit par %s sur %s.
 Important: Important
 Importants: Importants
-Jump to next segment: Sautez pour segmenter après
-Jump to previous segment: Sautez au segment précédent
-Jump to this segment: Sautez à ce segment
-Note: Notez
+Note: Note
 Notes: Notes
 Part: Partie
 Procedure: Procédé
 Procedures: Procédures
 Reference: Référence
 References: Références
-Reverse jump to listing: Saut renversé à la liste
+Return to listing: Revenez à la liste
 Section: Section
 Table: Tableau
 Tables: Tableaux

data/lang/it.yaml

@@ -9,20 +9,20 @@ Example: Esempio
 Examples: Esempi
 Figure: Figura
 Figures: Figure
+Focus next segment: Segmento seguente del fuoco
+Focus previous segment: Segmento precedente del fuoco
+Focus this segment: Metta a fuoco questo segmento
 Generated by %s on %s.: Generato da %s su %s.
 Important: Importante
 Importants: Importants
-Jump to next segment: Salti dopo per suddividersi
-Jump to previous segment: Salti al segmento precedente
-Jump to this segment: Salti a questo segmento
-Note: Noti
+Note: Nota
 Notes: Note
 Part: Parte
 Procedure: Procedura
 Procedures: Procedure
 Reference: Riferimento
 References: Riferimenti
-Reverse jump to listing: Salto d'inversione all'elenco
+Return to listing: Rinvii all'elenco
 Section: Sezione
 Table: Tabella
 Tables: Tabelle

data/lang/ja.yaml

@@ -9,12 +9,12 @@ Example: 例
 Examples: 例
 Figure: 図
 Figures: 図
+Focus next segment: 焦点の次の区分
+Focus previous segment: 焦点の前の区分
+Focus this segment: この区分を集中しなさい
 Generated by %s on %s.: %s.で%sによって発生させる。
 Important: 重要
 Importants: Importants
-Jump to next segment: 次の区分へのジャンプ
-Jump to previous segment: 前の区分へのジャンプ
-Jump to this segment: この区分へのジャンプ
 Note: ノート
 Notes: ノート
 Part: 部分
@@ -22,7 +22,7 @@ Procedure: プロシージャ
 Procedures: プロシージャ
 Reference: 参照
 References: 参照
-Reverse jump to listing: リストへの逆のジャンプ
+Return to listing: リストへのリターン
 Section: セクション
 Table: テーブル
 Tables: テーブル

data/lang/ko.yaml

@@ -9,12 +9,12 @@ Example: 보기
 Examples: 보기
 Figure: 숫자
 Figures: 숫자
+Focus next segment: 초점 다음 세그먼트
+Focus previous segment: 초점 이전 세그먼트
+Focus this segment: 이 세그먼트를 집중시키십시오
 Generated by %s on %s.: %s.에 %s에 의해 생성하는.
 Important: 중요한
 Importants: Importants
-Jump to next segment: 다음 세그먼트에 점프
-Jump to previous segment: 이전 세그먼트에 점프
-Jump to this segment: 이 세그먼트에 점프
 Note: 주
 Notes: 주
 Part: 부분
@@ -22,7 +22,7 @@ Procedure: 절차
 Procedures: 절차
 Reference: 참고
 References: 참고
-Reverse jump to listing: 명부작성에 반전 점프
+Return to listing: 명부작성에 반환
 Section: 단면도
 Table: 테이블
 Tables: 테이블

data/lang/nl.yaml

@@ -9,12 +9,12 @@ Example: Voorbeeld
 Examples: Voorbeelden
 Figure: Cijfer
 Figures: Cijfers
+Focus next segment: Het volgende segment van de nadruk
+Focus previous segment: Het vorige segment van de nadruk
+Focus this segment: Concentreer dit segment
 Generated by %s on %s.: Geproduceerd door %s op %s.
 Important: Belangrijk
 Importants: Importants
-Jump to next segment: Sprong aan volgende segment
-Jump to previous segment: Sprong aan vorig segment
-Jump to this segment: Sprong aan dit segment
 Note: Nota
 Notes: Nota's
 Part: Deel
@@ -22,7 +22,7 @@ Procedure: Procedure
 Procedures: Procedures
 Reference: Verwijzing
 References: Verwijzingen
-Reverse jump to listing: Omgekeerde sprong aan lijst
+Return to listing: Terugkeer naar lijst
 Section: Sectie
 Table: Lijst
 Tables: Lijsten

data/lang/phrases.yaml

@@ -11,9 +11,9 @@ Figures:
 Generated by %s on %s.:
 Important:
 Importants:
-Jump to next segment:
-Jump to previous segment:
-Jump to this segment:
+Focus next segment:
+Focus previous segment:
+Focus this segment:
 Note:
 Notes:
 Part:
@@ -21,7 +21,7 @@ Procedure:
 Procedures:
 Reference:
 References:
-Reverse jump to listing:
+Return to listing:
 Section:
 Table:
 Tables:

data/lang/pt.yaml

@@ -9,20 +9,20 @@ Example: Exemplo
 Examples: Exemplos
 Figure: Figura
 Figures: Figuras
+Focus next segment: Segmento seguinte do foco
+Focus previous segment: Segmento precedente do foco
+Focus this segment: Focalize este segmento
 Generated by %s on %s.: Gerado por %s em %s.
 Important: Importante
 Importants: Importants
-Jump to next segment: Salte para segmentar em seguida
-Jump to previous segment: Salte ao segmento precedente
-Jump to this segment: Salte a este segmento
-Note: Anote
+Note: Nota
 Notes: Notas
 Part: Parte
 Procedure: Procedimento
 Procedures: Procedimentos
 Reference: Referência
 References: Referências
-Reverse jump to listing: Salto reverso à lista
+Return to listing: Retorne à lista
 Section: Seção
 Table: Tabela
 Tables: Tabelas

data/lang/ru.yaml

@@ -9,20 +9,20 @@ Example: Пример
 Examples: Примеры
 Figure: Диаграмма
 Figures: Диаграммы
+Focus next segment: Этап фокуса следующий
+Focus previous segment: Этап фокуса предыдущий
+Focus this segment: Сфокусируйте этот этап
 Generated by %s on %s.: Произведено %s на %s.
 Important: Важно
 Importants: Importants
-Jump to next segment: Поскачите затем для того чтобы поделить на сегменты
-Jump to previous segment: Поскачите к предыдущему этапу
-Jump to this segment: Поскачите к этому этапу
-Note: Заметьте
+Note: Примечание
 Notes: Примечания
 Part: Часть
 Procedure: Процедура
 Procedures: Процедуры
 Reference: Справка
 References: Справки
-Reverse jump to listing: Обратная скачка к перечислению
+Return to listing: Возвратите к перечислению
 Section: Раздел
 Table: Таблица
 Tables: Таблицы

data/lang/zh.yaml

@@ -9,20 +9,20 @@ Example: 例子
 Examples: 例子
 Figure: 图
 Figures: 图
+Focus next segment: 焦点下段
+Focus previous segment: 焦点早先段
+Focus this segment: 聚焦这段
 Generated by %s on %s.: 引起由%s在%s。
 Important: 重要
 Importants: Importants
-Jump to next segment: 跳跃其次分割
-Jump to previous segment: 跳跃到早先段
-Jump to this segment: 跳跃到这段
-Note: 注意
+Note: 笔记
 Notes: 笔记
 Part: 部分
 Procedure: 做法
 Procedures: 做法
 Reference: 参考
 References: 参考
-Reverse jump to listing: 对目录的反向跃迁
+Return to listing: 回到目录
 Section: 部分
 Table: 表
 Tables: 表

data/lang/zt.yaml

@@ -9,20 +9,20 @@ Example: 例子
 Examples: 例子
 Figure: 图
 Figures: 图
+Focus next segment: 焦點下段
+Focus previous segment: 焦點早先段
+Focus this segment: 聚焦這段
 Generated by %s on %s.: 引起由%s在%s。
 Important: 重要
 Importants: Importants
-Jump to next segment: 跳躍其次分割
-Jump to previous segment: 跳躍到早先段
-Jump to this segment: 跳躍到這段
-Note: 注意
+Note: 筆記
 Notes: 筆記
 Part: 部分
 Procedure: 做法
 Procedures: 做法
 Reference: 參考
 References: 參考
-Reverse jump to listing: 對目錄的反向躍遷
+Return to listing: 回到目錄
 Section: 部分
 Table: 表
 Tables: 表

data/lib/erbook.rb

@@ -1,16 +1,23 @@
+#--
+# Copyright 2007 Suraj N. Kurapati
+# See the LICENSE file for details.
+#++
+
 require 'rubygems'
+gem 'inochi', '~> 1'
 require 'inochi'
 
 Inochi.init :ERBook,
   :program => 'erbook',
-  :version => '6.1.0',
-  :release => '2009-02-14',
+  :version => '7.0.0',
+  :release => '2009-05-03',
   :website => 'http://snk.tuxfamily.org/lib/erbook/',
   :tagline => 'Extensible document processor based on eRuby',
   :require => {
-    # gems needed by the default 'xhtml' format
-    'maruku'  => '~> 0.5',
-    'coderay' => '>= 0.7',
+    'ember'     => '~> 0',   # for eRuby template processing
+    'maruku'    => '~> 0.5', # for Markdown to XHTML conversion
+    'coderay'   => '>= 0.8', # for syntax coloring of source code
+    'rainpress' => '~> 1',   # for minifying CSS
   }
 
 module ERBook

data/lib/erbook/document.rb

@@ -1,5 +1,11 @@
+#--
+# Copyright 2008 Suraj N. Kurapati
+# See the LICENSE file for details.
+#++
+
 require 'yaml'
 require 'erbook/template'
+require 'digest/sha1'
 
 module ERBook
   class Document
@@ -16,25 +22,26 @@ module ERBook
     attr_reader :nodes_by_type
 
     ##
-    # @param [String] format
+    # ==== Parameters
+    #
+    # [format_name]
     #   Either the short-hand name of a built-in format
     #   or the path to a format specification file.
     #
-    # @param [String] input_text
+    # [input_text]
     #   The body of the input document.
     #
-    # @param [String] input_file
+    # [input_file]
     #   Name of the file from which the input document originated.
     #
-    # @param [Hash] options
-    #   Additional method parameters:
+    # ==== Options
     #
-    #   [boolean] :unindent =>
+    # [:unindent]
     #     If true, all node content is unindented hierarchically.
     #
-    def initialize format, input_text, input_file, options = {}
+    def initialize format_name, input_text, input_file, options = {}
       # process format specification
-        @format_file = format.to_s
+      @format_file = format_name.to_s
 
         File.file? @format_file or
           @format_file = File.join(ERBook::FORMATS_DIR, @format_file + '.yaml')
@@ -58,6 +65,7 @@ module ERBook
         begin
           # create sandbox for input evaluation
             template = Template.new(input_file, input_text, options[:unindent])
+            sandbox = template.sandbox
 
             @template_vars = {
               :@format        => @format,
@@ -65,96 +73,86 @@ module ERBook
               :@nodes         => @nodes = [], # all nodes in the forest
               :@nodes_by_type => @nodes_by_type = Hash.new {|h,k| h[k] = [] },
               :@stack         => [], # stack for all nodes
-            }.each_pair {|k,v| template.instance_variable_set(k, v) }
-
-            class << template
-              private
-
-              # Handles the method call from a node
-              # placeholder in the input document.
-              def __node__ node_type, *node_args, &node_content
-                node = Node.new(
-                  :type => node_type,
-                  :defn => @format['nodes'][node_type],
-                  :args => node_args,
-                  :children => [],
-
-                  # omit erbook internals from the stack trace
-                  :trace => caller.reject {|t|
-                    [$0, ERBook::INSTALL].any? {|f| t.index(f) == 0 }
-                  }
-                )
-                @nodes << node
-                @nodes_by_type[node.type] << node
-
-                # calculate occurrence number for this node
-                if node.defn['number']
-                  @count ||= Hash.new {|h,k| h[k] = []}
-                  node.number = (@count[node.type] << node).length
-                end
+            }.each_pair {|k,v| sandbox.instance_variable_set(k, v) }
+
+            # Handles the method call from a node
+            # placeholder in the input document.
+            def sandbox.__node_impl__ node_type, *node_args, &node_content
+              node = Node.new(
+                :type => node_type,
+                :defn => @format['nodes'][node_type],
+                :args => node_args,
+                :children => [],
+
+                # omit erbook internals from the stack trace
+                :trace => caller.reject {|t|
+                  [$0, ERBook::INSTALL].any? {|f| t.index(f) == 0 }
+                }
+              )
+              @nodes << node
+              @nodes_by_type[node.type] << node
+
+              # calculate occurrence number for this node
+              if node.defn['number']
+                @count ||= Hash.new {|h,k| h[k] = []}
+                node.number = (@count[node.type] << node).length
+              end
 
-                # assign node family
-                if parent = @stack.last
-                  parent.children << node
-                  node.parent = parent
-                  node.depth = parent.depth
-                  node.depth += 1 if node.defn['depth']
+              # assign node family
+              if parent = @stack.last
+                parent.children << node
+                node.parent = parent
+                node.depth = parent.depth
+                node.depth += 1 if node.defn['depth']
 
-                  # calculate latex-style index number for this node
-                  if node.defn['index']
-                    ancestry = @stack.reverse.find {|n| n.defn['index'] }.index
-                    branches = node.parent.children.select {|n| n.index }
+                # calculate latex-style index number for this node
+                if node.defn['index']
+                  ancestry = @stack.reverse.find {|n| n.defn['index'] }.index
+                  branches = node.parent.children.select {|n| n.index }
 
-                    node.index = [ancestry, branches.length + 1].join('.')
-                  end
-                else
-                  @roots << node
-                  node.parent = nil
-                  node.depth = 0
-
-                  # calculate latex-style index number for this node
-                  if node.defn['index']
-                    branches = @roots.select {|n| n.index }
-                    node.index = (branches.length + 1).to_s
-                  end
+                  node.index = [ancestry, branches.length + 1].join('.')
                 end
-
-                # assign node content
-                if block_given?
-                  @stack.push node
-                  content = content_from_block(node, &node_content)
-                  @stack.pop
-
-                  digest = Document.digest(content)
-                  self.buffer << digest
-                else
-                  content = nil
-                  digest = Document.digest(node.object_id)
+              else
+                @roots << node
+                node.parent = nil
+                node.depth = 0
+
+                # calculate latex-style index number for this node
+                if node.defn['index']
+                  branches = @roots.select {|n| n.index }
+                  node.index = (branches.length + 1).to_s
                 end
+              end
 
-                node.content = content
-                node.digest = digest
-
-                digest
+              # assign node content
+              if block_given?
+                @stack.push node
+                node.content = __block_content__(node, &node_content)
+                @stack.pop
               end
+
+              @buffer << node
+
+              nil
             end
 
             @node_defs.each_key do |type|
               # XXX: using a string because define_method()
               #      does not accept a block until Ruby 1.9
-              file, line = __FILE__, __LINE__ + 1
-              template.instance_eval %{
-                def #{type} *node_args, &node_content
-                  __node__ #{type.inspect}, *node_args, &node_content
+              file, line = __FILE__, __LINE__; eval %{
+                def sandbox.#{type} *node_args, &node_content
+                  __node_impl__ #{type.inspect}, *node_args, &node_content
                 end
-              }, file, line
+              }, binding, file, line
             end
 
           # evaluate the input & build the document tree
-            @processed_document = template.instance_eval { result binding }
+            template.render
+            @processed_document = template.buffer
 
           # chain block-level nodes together for local navigation
-            block_nodes = @nodes.reject {|n| @node_defs[n.type]['inline'] }
+            block_nodes = @nodes.reject {|n| n.defn['bypass'] ||
+                                             n.defn['inline'] }
 
             require 'enumerator'
             block_nodes.each_cons(2) do |a, b|
@@ -162,25 +160,60 @@ module ERBook
               b.prev_node = a
             end
 
-          # replace node placeholders with their corresponding output
-            expander = lambda do |n, buf|
-              # calculate node output
-              source = "#{@format_file}:nodes:#{n.type}:output"
-              n.output = Template.new(
-                source, @node_defs[n.type]['output'].to_s.chomp
+          # calculate output for all nodes
+            actual_output_by_node = {}
+
+            visitor = lambda do |n|
+              #
+              # allow child nodes to calculate their actual
+              # output and to set their identifier as Node#output
+              #
+              # we do this nodes first because this node's
+              # content contains the child nodes' output
+              #
+              n.children.each {|c| visitor.call c }
+
+              # calculate the output for this node
+              actual_output = Template.new(
+                "#{@format_file}:nodes:#{n.type}:output",
+                n.defn['output'].to_s.chomp
               ).render_with(@template_vars.merge(:@node => n))
 
-              # expand all child nodes in this node's output
-              n.children.each {|c| expander[c, n.output] }
+              # reveal child nodes' actual output in this node's actual output
+              n.children.each do |c|
+                if c.defn['inline'] && !c.defn['bypass']
+                  actual_output[c.output] = actual_output_by_node[c]
+
+                else
+                  # pull block-level node out of paragraph tag added by Maruku
+                  actual_output.sub! %r/(<p>\s*)?#{Regexp.quote c.output}/ do
+                    actual_output_by_node[c] + $1.to_s
+                  end
+                end
+              end
 
-              # replace this node's placeholder with its output in the buffer
-              buf[n.digest] = @node_defs[n.type]['silent'] ? '' : n.output
+              actual_output_by_node[n] = actual_output
+
+              #
+              # allow the parent node to calculate its actual
+              # output without interference from the output of
+              # this node (Node#to_s is aliased to Node#output)
+              #
+              # this assumes that having this node's string
+              # representation be a consecutive sequence of digits
+              # will not interfere with the text-to-whatever
+              # transformation defined by the format specification
+              #
+              n.output = Digest::SHA1.digest(n.object_id.to_s).unpack('I*').join
             end
 
-            @roots.each {|n| expander[n, @processed_document] }
+            @roots.each {|n| visitor.call n }
+
+            # replace the temporary identifier with each node's actual output
+            @nodes.each {|n| n.output = actual_output_by_node[n] }
 
         rescue Exception
-          puts input_text # so the user can debug line numbers in the stack trace
+          puts input_text # so the user can debug line numbers in stack trace
           error "Could not process input document #{input_file.inspect}"
         end
     end
@@ -190,7 +223,7 @@ module ERBook
     #
     def to_s
       Template.new("#{@format_file}:output", @format['output'].to_s).
-      render_with(@template_vars.merge(:@content => @processed_document))
+      render_with(@template_vars.merge(:@content => @processed_document.join))
     end
 
     require 'ostruct'
@@ -201,23 +234,10 @@ module ERBook
 
       # Returns the output of this node.
       def to_s
-        output
+        defn['silent'] ? '' : output
       end
     end
 
-    require 'digest/sha1'
-    ##
-    # Returns a digest of the given string that
-    # will not be altered by String#to_xhtml.
-    #
-    def Document.digest input
-      Digest::SHA1.hexdigest(input.to_s).
-
-      # XXX: surround all digits with alphabets so
-      #      Maruku doesn't change them into HTML
-      gsub(/\d/, 'z\&z')
-    end
-
     private
 
     ##