The branch, tex4htTesting, has been updated. - Log -----------------------------------------------------------------
commit 166b877a84463023605e6adf60dcd00ed9387e66 Author: Prannoy Pilligundla <[email protected]> Date: Tue May 20 21:47:06 2014 +0530 Lyxgreynotes configured in tex4ht In tex4ht-ooffice.4ht new environment configuration should start with \<ooffice begin-end env\><<< .This was one of the mistakes done in the previous commit. Others are just minor changes. diff --git a/tests/LyX-Word-roundtrip-Comments-and-Notes.odt b/tests/LyX-Word-roundtrip-Comments-and-Notes.odt new file mode 100644 index 0000000..e97e01f Binary files /dev/null and b/tests/LyX-Word-roundtrip-Comments-and-Notes.odt differ diff --git a/tests/ooffice.4ht b/tests/ooffice.4ht index e5f8078..dc96398 100644 --- a/tests/ooffice.4ht +++ b/tests/ooffice.4ht @@ -1,4 +1,4 @@ -% ooffice.4ht (2014-05-18-13:48), generated from tex4ht-ooffice.tex +% ooffice.4ht (2014-05-20-21:41), generated from tex4ht-ooffice.tex % Copyright (C) 2009-2010 TeX Users Group % Copyright (C) 2001-2009 Maarten Wisse, James Naughton, Eitan M. Gurari % [email protected], http://home.wanadoo.nl/pmwisse @@ -18,7 +18,7 @@ % is the TeX4ht Project <http://tug.org/tex4ht>. % % If you modify this program, changing the -% version identification would be appreciated.\immediate\write-1{version 2014-05-18-13:48} +% version identification would be appreciated.\immediate\write-1{version 2014-05-20-21:41} \exit:ifnot{Preamble,% algorithmicx,% @@ -572,17 +572,6 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew \Configure{TocLink}{\Link{#2}{#3}\EndLink#4\ifvmode\IgnorePar\fi} \fi \Configure{toTocLink}{\Link}{\EndLink} -\renewenvironment{lyxgreyedout}{\:tempa}{\:tempb} -%\NewConfigure{lyxgreyedout}{2} -\ConfigureOO{lyxgreyedout}{<style:style style:name="greyedoutnote" style:family="text">\Hnewline - <style:text-properties fo:color="\#808080"/>\Hnewline -</style:style>\Hnewline -} -%\Configure{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} -% {\HCode{</text:span>}\HCode{</text:p>\Hnewline}} -\ConfigureEnv{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} - {\HCode{</text:span>}\HCode{</text:p>\Hnewline}}{}{} - \Configure{halignTD} {}{} {<}{L} %{\HCode{align-left nowrap}} {-}{C} %{\HCode{align-center nowrap}} @@ -3252,6 +3241,24 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew \HCode{<text:p text:style-name="FirstCenterPar" >}} {\HCode{</text:p>}\ShowPar\par{\HCondtrue\noindent}% } +\NewConfigureOO{lyxgreyedout} +\ConfigureOO{lyxgreyedout}{% +<style:style style:name="First-line-indent" + style:family="paragraph" + style:parent-style-name="Text-body" + style:class="text">\Hnewline +<style:paragraph-properties fo:margin-left="0cm" + fo:margin-right="0cm" + fo:text-indent="0.499cm" + style:auto-text-indent="false"/> +</style:style>\Hnewline +<style:style style:name="greyedoutnote" style:family="text">\Hnewline + <style:text-properties fo:color="\#808080"/>\Hnewline +</style:style>\Hnewline +} +\ConfigureEnv{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} + {\HCode{</text:span>}\HCode{</text:p>\Hnewline}}{}{} + \HAssign\tabbing:N=0 \Configure{tabbing}[1.5]{\IgnorePar\leavevmode \gHAdvance\tabbing:N by 1 @@ -4590,6 +4597,24 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew \HCode{<text:p text:style-name="FirstCenterPar" >}} {\HCode{</text:p>}\ShowPar\par{\HCondtrue\noindent}% } +\NewConfigureOO{lyxgreyedout} +\ConfigureOO{lyxgreyedout}{% +<style:style style:name="First-line-indent" + style:family="paragraph" + style:parent-style-name="Text-body" + style:class="text">\Hnewline +<style:paragraph-properties fo:margin-left="0cm" + fo:margin-right="0cm" + fo:text-indent="0.499cm" + style:auto-text-indent="false"/> +</style:style>\Hnewline +<style:style style:name="greyedoutnote" style:family="text">\Hnewline + <style:text-properties fo:color="\#808080"/>\Hnewline +</style:style>\Hnewline +} +\ConfigureEnv{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} + {\HCode{</text:span>}\HCode{</text:p>\Hnewline}}{}{} + \HAssign\tabbing:N=0 \Configure{tabbing}[1.5]{\IgnorePar\leavevmode \gHAdvance\tabbing:N by 1 @@ -5896,6 +5921,24 @@ xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"\Hnew \HCode{<text:p text:style-name="FirstCenterPar" >}} {\HCode{</text:p>}\ShowPar\par{\HCondtrue\noindent}% } +\NewConfigureOO{lyxgreyedout} +\ConfigureOO{lyxgreyedout}{% +<style:style style:name="First-line-indent" + style:family="paragraph" + style:parent-style-name="Text-body" + style:class="text">\Hnewline +<style:paragraph-properties fo:margin-left="0cm" + fo:margin-right="0cm" + fo:text-indent="0.499cm" + style:auto-text-indent="false"/> +</style:style>\Hnewline +<style:style style:name="greyedoutnote" style:family="text">\Hnewline + <style:text-properties fo:color="\#808080"/>\Hnewline +</style:style>\Hnewline +} +\ConfigureEnv{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} + {\HCode{</text:span>}\HCode{</text:p>\Hnewline}}{}{} + \HAssign\tabbing:N=0 \Configure{tabbing}[1.5]{\IgnorePar\leavevmode \gHAdvance\tabbing:N by 1 @@ -9162,6 +9205,24 @@ Y{0178}\i{00EF}% \HCode{<text:p text:style-name="FirstCenterPar" >}} {\HCode{</text:p>}\ShowPar\par{\HCondtrue\noindent}% } +\NewConfigureOO{lyxgreyedout} +\ConfigureOO{lyxgreyedout}{% +<style:style style:name="First-line-indent" + style:family="paragraph" + style:parent-style-name="Text-body" + style:class="text">\Hnewline +<style:paragraph-properties fo:margin-left="0cm" + fo:margin-right="0cm" + fo:text-indent="0.499cm" + style:auto-text-indent="false"/> +</style:style>\Hnewline +<style:style style:name="greyedoutnote" style:family="text">\Hnewline + <style:text-properties fo:color="\#808080"/>\Hnewline +</style:style>\Hnewline +} +\ConfigureEnv{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} + {\HCode{</text:span>}\HCode{</text:p>\Hnewline}}{}{} + \HAssign\tabbing:N=0 \Configure{tabbing}[1.5]{\IgnorePar\leavevmode \gHAdvance\tabbing:N by 1 @@ -10381,6 +10442,24 @@ Y{0178}\i{00EF}% \HCode{<text:p text:style-name="FirstCenterPar" >}} {\HCode{</text:p>}\ShowPar\par{\HCondtrue\noindent}% } +\NewConfigureOO{lyxgreyedout} +\ConfigureOO{lyxgreyedout}{% +<style:style style:name="First-line-indent" + style:family="paragraph" + style:parent-style-name="Text-body" + style:class="text">\Hnewline +<style:paragraph-properties fo:margin-left="0cm" + fo:margin-right="0cm" + fo:text-indent="0.499cm" + style:auto-text-indent="false"/> +</style:style>\Hnewline +<style:style style:name="greyedoutnote" style:family="text">\Hnewline + <style:text-properties fo:color="\#808080"/>\Hnewline +</style:style>\Hnewline +} +\ConfigureEnv{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} + {\HCode{</text:span>}\HCode{</text:p>\Hnewline}}{}{} + \HAssign\tabbing:N=0 \Configure{tabbing}[1.5]{\IgnorePar\leavevmode \gHAdvance\tabbing:N by 1 @@ -11617,6 +11696,24 @@ Y{0178}\i{00EF}% \HCode{<text:p text:style-name="FirstCenterPar" >}} {\HCode{</text:p>}\ShowPar\par{\HCondtrue\noindent}% } +\NewConfigureOO{lyxgreyedout} +\ConfigureOO{lyxgreyedout}{% +<style:style style:name="First-line-indent" + style:family="paragraph" + style:parent-style-name="Text-body" + style:class="text">\Hnewline +<style:paragraph-properties fo:margin-left="0cm" + fo:margin-right="0cm" + fo:text-indent="0.499cm" + style:auto-text-indent="false"/> +</style:style>\Hnewline +<style:style style:name="greyedoutnote" style:family="text">\Hnewline + <style:text-properties fo:color="\#808080"/>\Hnewline +</style:style>\Hnewline +} +\ConfigureEnv{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} + {\HCode{</text:span>}\HCode{</text:p>\Hnewline}}{}{} + \HAssign\tabbing:N=0 \Configure{tabbing}[1.5]{\IgnorePar\leavevmode \gHAdvance\tabbing:N by 1 diff --git a/tex4ht/trunk/lit/tex4ht-ooffice.tex b/tex4ht/trunk/lit/tex4ht-ooffice.tex index 8411df6..883f9ee 100644 --- a/tex4ht/trunk/lit/tex4ht-ooffice.tex +++ b/tex4ht/trunk/lit/tex4ht-ooffice.tex @@ -5184,21 +5184,25 @@ section >>> -\<configure ooffice tex4ht\><<< -\renewenvironment{lyxgreyedout}{\:tempa}{\:tempb} -%\NewConfigure{lyxgreyedout}{2} -\ConfigureOO{lyxgreyedout}{|<oo lyxgreyedout style|>} -%\Configure{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} -% {\HCode{</text:span>}\HCode{</text:p>\Hnewline}} -\ConfigureEnv{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} - {\HCode{</text:span>}\HCode{</text:p>\Hnewline}}{}{} - ->>> - -\<oo lyxgreyedout style\><<< +\<ooffice begin-end env\><<< +\NewConfigureOO{lyxgreyedout} +\ConfigureOO{lyxgreyedout}{% +<style:style style:name="First-line-indent" + style:family="paragraph" + style:parent-style-name="Text-body" + style:class="text">\Hnewline +<style:paragraph-properties fo:margin-left="0cm" + fo:margin-right="0cm" + fo:text-indent="0.499cm" + style:auto-text-indent="false"/> +</style:style>\Hnewline <style:style style:name="greyedoutnote" style:family="text">\Hnewline <style:text-properties fo:color="\#808080"/>\Hnewline </style:style>\Hnewline +} +\ConfigureEnv{lyxgreyedout}{\HCode{<text:p text:style-name="First-line-indent">}\HCode{<text:span text:style-name="greyedoutnote">}} + {\HCode{</text:span>}\HCode{</text:p>\Hnewline}}{}{} + >>> ----------------------------------------------------------------------- Summary of changes: tests/LyX-Word-roundtrip-Comments-and-Notes.odt | Bin 0 -> 7474 bytes tests/ooffice.4ht | 123 ++++++++++++++++++++--- tex4ht/trunk/lit/tex4ht-ooffice.tex | 28 +++-- 3 files changed, 126 insertions(+), 25 deletions(-) create mode 100644 tests/LyX-Word-roundtrip-Comments-and-Notes.odt hooks/post-receive -- Repositories for GSOC work
