Skip to content

Commit

Permalink
Center All Images
Browse files Browse the repository at this point in the history
Center-align all images which weren't already aligned, and fix their
scale proportions via an arbitrary percentage based on how they look
in the HTML document.

Many of these images need to fixed in order to ensure that similar
images forming a set are shown with consistent proportions in all
output formats (see #21).
  • Loading branch information
tajmone committed Sep 13, 2021
1 parent 46bbb9f commit b50f0cc
Show file tree
Hide file tree
Showing 10 changed files with 86 additions and 86 deletions.
102 changes: 51 additions & 51 deletions docs_src/Git-Buch_EN.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs_src/gitbuch_02.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -1402,7 +1402,7 @@ In the following, we will again use a "`Hello World!`" program as an example, th


."`Hello World!`" Program in Python
image::objektmodell-programm-crop.png[id="fig.object-model-program",scaledwidth="25%",width="25%"]
image::objektmodell-programm-crop.png[id="fig.object-model-program",scaledwidth="25%",width="25%",align="center"]


////
Expand Down
14 changes: 7 additions & 7 deletions docs_src/gitbuch_03.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ For more information, see <<sec.gitk>>.

// .Das Beispiel-Repository aus Kapitel 2, Grundlagen in Gitk. Zur Illustration wurde der zweite Commit mit dem Tag `v0.1` versehen.
.The sample repository from <<ch.basics>>. For illustration purposes, the second commit has been tagged `v0.1`.
image::gitk-basic.png[id="fig.gitk-basic",scaledwidth="90%",width="90%"]
image::gitk-basic.png[id="fig.gitk-basic",scaledwidth="90%",width="90%",align="center"]


////
Expand Down Expand Up @@ -811,7 +811,7 @@ deutlich von den grünen, rechteckigen Branches unterscheiden:
Gitk presents tags as yellow, arrow-like boxes that are clearly distinguishable from the green, rectangular branches:

.Tags in Gitk
image::tag-screenshot.png[id="fig.tag-gitk",scaledwidth="90%",width="90%"]
image::tag-screenshot.png[id="fig.tag-gitk",scaledwidth="90%",width="90%",align="center"]



Expand Down Expand Up @@ -1086,7 +1086,7 @@ Here's an example from the git project: we describe a commit with the SHA-1 pref

// .Der zu beschreibende Commit in Grau hervorgehoben
.The commit to be described highlighted in gray
image::describe-screenshot.png[id="fig.describe",scaledwidth="90%",width="90%"]
image::describe-screenshot.png[id="fig.describe",scaledwidth="90%",width="90%",align="center"]


[subs="quotes"]
Expand Down Expand Up @@ -1979,7 +1979,7 @@ Consider the following two excerpts from the version history of a project:

// .Integration eines Features mit und ohne Fast-Forward
.Integration of a feature with and without fast forward
image::ff-no-ff-vergleich.png[id="fig.ff-vergleich",scaledwidth="80%",width="80%"]
image::ff-no-ff-vergleich.png[id="fig.ff-vergleich",scaledwidth="80%",width="80%",align="center"]



Expand Down Expand Up @@ -2634,7 +2634,7 @@ The latter visualizes particularly well how a file has changed between commits.

// .Der Beispiel-Merge-Konflikt, im Merge-Tool "`Meld`" visualisiert
.The example merge conflict, visualized in the merge tool "`Meld`"
image::meld-example.png[id="fig.meld",scaledwidth="100%",width="100%"]
image::meld-example.png[id="fig.meld",scaledwidth="100%",width="100%",align="center"]


////
Expand Down Expand Up @@ -3082,7 +3082,7 @@ Since the listing of multiple commits is hard to keep track of, we examine a sma

// .Der Graph der Commits, wie er in `gitk` dargestellt wird
.The graph of commits as displayed in `gitk`
image::revision-list-commit-graph-gitk.png[id="fig.rev-list-graph",scaledwidth="90%",width="90%"]
image::revision-list-commit-graph-gitk.png[id="fig.rev-list-graph",scaledwidth="50%",width="50%",align="center"]


////
Expand Down Expand Up @@ -3397,7 +3397,7 @@ The only thing that might be easier to do with Gitk than from the command line i

// .Komplizierte Topologie in Gitk
.Complex topology in Gitk
image::gitk.png[id="fig.gitk",scaledwidth="90%",width="90%"]
image::gitk.png[id="fig.gitk",scaledwidth="90%",width="90%",align="center"]


////
Expand Down
8 changes: 4 additions & 4 deletions docs_src/gitbuch_04.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ But the `master` branch has already moved on, and a new 1.4.2 release has been m

// .Vor dem Rebase
.Before the rebase
image::screenshot-rebase-vorher.png[id="fig.screenshot-rebase-before",scaledwidth="90%",width="90%"]
image::screenshot-rebase-vorher.png[id="fig.screenshot-rebase-before",scaledwidth="90%",width="90%",align="center"]

////
Nun wird `sqlite-support` ausgecheckt und neu auf `master` aufgebaut:
Expand Down Expand Up @@ -152,7 +152,7 @@ After that, the repository looks like this in Gitk:

// .Nach Rebase
.After rebase
image::screenshot-rebase-nachher.png[id="fig.screenshot-rebase-after",scaledwidth="90%",width="90%"]
image::screenshot-rebase-nachher.png[id="fig.screenshot-rebase-after",scaledwidth="90%",width="90%",align="center"]

[[sec.rebase-extended]]
=== Extended syntax and conflicts
Expand Down Expand Up @@ -1190,7 +1190,7 @@ A convenient alternative to `git blame` on the console is the graphical tool `gi

// .Ein Stück Code, das aus einer anderen Datei verschoben wurde
.A piece of code, which was moved from another file
image::git-gui-blame.png[id="fig.git-gui-blame",scaledwidth="100%",width="100%"]
image::git-gui-blame.png[id="fig.git-gui-blame",scaledwidth="100%",width="100%",align="center"]

////
Wenn Sie eine Datei per `git gui blame <datei>` untersuchen, werden die unterschiedlichen Blöcke, die aus verschiedenen Commits stammen, mit Grautönen hinterlegt dargestellt.
Expand Down Expand Up @@ -1844,7 +1844,7 @@ This makes a stash in Gitk appear as a triangle, which is a bit confusing at fir

// .Ein Stash in Gitk
.A stash in Gitk
image::stash-screenshot.png[id="fig.gitk-stash",scaledwidth="90%",width="90%"]
image::stash-screenshot.png[id="fig.gitk-stash",scaledwidth="50%",width="50%",align="center"]

////
Mit dem Alias `git tree` (siehe <<rev-list>>) sieht das so aus:
Expand Down
6 changes: 3 additions & 3 deletions docs_src/gitbuch_05.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ In Gitk, the remote tracking branches are displayed with the prefix `remotes/<re

// .Branch `next` und der entsprechende Remote-Tracking-Branch in Gitk
.Branch `next` and the corresponding remote tracking branch in Gitk
image::remote-tracking-gitk.png[id="fig.remote-tracking-gitk",scaledwidth="90%",width="90%"]
image::remote-tracking-gitk.png[id="fig.remote-tracking-gitk",scaledwidth="90%",width="90%",align="center"]



Expand Down Expand Up @@ -2225,7 +2225,7 @@ If you specify a single commit, Git will evaluate this as the selection from the

// .Drei Commits nach `master` als Patches formatieren
.Formatting three commits to 'master' as patches
image::gitk-screen-format-patch.png[id="fig.gitk-screen-format-patch",scaledwidth="90%",width="90%"]
image::gitk-screen-format-patch.png[id="fig.gitk-screen-format-patch",scaledwidth="70%",width="70%",align="center"]



Expand Down Expand Up @@ -2422,7 +2422,7 @@ This makes all e-mails after the first one look like replies to them and thus mo

// .Patch-Serie als Mail-Thread
.Patch series as mail thread
image::mail-thread.png[id="fig.mail-thread",scaledwidth="100%",width="100%"]
image::mail-thread.png[id="fig.mail-thread",scaledwidth="100%",width="100%",align="center"]


////
Expand Down
8 changes: 4 additions & 4 deletions docs_src/gitbuch_07.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -1748,11 +1748,11 @@ $HTTP["host"] =~ "^git\.example\.com(:\d+)?$" {

// .Übersichtsseite von Gitweb
.Gitweb's Summary page
image::gitweb-overview.png[id="fig.gitweb-overview",scaledwidth="90%",width="90%"]
image::gitweb-overview.png[id="fig.gitweb-overview",scaledwidth="100%",width="100%",align="center"]

// .Darstellung eines Commits in Gitweb
.Viewing a commit in Gitweb
image::gitweb-commitdiff.png[id="fig.gitweb-commitdiff",scaledwidth="90%",width="90%"]
image::gitweb-commitdiff.png[id="fig.gitweb-commitdiff",scaledwidth="100%",width="100%",align="center"]



Expand Down Expand Up @@ -1822,7 +1822,7 @@ However, it is recommended to use `checkinstall`{fn105} so that you can easily g

// .Übersichtsseite von CGit
.Overview page of CGit
image::cgit-overview.png[id="fig.cgit-overview",scaledwidth="90%",width="90%"]
image::cgit-overview.png[id="fig.cgit-overview",scaledwidth="100%",width="100%",align="center"]



Expand Down Expand Up @@ -2040,7 +2040,7 @@ scan-path=/var/git/repositories

// .Darstellung eines Commits in CGit
.Viewing a commit in CGit
image::cgit-commitdiff.png[id="fig.cgit-commitdiff",scaledwidth="90%",width="90%"]
image::cgit-commitdiff.png[id="fig.cgit-commitdiff",scaledwidth="100%",width="100%",align="center"]



Expand Down
2 changes: 1 addition & 1 deletion docs_src/gitbuch_08.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ On the left the old version, on the right the new version, and in the middle a m
.Die Ausgabe von `git diff` mit dem eigenen Diff-Programm `imgdiff`
////
.The output of `git diff` with the custom diff program `imgdiff`
image::tux-diff.png[id="fig.tux-diff",scaledwidth="90%",width="90%"]
image::tux-diff.png[id="fig.tux-diff",scaledwidth="70%",width="70%",align="center"]

////
Das Beispiel mit dem Tux inkl. Anleitung finden Sie auch in einem Repository unter:
Expand Down
18 changes: 9 additions & 9 deletions docs_src/gitbuch_09.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ If the project follows the Subversion standard layout (<<fig.svn-stdlayout>>), u

.Standard Subversion layout
// .Standardlayout Subversion
image::svn-stdlayout-crop.png[id="fig.svn-stdlayout",scaledwidth="20%",width="20%"]
image::svn-stdlayout-crop.png[id="fig.svn-stdlayout",scaledwidth="17%",width="17%",align="center"]



Expand Down Expand Up @@ -339,7 +339,7 @@ If the repository is not laid out according to the Subversion standard layout, a


.Non-Standard Layout
image::svn-nonstdlayout-crop.png[id="fig.svn-nonstdlayout",scaledwidth="20%",width="20%"]
image::svn-nonstdlayout-crop.png[id="fig.svn-nonstdlayout",scaledwidth="20%",width="20%",align="center"]


////
Expand Down Expand Up @@ -449,7 +449,7 @@ Assume that the Subversion repository has the following Subversion branches and

.Example Subversion branches and tags
// .Beispiel Subversion-Branches und -Tags
image::svn-branches-crop.png[id="fig.svn-branches",scaledwidth="20%",width="20%"]
image::svn-branches-crop.png[id="fig.svn-branches",scaledwidth="20%",width="20%",align="center"]


////
Expand All @@ -462,7 +462,7 @@ In this case `git svn` creates the following git branches:

.Converted Git Branches
// .Konvertierte Git-Branches
image::git-branches-crop.png[id="fig.git-converted-branches",scaledwidth="35%",width="35%"]
image::git-branches-crop.png[id="fig.git-converted-branches",scaledwidth="35%",width="35%",align="center"]



Expand Down Expand Up @@ -581,13 +581,13 @@ The script `git-convert-refs` finally translates `remotes/svn/trunk` -> `trunk`,
// @TRANSLATE IMAGE TEXT? (screenshot)
.Converted branches and tags before translation
// .Konvertierte Branches und Tags vor der Übersetzung
image::git-convert-refs-before.png[id="fig.git-convert-refs-before",scaledwidth="90%",width="90%"]
image::git-convert-refs-before.png[id="fig.git-convert-refs-before",scaledwidth="60%",width="60%",align="center"]


// @TRANSLATE IMAGE TEXT? (screenshot)
.Converted branches and tags after translation
// .Konvertierte Branches und Tags nach der Übersetzung
image::git-convert-refs-after.png[id="fig.git-convert-refs-after",scaledwidth="90%",width="90%"]
image::git-convert-refs-after.png[id="fig.git-convert-refs-after",scaledwidth="60%",width="60%",align="center"]


////
Expand Down Expand Up @@ -660,7 +660,7 @@ The `v2.0` tag, on the other hand, was modified again after it was created from

.Converted Git tags on branches
// .Konvertierte Git-Tags auf Abzweigungen
image::git-svn-tag-fix-before.png[id="fig.git-svn-tag-fix-before",scaledwidth="90%",width="90%"]
image::git-svn-tag-fix-before.png[id="fig.git-svn-tag-fix-before",scaledwidth="50%",width="50%",align="center"]


////
Expand All @@ -675,7 +675,7 @@ However, tag `v2.0` remains in place (because the trees are different due to sub

.Tag `v1.0` was rewritten
// .Tag `v1.0` wurde umgeschrieben
image::git-svn-tag-fix-after.png[id="fig.git-svn-tag-fix-after",scaledwidth="90%",width="90%"]
image::git-svn-tag-fix-after.png[id="fig.git-svn-tag-fix-after",scaledwidth="50%",width="50%",align="center"]



Expand Down Expand Up @@ -783,7 +783,7 @@ The result converted with `git-svn` is shown below.

.Converted Subversion repository
// .Konvertiertes Subversion-Repository
image::git-svn-merge-demo.png[id="fig.git-svn-merge-demo",scaledwidth="90%",width="90%"]
image::git-svn-merge-demo.png[id="fig.git-svn-merge-demo",scaledwidth="60%",width="60%",align="center"]


////
Expand Down
10 changes: 5 additions & 5 deletions docs_src/gitbuch_11.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ But what GitHub does not offer are mailing lists -- for that you have to use alt

.GitHub page from Gollum
// .Github-Seite von Gollum
image::github-gollum.png[id="fig.github-gollum",scaledwidth="100%",width="100%"]
image::github-gollum.png[id="fig.github-gollum",scaledwidth="100%",width="100%",align="center"]


////
Expand Down Expand Up @@ -173,7 +173,7 @@ Since you can quickly lose track of many forks, GitHub provides a graphical repr


.The GitHub Network-Graph
image::github-network.png[id="fig.github-network",scaledwidth="100%",width="100%"]
image::github-network.png[id="fig.github-network",scaledwidth="100%",width="100%",align="center"]


////
Expand Down Expand Up @@ -264,7 +264,7 @@ As you can see in <<fig.github-downloads>>, both as `.tar.gz` and `.zip` archive

.Downloads created from tags
// .Aus Tags erstellte Downloads
image::github-download.png[id="fig.github-downloads",scaledwidth="65%",width="65%"]
image::github-download.png[id="fig.github-downloads",scaledwidth="50%",width="50%",align="center"]



Expand Down Expand Up @@ -302,7 +302,7 @@ The two different versions are displayed side by side, see <<fig.github-2up>>.
Differences in size are also visible.
+
.The _2-up_ image mode
image::github-image-diff-2up.png[id="fig.github-2up",scaledwidth="90%",width="90%"]
image::github-image-diff-2up.png[id="fig.github-2up",scaledwidth="90%",width="90%",align="center"]

_Swipe_ ::
The image is split in the middle.
Expand All @@ -311,7 +311,7 @@ Move the slider back and forth to see the changes.
See <<fig.github-swipe>>.
+
.The _swipe_ image mode
image::github-image-diff-swipe.png[id="fig.github-swipe",scaledwidth="90%",width="90%"]
image::github-image-diff-swipe.png[id="fig.github-swipe",scaledwidth="90%",width="90%",align="center"]

_Onion Skin_ ::
A slider is also used here, but this time the new version is faded in, so there is a smooth transition between old and new.
Expand Down
2 changes: 1 addition & 1 deletion docs_src/gitbuch_13.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ A detailed technical description can be found in the man page `gitrepository-lay

// .Die wichtigsten Einträge in `.git`
.The most important entries in `.git/`
image::git-dir-crop.png[id="fig.git-dir-listing",scaledwidth="20%",width="20%"]
image::git-dir-crop.png[id="fig.git-dir-listing",scaledwidth="17%",width="17%",align="center"]



Expand Down

0 comments on commit b50f0cc

Please sign in to comment.