Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
(``self.first_pass == True``), you can now track information that will be used to
make decisions in the second pass. The notable example where this technique
is used is implementing complex fields. Because the export methods are called
twice, some exporter extensions that perform lossly operations on the
twice, some exporter extensions that perform lossy operations on the
document structure may need to ignore processing during the first pass.
- The function signature of the ``get_hyperlink_tag`` has changed. It
previously accepted a ``Hyperlink`` instance. Now it only accepts
Expand Down Expand Up @@ -183,7 +183,7 @@
**0.4.00**

- External images are now handled. This causes a backwards incompatible change
with all handers related to images.
with all handlers related to images.

**0.3.23**

Expand Down
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PyDocX
* `Installation <https://pydocx.readthedocs.org/en/latest/installation.html>`_
* `Documentation <https://pydocx.readthedocs.org>`_
* `Release Notes <https://pydocx.readthedocs.org/en/latest/release_notes.html>`_
* `Github Page <https://github.com/CenterForOpenScience/pydocx>`_
* `GitHub Page <https://github.com/CenterForOpenScience/pydocx>`_
* `Issue Tracking <https://github.com/CenterForOpenScience/pydocx/issues>`_

PyDocX is a tool
Expand Down
4 changes: 2 additions & 2 deletions docs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ help:
@echo " epub to make an epub"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
@echo " latexpdfja to make LaTeX files and run them through pdflatex/dvipdfmx"
@echo " text to make text files"
@echo " man to make manual pages"
@echo " texinfo to make Texinfo files"
Expand Down Expand Up @@ -118,7 +118,7 @@ latexpdf:

latexpdfja:
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
@echo "Running LaTeX files through platex and dvipdfmx..."
@echo "Running LaTeX files through pdflatex and dvipdfmx..."
$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."

Expand Down
6 changes: 3 additions & 3 deletions docs/enumerated_list_detection.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ is automatic:
Supported enumeration sequences
###############################

* arabic numberals: 1, 2, 3, ...
* arabic numerals: 1, 2, 3, ...
* uppercase alphabet characters A, B, C, ..., Z, AA, AB, ... AZ, ...
* lowercase alphabet characters a, b, c, ..., z, aa, ab, ... az, ...
* uppercase Roman numberals: I, II, III, IV, ...
* lowercase Roman numberals: i, ii, iii, iv, ...
* uppercase Roman numerals: I, II, III, IV, ...
* lowercase Roman numerals: i, ii, iii, iv, ...

Supported enumeration patterns
##############################
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ in the core library.

If it's something that should exist, the
PyDocX project is always open to new
contributions. Details of how to contibute
contributions. Details of how to contribute
can be found in :doc:`/development`.

For things that don't fit in the core
Expand Down
2 changes: 1 addition & 1 deletion docs/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Currently Supported HTML elements
* list styles
* nested lists
* list of tables
* list of pragraphs
* list of paragraphs

* justification
* images
Expand Down
4 changes: 2 additions & 2 deletions pydocx/export/html.py
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ def export_listing_paragraph_property_indentation(
if not left and not hanging:
return style

# All the bellow left margin calculation is done because html ul/ol/li elements have
# All the below left margin calculation is done because html ul/ol/li elements have
# their default indentations and we need to make sure that we migrate as near as
# possible solution to html.
margin_left = left
Expand Down Expand Up @@ -428,7 +428,7 @@ def export_listing_paragraph_property_indentation(
pass

# Here as well, we remove the default hanging which word adds
# because <li> tag will provide it's own
# because <li> tag will provide its own
hanging -= level_ind_hanging

if margin_left:
Expand Down
4 changes: 2 additions & 2 deletions pydocx/export/numbering_span.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

def int_to_roman(i):
'''
Given any integer, return the roman numberal string.
Given any integer, return the roman numeral string.

>>> int_to_roman(1) == 'I'
True
Expand All @@ -47,7 +47,7 @@ def int_to_roman(i):

def roman_to_int(n):
'''
Given a roman numberal string, return the decimal equivalent.
Given a roman numeral string, return the decimal equivalent.

>>> roman_to_int('I')
1
Expand Down
2 changes: 1 addition & 1 deletion pydocx/util/zip.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def create_zip_archive(paths_to_data):
that path specified by the key.

Each path MUST NOT include an initial '/'. Each path MUST use '/' as a file
separator (this is requried by the zip specification).
separator (this is required by the zip specification).

paths_to_data = {
'path/file.txt': 'hello',
Expand Down
2 changes: 1 addition & 1 deletion tests/export/test_xml.py
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ def get_xml(self):
return xml


class SeperateListsIntoParentListTestCase(TranslationTestCase):
class SeparateListsIntoParentListTestCase(TranslationTestCase):
expected_output = '''
<ol class="pydocx-list-style-type-lowerLetter">
<li>
Expand Down
2 changes: 1 addition & 1 deletion tests/fixtures/table_with_multi_rowspan.html
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<table border="1"><tr><td rowspan="2">First section</td><td>Item 1</td></tr><tr><td>Item 2</td></tr><tr><td rowspan="4">Second section</td><td>Item 1</td></tr><tr><td>Item 2</td></tr><tr><td>Item 3</td></tr><tr><td>Imte 4</td></tr></table>
<table border="1"><tr><td rowspan="2">First section</td><td>Item 1</td></tr><tr><td>Item 2</td></tr><tr><td rowspan="4">Second section</td><td>Item 1</td></tr><tr><td>Item 2</td></tr><tr><td>Item 3</td></tr><tr><td>Item 4</td></tr></table>
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ commands =
deps = -rrequirements/docs.txt
skipsdist = True

# Coverage for python 2.7 and and 3.4 only
# Coverage for python 2.7 and 3.4 only
[testenv:py27-coverage]
commands =
nosetests --with-doctest --with-coverage --cover-package pydocx []
Expand Down