This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 012afb75dd Fixed typos, cleanup
012afb75dd is described below
commit 012afb75dd147ddb222efaa0494e5204806b9126
Author: mseidel <msei...@apache.org>
AuthorDate: Fri Mar 14 15:31:34 2025 +0100
Fixed typos, cleanup
(cherry picked from commit a0a2117d6651d688b1b93e742e3b93bcd19bbcdf)
---
.../source/xslt/common/measure_conversion.xsl | 12 +--
.../source/xslt/export/uof/odf2uof_spreadsheet.xsl | 34 ++++---
.../filter/source/xslt/export/uof/odf2uof_text.xsl | 22 +++--
.../xslt/import/uof/uof2odf_presentation.xsl | 18 ++--
.../source/xslt/import/uof/uof2odf_spreadsheet.xsl | 4 +-
.../filter/source/xslt/import/uof/uof2odf_text.xsl | 107 +++++++++++----------
6 files changed, 104 insertions(+), 93 deletions(-)
diff --git a/main/filter/source/xslt/common/measure_conversion.xsl
b/main/filter/source/xslt/common/measure_conversion.xsl
index 1b616b03c1..743910a7db 100644
--- a/main/filter/source/xslt/common/measure_conversion.xsl
+++ b/main/filter/source/xslt/common/measure_conversion.xsl
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,19 +9,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
-
<!--
For further documentation and updates visit
http://xml.openoffice.org/odf2xhtml
-->
@@ -60,7 +60,7 @@
MEASURE LIST:
- * 1 milimeter (mm), the basic measure
+ * 1 millimeter (mm), the basic measure
* 1 centimeter (cm) = 10 mm
diff --git a/main/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
b/main/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
index 43565fd6ec..9b13180d26 100644
--- a/main/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
+++ b/main/filter/source/xslt/export/uof/odf2uof_spreadsheet.xsl
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,17 +9,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:uof="http://schemas.uof.org/cn/2003/uof";
xmlns:表="http://schemas.uof.org/cn/2003/uof-spreadsheet";
xmlns:演="http://schemas.uof.org/cn/2003/uof-slideshow";
xmlns:字="http://schemas.uof.org/cn/2003/uof-wordproc";
xmlns:图="http://schemas.uof.org/cn/2003/graph"; xmlns:office="urn:oasis:names
[...]
<xsl:output method="xml" indent="no" encoding="UTF-8" version="1.0"/>
<xsl:variable name="scValueWithUnit">
@@ -235,7 +237,7 @@
<xsl:if
test="/office:document/office:body/office:spreadsheet/table:database-ranges/table:database-range">
<表:区域公式集 uof:locID="s0122">
<表:区域公式
uof:locID="s0123" uof:attrList="类型">
- <xsl:attribute
name="表:类型">table</xsl:attribute>
+ <xsl:attribute
name="表:类型">table</xsl:attribute>
<xsl:for-each
select="/office:document/office:body/office:spreadsheet/table:database-ranges/table:database-range">
<表:区域
uof:locID="s0007">
<xsl:value-of select="@table:target-range-address"/>
@@ -473,7 +475,7 @@
<xsl:attribute name="uof:attrList">最大行 最大列 缺省行高
缺省列宽</xsl:attribute>
<xsl:variable name="group-column"
select="./table:table-column-group"/>
<xsl:variable name="group-row"
select="./table:table-row-group"/>
- <xsl:apply-templates select="@table:style-name"/>
+ <xsl:apply-templates select="@table:style-name"/>
<xsl:for-each select="table:table-column">
<表:列 uof:locID="s0048" uof:attrList="列号 隐藏 列宽
式样引用 跨度">
<xsl:attribute
name="表:列号"><xsl:value-of select="position()"/></xsl:attribute>
@@ -1115,7 +1117,7 @@
<字:句 uof:locID="t0085">
<xsl:element name="字:文本串">
<xsl:attribute
name="locID">t0109</xsl:attribute>
-
+
<xsl:value-of select="." />
</xsl:element>
</字:句>
@@ -1166,7 +1168,7 @@
MEASURE LIST:
- * 1 milimeter (mm), the basic measure
+ * 1 millimeter (mm), the basic measure
* 1 centimeter (cm) = 10 mm
@@ -4057,7 +4059,7 @@
<xsl:attribute
name="uof:locID">s0114</xsl:attribute>
<xsl:if test="$styleProperties/@fo:margin-left">
<xsl:attribute
name="表:缩进"><xsl:variable name="margin"><xsl:call-template
name="convert2pt"><xsl:with-param name="value"
select="$styleProperties/@fo:margin-left"/><xsl:with-param
name="rounding-factor"
select="1"/></xsl:call-template></xsl:variable><xsl:value-of
select="number($margin) div 10"/></xsl:attribute>
- </xsl:if>
+ </xsl:if>
<xsl:element name="表:水平对齐方式">
<xsl:attribute
name="uof:locID">s0115</xsl:attribute>
<xsl:choose>
@@ -4521,7 +4523,7 @@
</xsl:template>
<!--chengxz 0621 E-->
<!--xsl:template name="image">
-
+
<xsl:element name="图:图形">
<xsl:attribute name="图:标识符"><xsl:value-of
select="@draw:name"/></xsl:attribute>
<xsl:attribute
name="uof:locID">g0000</xsl:attribute>
@@ -4598,7 +4600,7 @@
<xsl:when test="../child::*[$pos]">
<xsl:for-each select="../child::*[$pos]">
<xsl:variable name="nodepos">
- <!--add by lvxg -->
+ <!--add by lvxg -->
<xsl:choose>
<xsl:when
test="./@draw:style-name">
<xsl:value-of
select="@draw:style-name"/>
@@ -4725,8 +4727,8 @@
<xsl:if test="./@draw:points or
./@svg:d">
<图:关键点坐标
uof:locID="g0009" uofattrList="路径">
<!--xsl:call-template name="draw:points">
- <xsl:with-param name="point" select="./@draw:points"/>
- </xsl:call-template-->
+ <xsl:with-param name="point"
select="./@draw:points"/>
+ </xsl:call-template-->
<xsl:attribute
name="图:路径"><xsl:choose><xsl:when test="@svg:d"><xsl:value-of
select="@svg:d"/></xsl:when><xsl:when test="@draw:points"><xsl:call-template
name="draw:points"><xsl:with-param name="point"
select="@draw:points"/><xsl:with-param
name="lujing"/></xsl:call-template></xsl:when></xsl:choose></xsl:attribute>
</图:关键点坐标>
</xsl:if>
@@ -5490,7 +5492,7 @@
<xsl:attribute
name="uof:attrList">类型</xsl:attribute>
<xsl:element
name="表:操作条件">
<xsl:attribute
name="uof:locID">s0106</xsl:attribute>
- <!--redoffice
comment from lvxg 8.27-->
+ <!--redoffice
comment from lvxg 8.27-->
<xsl:if
test="$first-condition/@table:operator">
<xsl:element name="表:操作码">
<xsl:attribute name="uof:locID">s0009</xsl:attribute>
@@ -5650,7 +5652,7 @@
<xsl:value-of select="$hex-value"/>
</xsl:otherwise>
</xsl:choose>
- </xsl:template>
+ </xsl:template>
<xsl:template name="hex2decimal">
<xsl:param name="hex-number"/>
<xsl:param name="index"/>
@@ -5787,7 +5789,7 @@
<xsl:element name="表:数据有效性集">
<xsl:attribute name="uof:locID">s0005</xsl:attribute>
<xsl:call-template name="create-validation-set">
- </xsl:call-template>
+ </xsl:call-template>
</xsl:element>
</xsl:template>
<xsl:template name="create-validation-set">
diff --git a/main/filter/source/xslt/export/uof/odf2uof_text.xsl
b/main/filter/source/xslt/export/uof/odf2uof_text.xsl
index e2666de8f0..8e3a8c36f2 100644
--- a/main/filter/source/xslt/export/uof/odf2uof_text.xsl
+++ b/main/filter/source/xslt/export/uof/odf2uof_text.xsl
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,17 +9,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
xmlns:uof="http://schemas.uof.org/cn/2003/uof";
xmlns:表="http://schemas.uof.org/cn/2003/uof-spreadsheet";
xmlns:演="http://schemas.uof.org/cn/2003/uof-slideshow";
xmlns:字="http://schemas.uof.org/cn/2003/uof-wordproc";
xmlns:图="http://schemas.uof.org/cn/2003/graph"; xmlns:office="urn:oasis:names
[...]
<xsl:output method="xml" indent="no" encoding="UTF-8" version="1.0"/>
<!--xsl:key name="colWidth" match="/office:automatic/style:style/"
use="@style:column-width"/-->
@@ -315,7 +317,7 @@
<xsl:with-param name="picnumber" select="$picnumber"/>
</xsl:call-template>
</xsl:template>
- <!--xsl:key
match="/office:document/office:automatic-styles/style:style" name="graphicset"
use="@style:name"/>
+ <!--xsl:key
match="/office:document/office:automatic-styles/style:style" name="graphicset"
use="@style:name"/>
<xsl:template match="style:style[@style:family = 'graphics']">
<xsl:variable name="pic-name">
@@ -328,7 +330,7 @@
<xsl:with-param name="pic-name" select="$pic-name"/>
<xsl:with-param name="pic-num" select="$pic-num"/>
<xsl:with-param name="current-num" select="1"/>
- </xsl:call-template>
+ </xsl:call-template>
</xsl:template-->
<xsl:template name="pic-process">
<xsl:param name="pic-name"/>
@@ -372,7 +374,7 @@
<xsl:when
test="$nodename='draw:polygon'">Freeform</xsl:when>
<xsl:when
test="$nodename='draw:polyline'">Scribble</xsl:when>
<xsl:when
test="$nodename='draw:ellipse'">Oval</xsl:when>
- <xsl:when
test="$nodename='draw:frame' and
child::draw:text-box[@fo:min-height]">排版框</xsl:when>
+ <xsl:when
test="$nodename='draw:frame' and
child::draw:text-box[@fo:min-height]">排版框</xsl:when>
<xsl:when
test="$nodename='draw:frame' and child::draw:text-box">排版框</xsl:when>
</xsl:choose>
</图:名称>
@@ -970,7 +972,7 @@
</xsl:if>
<xsl:if
test="@text:bullet-char">
<xsl:element name="字:项目符号">
-
<xsl:attribute name="uof:locID">t0171</xsl:attribute>
+
<xsl:attribute name="uof:locID">t0171</xsl:attribute>
<xsl:value-of select="@text:bullet-char"/>
</xsl:element>
</xsl:if>
@@ -2427,7 +2429,7 @@
<xsl:attribute
name="uof:locID">t0124</xsl:attribute>
</xsl:element>
</xsl:when>
- <xsl:when
test="name(.)='text:bookmark-start' or name(.)='text:bookmark-end' or
name(.)='draw:image' or name(.)='office:binary-data'">
+ <xsl:when
test="name(.)='text:bookmark-start' or name(.)='text:bookmark-end' or
name(.)='draw:image' or name(.)='office:binary-data'">
</xsl:when>
<xsl:otherwise>
<xsl:element name="字:文本串">
@@ -4380,7 +4382,7 @@
MEASURE LIST:
- * 1 milimeter (mm), the basic measure
+ * 1 millimeter (mm), the basic measure
* 1 centimeter (cm) = 10 mm
diff --git a/main/filter/source/xslt/import/uof/uof2odf_presentation.xsl
b/main/filter/source/xslt/import/uof/uof2odf_presentation.xsl
index 8b3bd37d9f..d5612929a3 100644
--- a/main/filter/source/xslt/import/uof/uof2odf_presentation.xsl
+++ b/main/filter/source/xslt/import/uof/uof2odf_presentation.xsl
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,17 +9,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
xmlns:fo="http://www.w3.org/1999/XSL/Format";
xmlns:uof="http://schemas.uof.org/cn/2003/uof";
xmlns:表="http://schemas.uof.org/cn/2003/uof-spreadsheet";
xmlns:演="http://schemas.uof.org/cn/2003/uof-slideshow";
xmlns:字="http://schemas.uof.org/cn/2003/uof-wordproc";
xmlns:图="http://schemas.uof.org/cn/2003/graph";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:off [...]
<xsl:output method="xml" indent="no" encoding="UTF-8" version="1.0"/>
<xsl:template match="uof:UOF">
@@ -1345,7 +1347,7 @@
<xsl:attribute name="smil:end">next</xsl:attribute>
</xsl:when>
<xsl:when test="演:定时/@演:重复='until next slide' ">
-
<xsl:attribute name="smil:repeatCount
">indefinite</xsl:attribute>
+
<xsl:attribute
name="smil:repeatCount">indefinite</xsl:attribute>
</xsl:when>
<xsl:when test="演:定时/@演:重复 !='none'">
<xsl:attribute name="smil:repeatCount"><xsl:value-of
select="演:定时/@演:重复"/></xsl:attribute>
@@ -2054,7 +2056,7 @@
</xsl:if>
<xsl:if
test="/uof:UOF/uof:对象集/uof:其他对象[@uof:标识符=$tuxing1]/uof:路径">
<xsl:attribute
name="xlink:href"><xsl:value-of
select="/uof:UOF/uof:对象集/uof:其他对象[@uof:标识符=$tuxing1]/uof:路径"/></xsl:attribute>
- </xsl:if>
+ </xsl:if>
<xsl:if
test="/uof:UOF/uof:对象集/uof:其他对象[@uof:标识符=$tuxing1]/uof:数据">
<office:binary-data>
<xsl:value-of select="/uof:UOF/uof:对象集/uof:其他对象[@uof:标识符=$tuxing1]/uof:数据"/>
@@ -2749,7 +2751,7 @@
<xsl:choose>
<xsl:when test="@字:字下划线 = 'true'">
<xsl:attribute
name="style:text-underline">single</xsl:attribute>
- <xsl:attribute name="
style:text-underline-color">font-color</xsl:attribute>
+ <xsl:attribute
name="style:text-underline-color">font-color</xsl:attribute>
<xsl:attribute
name="fo:score-spaces">false</xsl:attribute>
</xsl:when>
<xsl:when test="@字:类型 = 'thick'">
@@ -3082,7 +3084,7 @@
MEASURE LIST:
- * 1 milimeter (mm), the basic measure
+ * 1 millimeter (mm), the basic measure
* 1 centimeter (cm) = 10 mm
diff --git a/main/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
b/main/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
index 71be338753..0973c5004f 100644
--- a/main/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
+++ b/main/filter/source/xslt/import/uof/uof2odf_spreadsheet.xsl
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--***********************************************************
*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,6 +20,7 @@
* under the License.
*
***********************************************************-->
+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
xmlns:fo="http://www.w3.org/1999/XSL/Format";
xmlns:uof="http://schemas.uof.org/cn/2003/uof";
xmlns:表="http://schemas.uof.org/cn/2003/uof-spreadsheet";
xmlns:演="http://schemas.uof.org/cn/2003/uof-slideshow";
xmlns:字="http://schemas.uof.org/cn/2003/uof-wordproc";
xmlns:图="http://schemas.uof.org/cn/2003/graph";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:off [...]
<xsl:output method="xml" indent="no" encoding="UTF-8" version="1.0"/>
<xsl:template match="uof:UOF">
@@ -6112,7 +6114,7 @@
MEASURE LIST:
- * 1 milimeter (mm), the basic measure
+ * 1 millimeter (mm), the basic measure
* 1 centimeter (cm) = 10 mm
diff --git a/main/filter/source/xslt/import/uof/uof2odf_text.xsl
b/main/filter/source/xslt/import/uof/uof2odf_text.xsl
index 53eb6d8356..50401a326d 100644
--- a/main/filter/source/xslt/import/uof/uof2odf_text.xsl
+++ b/main/filter/source/xslt/import/uof/uof2odf_text.xsl
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
+
<!--***********************************************************
- *
+ *
+
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,17 +10,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
+
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:dt="uuid:C2F41010-65B3-11d1-A29F-00AA00C14882"
xmlns:fo="http://www.w3.org/1999/XSL/Format";
xmlns:uof="http://schemas.uof.org/cn/2003/uof";
xmlns:表="http://schemas.uof.org/cn/2003/uof-spreadsheet";
xmlns:演="http://schemas.uof.org/cn/2003/uof-slideshow";
xmlns:字="http://schemas.uof.org/cn/2003/uof-wordproc";
xmlns:图="http://schemas.uof.org/cn/2003/graph";
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:off [...]
<xsl:template match="uof:UOF">
<office:document
xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
xmlns:xlink="http://www.w3.org/1999/xlink";
xmlns:html="http://www.w3.org/TR/REC-html40";
xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0 [...]
@@ -92,8 +95,8 @@
</xsl:for-each>
</xsl:if>
<meta:document-statistic>
- <xsl:attribute name="meta:page-count">
- <xsl:choose>
+ <xsl:attribute name="meta:page-count">
+ <xsl:choose>
<xsl:when
test="child::*[@uof:locID='u0020']"><xsl:value-of select="uof:页数"/></xsl:when>
<xsl:otherwise>
<xsl:for-each
select="/uof:UOF/uof:文字处理/字:主体/字:段落/字:域开始[@字:类型='numpages']">
@@ -111,19 +114,19 @@
<xsl:when test="$content='II' or $content='ii' or $content='B' or
$content='b'">2</xsl:when>
</xsl:choose>
</xsl:if>
- </xsl:for-each>
+ </xsl:for-each>
</xsl:otherwise>
</xsl:choose>
- </xsl:attribute>
- <xsl:attribute name="meta:paragraph-count"><xsl:if
test="child::*[@uof:locID='u0025']"><xsl:value-of
select="uof:段落数"/></xsl:if></xsl:attribute>
- <xsl:attribute name="meta:word-count"><xsl:if
test="child::*[@uof:locID='u0023']"><xsl:value-of
select="uof:中文字符数"/></xsl:if></xsl:attribute>
- <xsl:attribute name="meta:object-count"><xsl:if
test="child::*[@uof:locID='u0026']"><xsl:value-of
select="uof:对象数"/></xsl:if></xsl:attribute>
- <xsl:attribute name="meta:character-count">
- <xsl:for-each
select="/uof:UOF/uof:文字处理/字:主体/字:段落/字:域开始[@字:类型='numchars']">
- <xsl:value-of
select="following-sibling::字:句/字:文本串"/>
- </xsl:for-each>
- <xsl:if
test="child::*[@uof:locID='u0021']"><xsl:value-of select="uof:字数"/></xsl:if>
- </xsl:attribute>
+ </xsl:attribute>
+ <xsl:attribute
name="meta:paragraph-count"><xsl:if
test="child::*[@uof:locID='u0025']"><xsl:value-of
select="uof:段落数"/></xsl:if></xsl:attribute>
+ <xsl:attribute name="meta:word-count"><xsl:if
test="child::*[@uof:locID='u0023']"><xsl:value-of
select="uof:中文字符数"/></xsl:if></xsl:attribute>
+ <xsl:attribute name="meta:object-count"><xsl:if
test="child::*[@uof:locID='u0026']"><xsl:value-of
select="uof:对象数"/></xsl:if></xsl:attribute>
+ <xsl:attribute name="meta:character-count">
+ <xsl:for-each
select="/uof:UOF/uof:文字处理/字:主体/字:段落/字:域开始[@字:类型='numchars']">
+ <xsl:value-of
select="following-sibling::字:句/字:文本串"/>
+ </xsl:for-each>
+ <xsl:if
test="child::*[@uof:locID='u0021']"><xsl:value-of select="uof:字数"/></xsl:if>
+ </xsl:attribute>
</meta:document-statistic>
<meta:document-statistic/>
</xsl:element>
@@ -192,11 +195,11 @@
<xsl:attribute
name="style:display-name"><xsl:value-of select="@字:别名"/></xsl:attribute>
</xsl:if>
<xsl:element
name="style:paragraph-properties">
- <xsl:call-template name="XDParagraphAttr"/>
+ <xsl:call-template
name="XDParagraphAttr"/>
<xsl:apply-templates
select="*[not(name()='字:大纲级别')]"/>
- <xsl:if test="字:制表位设置">
- <xsl:call-template name="ootab"/>
- </xsl:if>
+ <xsl:if test="字:制表位设置">
+ <xsl:call-template
name="ootab"/>
+ </xsl:if>
</xsl:element>
<xsl:element
name="style:text-properties">
<xsl:apply-templates
select="字:句属性/*"/>
@@ -1198,7 +1201,7 @@
<xsl:attribute
name="style:family">graphic</xsl:attribute>
<xsl:if test="图:文本内容/@图:自动换行='true' or
图:文本内容/@图:自动换行='1'">
<xsl:attribute
name="draw:fit-to-contour">true</xsl:attribute>
- </xsl:if>
+ </xsl:if>
<xsl:element
name="style:graphic-properties">
<xsl:call-template
name="process-graphics">
<xsl:with-param
name="draw-name" select="$draw-name"/>
@@ -1478,7 +1481,7 @@
</xsl:if>
<xsl:if test="图:预定义图形/图:名称">
<xsl:choose>
- <xsl:when test="图:预定义图形/图:名称='椭圆'">
+ <xsl:when test="图:预定义图形/图:名称='椭圆'">
</xsl:when>
</xsl:choose>
</xsl:if>
@@ -1548,13 +1551,13 @@
<xsl:attribute
name="draw:marker-end-width"><xsl:choose><xsl:when
test="图:预定义图形/图:属性/图:后端箭头/图:大小 = '1'"><xsl:value-of
select="concat('0.05',$uofUnit)"/></xsl:when><xsl:when
test="图:预定义图形/图:属性/图:后端箭头/图:大小 = '2'"><xsl:value-of
select="concat('0.10',$uofUnit)"/></xsl:when><xsl:when
test="图:预定义图形/图:属性/图:后端箭头/图:大小 = '3'"><xsl:value-of
select="concat('0.15',$uofUnit)"/></xsl:when><xsl:when
test="图:预定义图形/图:属性/图:后端箭头/图:大小 = '4'"><xsl:value-of
select="concat('0.20',$uofUnit)"/></xsl:when><xsl [...]
</xsl:if>
</xsl:if>
- <xsl:if test="图:预定义图形/图:属性/图:宽度">
+ <xsl:if test="图:预定义图形/图:属性/图:宽度">
</xsl:if>
- <xsl:if test="图:预定义图形/图:属性/图:高度">
+ <xsl:if test="图:预定义图形/图:属性/图:高度">
</xsl:if>
- <xsl:if test="图:预定义图形/图:属性/图:旋转角度">
+ <xsl:if test="图:预定义图形/图:属性/图:旋转角度">
</xsl:if>
- <xsl:if test="图:预定义图形/图:属性/图:锁定纵横比">
+ <xsl:if test="图:预定义图形/图:属性/图:锁定纵横比">
</xsl:if>
<xsl:if test="图:预定义图形/图:属性/图:打印对象">
</xsl:if>
@@ -1667,7 +1670,7 @@
<xsl:variable name="bshi">
<xsl:value-of
select="/uof:UOF/uof:对象集/图:图形/@图:其他对象"/>
</xsl:variable>
- <xsl:if
test="/uof:UOF/uof:对象集/uof:其他对象[@uof:标识符=$bshi]/@uof:公共类型='jpg'">
+ <xsl:if
test="/uof:UOF/uof:对象集/uof:其他对象[@uof:标识符=$bshi]/@uof:公共类型='jpg'">
<xsl:element name="draw:frame">
<xsl:attribute
name="draw:name"><xsl:variable name="pos"><xsl:value-of
select="count(preceding::字:锚点)"/></xsl:variable><xsl:value-of
select="concat('图形',$pos)"/></xsl:attribute>
<xsl:if
test="字:锚点属性/字:位置/字:水平/字:绝对">
@@ -1734,7 +1737,7 @@
<xsl:attribute
name="svg:y"><xsl:value-of
select="concat(字:锚点属性/字:位置/字:垂直/字:绝对/@字:值,$uofUnit)"/></xsl:attribute>
</xsl:if>
<xsl:attribute name="draw:z-index">
- <xsl:for-each
select="/uof:UOF/uof:对象集/图:图形[@图:标识符 = $tuxing1]"><xsl:value-of
select="@图:层次"/></xsl:for-each>
+ <xsl:for-each
select="/uof:UOF/uof:对象集/图:图形[@图:标识符 = $tuxing1]"><xsl:value-of
select="@图:层次"/></xsl:for-each>
</xsl:attribute>
<draw:text-box>
<xsl:apply-templates
select="/uof:UOF/uof:对象集/图:图形[@图:标识符=$tuxing1]/图:文本内容/字:段落"/>
@@ -2112,7 +2115,7 @@
<xsl:attribute
name="text:fixed">true</xsl:attribute>
<xsl:value-of select="$datestr"/>
</xsl:element>
- </xsl:when>
+ </xsl:when>
<xsl:when test="@字:类型='date'">
<xsl:variable name="datestr"
select="../字:句[preceding-sibling::字:域代码]/字:文本串"/>
<xsl:element name="text:date">
@@ -2533,7 +2536,7 @@
</xsl:when>
<xsl:when test="@字:类型='circle below' ">
<xsl:attribute
name="style:text-emphasize">circle below</xsl:attribute>
- </xsl:when>
+ </xsl:when>
<xsl:otherwise>none</xsl:otherwise>
</xsl:choose>
</xsl:if>
@@ -2846,7 +2849,7 @@
<xsl:apply-templates/>
</xsl:template>
<xsl:template match="字:对齐[parent::字:文字表属性]">
-
+
</xsl:template>
<xsl:template match="uof:上">
<xsl:choose>
@@ -3001,10 +3004,10 @@
<xsl:attribute
name="style:justify-single-word">false</xsl:attribute>
</xsl:if>
</xsl:if>
-
<xsl:call-template name="ParagraphAttr"/>
- <xsl:if test="字:段落属性/字:制表位设置">
- <xsl:call-template
name="ootab"/>
- </xsl:if>
+
<xsl:call-template name="ParagraphAttr"/>
+
<xsl:if test="字:段落属性/字:制表位设置">
+
<xsl:call-template name="ootab"/>
+
</xsl:if>
</xsl:element>
<xsl:if test="字:句属性">
<xsl:variable name="bsh">
@@ -3051,10 +3054,10 @@
</xsl:for-each>
</xsl:if>
<xsl:apply-templates select="字:句/字:句属性/字:浮雕 |
字:句/字:句属性/字:边框 | 字:句/字:句属性/字:缩放 | 字:句/字:句属性/字:阴影 | 字:句/字:句属性/字:删除线 |
字:句/字:句属性/字:下划线 | 字:句/字:填充"/>
- <xsl:call-template name="ParagraphAttr"/>
- <xsl:if test="字:段落属性/字:制表位设置">
- <xsl:call-template name="ootab"/>
- </xsl:if>
+ <xsl:call-template name="ParagraphAttr"/>
+ <xsl:if test="字:段落属性/字:制表位设置">
+ <xsl:call-template name="ootab"/>
+ </xsl:if>
<xsl:for-each
select="/uof:UOF/uof:式样集/uof:句式样[@字:标识符=$stylename]">
<xsl:apply-templates select="./*"/>
</xsl:for-each>
@@ -3066,10 +3069,10 @@
<xsl:if test="字:句/字:分页符">
<xsl:attribute
name="fo:break-before">page</xsl:attribute>
</xsl:if>
- <xsl:call-template name="ParagraphAttr"/>
- <xsl:if test="字:段落属性/字:制表位设置">
- <xsl:call-template name="ootab"/>
- </xsl:if>
+ <xsl:call-template name="ParagraphAttr"/>
+ <xsl:if test="字:段落属性/字:制表位设置">
+ <xsl:call-template name="ootab"/>
+ </xsl:if>
</style:paragraph-properties>
</xsl:element>
</xsl:template>
@@ -3639,7 +3642,7 @@
MEASURE LIST:
- * 1 milimeter (mm), the basic measure
+ * 1 millimeter (mm), the basic measure
* 1 centimeter (cm) = 10 mm
@@ -3880,7 +3883,7 @@
</xsl:if>
</xsl:when>
<xsl:otherwise>
-
+
<xsl:choose>
<xsl:when test="substring($str1,1,4)='yyyy'">
<xsl:variable name="str1-before"
select="substring($str1,1,4)"/>
@@ -4512,7 +4515,7 @@
<xsl:template name="GenerateTrackChanges">
<text:tracked-changes>
<xsl:if test="/uof:UOF/uof:文字处理/字:公用处理规则/字:文档设置/字:修订">
- <xsl:attribute
name="text:track-changes"><xsl:value-of
select="/uof:UOF/uof:文字处理/字:公用处理规则/字:文档设置/字:修订/@字:值"/></xsl:attribute>
+ <xsl:attribute
name="text:track-changes"><xsl:value-of
select="/uof:UOF/uof:文字处理/字:公用处理规则/字:文档设置/字:修订/@字:值"/></xsl:attribute>
</xsl:if>
<xsl:if test="//字:段落/字:修订开始[@字:类型='insert']">
<xsl:for-each
select="//字:段落/字:修订开始[@字:类型='insert']">
@@ -4616,7 +4619,7 @@
</office:change-info>
</text:format-change>
</xsl:when>
-
<xsl:otherwise>
+
<xsl:otherwise>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
@@ -4624,9 +4627,9 @@
</text:changed-region>
</xsl:for-each>
</xsl:if>
-
+
</text:tracked-changes>
-
+
</xsl:template>
<xsl:template name="oo数字格式">
<xsl:param name="oo_format"/>
@@ -4659,9 +4662,9 @@
<xsl:otherwise>1</xsl:otherwise>
</xsl:choose>
</xsl:variable>
-
+
<xsl:element name="text:chapter">
- <xsl:attribute
name="text:display">name</xsl:attribute>
+ <xsl:attribute
name="text:display">name</xsl:attribute>
<xsl:attribute
name="text:outline-level"><xsl:value-of select="$fmt"/></xsl:attribute>
<xsl:value-of
select="following-sibling::字:句/字:文本串"/>
</xsl:element>
