Pull requests

#105 Declined
Repository
knzm/sphinx-fix-versionchange-fork sphinx-fix-versionchange-fork
Branch
default
Repository
birkenfeld/sphinx sphinx
Branch
default

A series of fixes for versionmodified

Author
  1. Nozomu Kaneko
Reviewers
Description

This pull request contains fixes on the following issues:

  • paragraphs in versionmodified are ignored when it has no dangling paragraphs.
  • wrong html output (*)
  • versionmodified is not translatable

(*) The difference expressed using pseudo-html code is shown as the following:

before:

    <p class="deprecated | versionadded | versionchanged">
      <span class="versionmodified">New in version 1.0: </span>
      first paragraph.
      <p>second paragraph if exists.</p>
    </p>

(Note: nesting p tags in XHTML is invalid.)

after:

    <div class="deprecated | versionadded | versionchanged">
      <p>
        <span class="versionmodified">New in version 1.0:</span>
        first paragraph.
      </p>
      <p>second paragraph if exists.</p>
    </div>

Comments (10)

  1. Jon Waltman

    I wonder if this can be done entirely in the versionmodified directive. That is, instead of returning a versionmodified node that is handled specially by the writers, it just returned normal paragraph nodes with the auto-prepended text already inserted.

      1. Nozomu Kaneko author

        Updated patches are here: https://bitbucket.org/knzm/sphinx-fix-versionchange-fork/commits/all/c1d1d5a8795c2b668e12b3f48209dcafe35f018f

        But I cannot select them in the "Update pull request" page perhaps because there are multiple heads in my repo (I wanted to rebase it).

        So please tell me what I should do:

        • Merge them
        • Decline this pull request and make a new one
        • Name a new branch (seems that BitBucket's UI allows to select another branch)
        • Or something else

        I also want to know the best practice about rebasing during review.