Skip to content

Commit f6a1d8a

Browse files
More progress with table of content rendering.
1 parent c3cd692 commit f6a1d8a

File tree

3 files changed

+5
-13
lines changed

3 files changed

+5
-13
lines changed

Diff for: src/main/scala/epub/css/Css.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ object Css {
55
implicit def strToCssSelector(str: String) = Selector(str)
66
implicit def strToRule(str: String) = RuleBuilder(str)
77

8-
case class Rule (val property: String, val value: String) {
8+
case class Rule (property: String, value: String) {
99
override def toString = "\t" + property + ": " + value + ";\n"
1010
}
1111

12-
case class RuleSet (val selector: Selector,
13-
val rules: List[Rule]) {
12+
case class RuleSet (selector: Selector,
13+
rules: List[Rule]) {
1414
override def toString = selector + " {\n" + rules.mkString + "}\n"
1515
}
1616

17-
case class Selector (val selector: String) {
17+
case class Selector (selector: String) {
1818

1919
def #>(rules: Rule*) = RuleSet(this, rules.toList)
2020

Diff for: src/main/scala/epub/dcmi/Metadata.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object Metadata {
1414
def publisher(publisher: String) = Publisher(publisher)
1515
def rights(license: String) = Rights(license)
1616

17-
class Metadata (items: Map[String, MetadataEntry]) extends PartialFunction[String, MetadataEntry] {
17+
class Metadata (val items: Map[String, MetadataEntry]) extends PartialFunction[String, MetadataEntry] {
1818
def toXML = {
1919
<metadata xmlns:dc="http://purl.org/dc/elements/1.1/"
2020
xmlns:dcterms="http://purl.org/dc/terms/"

Diff for: src/main/scala/epub/toc/TableOfContents.scala

-8
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
package epub.toc
22

3-
class TOCEntry private [epub] (val label: String,
4-
val ref: String,
5-
val children: List[TOCEntry]) {
6-
7-
def depth: Int = if (children.isEmpty) 1
8-
else 1 + children.map(_.depth).max
9-
}
10-
113
class TableOfContents private (val entries: List[TOCEntry]) {
124
def depth = entries.map(_.depth).max
135
}

0 commit comments

Comments
 (0)