Browse Source

заготовка для таблиц

kpmy 10 years ago
parent
commit
950935b278
2 changed files with 28 additions and 4 deletions
  1. 25 2
      odf_test.go
  2. 3 2
      xmlns/x.go

+ 25 - 2
odf_test.go

@@ -54,7 +54,7 @@ func TestStructure(t *testing.T) {
 	assert.For(output.Close() == nil, 20)
 	assert.For(output.Close() == nil, 20)
 }
 }
 
 
-func TestStyles(t *testing.T) {
+func TestStylesMechanism(t *testing.T) {
 	output, _ := os.OpenFile("test2.odf", os.O_CREATE|os.O_WRONLY, 0666)
 	output, _ := os.OpenFile("test2.odf", os.O_CREATE|os.O_WRONLY, 0666)
 	m := model.ModelFactory()
 	m := model.ModelFactory()
 	fm := &mappers.Formatter{}
 	fm := &mappers.Formatter{}
@@ -70,7 +70,7 @@ func TestStyles(t *testing.T) {
 	fm.WriteString(`Hello, World!`)
 	fm.WriteString(`Hello, World!`)
 	fm.SetAttr(new(attr.TextAttributes).Size(36).FontFace("Courier New"))
 	fm.SetAttr(new(attr.TextAttributes).Size(36).FontFace("Courier New"))
 	fm.WriteString(`Hello, World!`)
 	fm.WriteString(`Hello, World!`)
-	fm.SetAttr(new(attr.TextAttributes).Size(32).FontFace("Arial"))
+	fm.SetAttr(new(attr.TextAttributes).Size(32).FontFace("Arial")) //test attribute cache
 	fm.WriteString(`Hello, World!`)
 	fm.WriteString(`Hello, World!`)
 	fm.SetAttr(new(attr.ParagraphAttributes).AlignRight().PageBreak())
 	fm.SetAttr(new(attr.ParagraphAttributes).AlignRight().PageBreak())
 	fm.WritePara(`Page break!`)
 	fm.WritePara(`Page break!`)
@@ -79,3 +79,26 @@ func TestStyles(t *testing.T) {
 	generators.Generate(m, output, fm.MimeType)
 	generators.Generate(m, output, fm.MimeType)
 	assert.For(output.Close() == nil, 20)
 	assert.For(output.Close() == nil, 20)
 }
 }
+
+func TestTables(t *testing.T) {
+	{
+		output, _ := os.OpenFile("test3.odf", os.O_CREATE|os.O_WRONLY, 0666)
+		m := model.ModelFactory()
+		fm := &mappers.Formatter{}
+		fm.ConnectTo(m)
+		fm.MimeType = xmlns.MimeText
+		fm.Init()
+		generators.Generate(m, output, fm.MimeType)
+		assert.For(output.Close() == nil, 20)
+	}
+	{
+		output, _ := os.OpenFile("test4.odf", os.O_CREATE|os.O_WRONLY, 0666)
+		m := model.ModelFactory()
+		fm := &mappers.Formatter{}
+		fm.ConnectTo(m)
+		fm.MimeType = xmlns.MimeSpreadsheet
+		fm.Init()
+		generators.Generate(m, output, fm.MimeType)
+		assert.For(output.Close() == nil, 20)
+	}
+}

+ 3 - 2
xmlns/x.go

@@ -49,8 +49,9 @@ const (
 type Mime string
 type Mime string
 
 
 const (
 const (
-	MimeDefault      = "text/xml"
-	MimeText    Mime = "application/vnd.oasis.opendocument.text"
+	MimeDefault          = "text/xml"
+	MimeText        Mime = "application/vnd.oasis.opendocument.text"
+	MimeSpreadsheet Mime = "application/vnd.oasis.opendocument.spreadsheet"
 )
 )
 
 
 var Typed map[model.AttrName]AttrType
 var Typed map[model.AttrName]AttrType