Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Part 2: Editorial Fixes ODF 1.3 CS02 #23

Merged
merged 5 commits into from
Aug 16, 2020
Merged

Part 2: Editorial Fixes ODF 1.3 CS02 #23

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6b2bf10
Fixing HTML font color and line height problem
svanteschubert Aug 14, 2020
5ed5398
Part 2: Replacing unallowed Text Style 'Definition' with correct 'Def…
svanteschubert Aug 14, 2020
2c3205a
Part 2: Adding 55 times character style 'SO Keyword' to 'shall'/'shal…
svanteschubert Aug 14, 2020
43954c4
Part 2: Removing at the end (manually) three none-ODF XML attributes:…
svanteschubert Aug 14, 2020
1c696b2
Annotating three more 'shall' ISO Keywords
svanteschubert Aug 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified src/main/resources/odf1.3/OpenDocument-v1.3-part2-packages.odt
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions src/main/resources/odf1.3/OpenDocument-v1.3-part2-packages_odt/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</office:font-face-decls>
<office:styles>
<style:default-style style:family="graphic">
<style:graphic-properties draw:stroke="solid" svg:stroke-width="0.071cm" svg:stroke-color="#385d8a" draw:fill-color="#4f81bd" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="true"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but this should be valid?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep in mind, when you are reviewing commit by commit some changes might be added in the end.
For instance, the exchange of the invalid ODF XML attributes occurred very late in the commit chain.
If you want to see the complete difference from the start to the end of the patch, you need to use some other GitHub URL (I do not have at hand atm)...

<style:graphic-properties draw:stroke="solid" svg:stroke-width="0.071cm" svg:stroke-color="#385d8a" fo:wrap-option="no-wrap" draw:shadow-offset-x="0.3cm" draw:shadow-offset-y="0.3cm" draw:start-line-spacing-horizontal="0.283cm" draw:start-line-spacing-vertical="0.283cm" draw:end-line-spacing-horizontal="0.283cm" draw:end-line-spacing-vertical="0.283cm" style:flow-with-text="true"/>
<style:paragraph-properties fo:line-height="100%" fo:text-align="start" style:text-autospace="ideograph-alpha" style:line-break="strict" style:writing-mode="lr-tb" style:font-independent-line-spacing="false">
<style:tab-stops/>
</style:paragraph-properties>
Expand Down Expand Up @@ -1150,7 +1150,7 @@
</style:page-layout-properties>
<style:header-style/>
<style:footer-style>
<style:header-footer-properties fo:min-height="0.891cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.79cm" fo:background-color="transparent" style:dynamic-spacing="true" draw:fill="none" draw:fill-color="#4f81bd"/>
<style:header-footer-properties fo:min-height="0.891cm" fo:margin-left="0cm" fo:margin-right="0cm" fo:margin-top="0.79cm" fo:background-color="transparent" style:dynamic-spacing="true" />
</style:footer-style>
</style:page-layout>
<style:page-layout style:name="Mpm3">
Expand All @@ -1165,7 +1165,7 @@
</style:footer-style>
</style:page-layout>
<style:page-layout style:name="Mpm4">
<style:page-layout-properties fo:page-width="21.59cm" fo:page-height="27.94cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2.54cm" fo:margin-bottom="1.27cm" fo:margin-left="2.54cm" fo:margin-right="2.54cm" fo:background-color="#ffffff" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="38" style:layout-grid-base-height="0.635cm" style:layout-grid-ruby-height="0cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" draw:fill="solid" draw:fill-color="#ffffff" draw:opacity="100%" style:footnote-max-height="0cm">
<style:page-layout-properties fo:page-width="21.59cm" fo:page-height="27.94cm" style:num-format="1" style:print-orientation="portrait" fo:margin-top="2.54cm" fo:margin-bottom="1.27cm" fo:margin-left="2.54cm" fo:margin-right="2.54cm" fo:background-color="#ffffff" style:writing-mode="lr-tb" style:layout-grid-color="#c0c0c0" style:layout-grid-lines="38" style:layout-grid-base-height="0.635cm" style:layout-grid-ruby-height="0cm" style:layout-grid-mode="none" style:layout-grid-ruby-below="false" style:layout-grid-print="false" style:layout-grid-display="false" style:footnote-max-height="0cm">
<style:footnote-sep style:width="0.018cm" style:distance-before-sep="0.101cm" style:distance-after-sep="0.101cm" style:line-style="solid" style:adjustment="left" style:rel-width="25%" style:color="#000000"/>
</style:page-layout-properties>
<style:header-style>
Expand Down