From 12d8820bbb9e30b0fd125b72ecfb85cb9098d251 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Th=C3=A9r=C3=A8se=20Godefroy?= Date: Fri, 22 Sep 2017 13:22:03 +0200 Subject: [PATCH] zh-hans/kitchen: remove obsolete originals and scripts. --- zh-hans/kitchen/color-wdiff | 106 ----- zh-hans/kitchen/footer.html | 44 -- zh-hans/kitchen/head.html | 22 - zh-hans/kitchen/index.t.html | 654 ------------------------------ zh-hans/kitchen/javascript.html | 45 -- zh-hans/kitchen/next_steps.t.html | 207 ---------- zh-hans/kitchen/reformat-html | 147 ------- zh-hans/kitchen/translist.html | 17 - 8 files changed, 1242 deletions(-) delete mode 100644 zh-hans/kitchen/color-wdiff delete mode 100644 zh-hans/kitchen/footer.html delete mode 100644 zh-hans/kitchen/head.html delete mode 100644 zh-hans/kitchen/index.t.html delete mode 100644 zh-hans/kitchen/javascript.html delete mode 100644 zh-hans/kitchen/next_steps.t.html delete mode 100644 zh-hans/kitchen/reformat-html delete mode 100644 zh-hans/kitchen/translist.html diff --git a/zh-hans/kitchen/color-wdiff b/zh-hans/kitchen/color-wdiff deleted file mode 100644 index 9d84eeec..00000000 --- a/zh-hans/kitchen/color-wdiff +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/bash - -# NAME -# color-wdiff - visualize differences between text files - -# SYNOPSIS -# color-wdiff FILE0 FILE1 - -# DEPENDENCIES -# wdiff, reformat-html in $HOME/bin. - -# DESCRIPTION -# 1. If the input files are HTML, they are reformatted, to remove -# indentation among other things. -# 2. The markup is inactivated by replacing angle brackets with the -# corresponding entities. -# 3. The files are compared with wdiff, using options which label -# insertions and deletions. The labels are HTML tags with specific -# classes. -# 4. The diff is turned into a valid HTML page by adding the required -# markup, plus CSS style for the insertion and deletion classes. -# -# The diff file is created in the directory where FILE0 resides. - -# ORIGIN OF THE SCRIPT -# This script was extracted from GNUN's GNUmakefile (function -# "mark-outdated"), and adapted. -# GNUN (http://www.gnu.org/software/gnun/) is under GPLv3. - -# ============================================================================= - -# Command-line arguments -arg=($1 $2) - -set -e - -close_term () { - printf '\n%s' '*** Close the terminal window or press Return.'; read OK - test -z "$OK" && exit $1 -} - -f[0]=$(mktemp -t cdif.XXXXXX) || close_or_exit 1 -f[1]=$(mktemp -t cdif.XXXXXX) || close_or_exit 1 -trap 'rm -f "${f[0]}" "${f[1]}"' EXIT - -## Prepare the pages to be compared. - -for n in 0 1; do - # Input a valid file. - input=${arg[$n]} - if test ! -f "$input" -o ! -s "$input"; then - echo "*** color-wdiff - Please enter file $n."; read input - input=${input%\'}; input=${input#\'} - test -f "$input" -a -s "$input" \ - || (echo 1>&2 "!!! This file doesn't exist or is empty."; close_term 1) - fi - - # Name the diff after file 0. - test "$n" == "0" && diff_file=${input%.html}-diff.html - - # If the file is an HTML but not a diff, process it: - if test "${input%.html}" != "$input" -a "${input%-diff.html}" == "$input"; - then - # - Standardize the format for easier reading of the diff. - if test -f "$HOME/bin/reformat-html"; then - $HOME/bin/reformat-html $input ${f[$n]} - else - cp $input ${f[$n]} - fi - # - Replace chevrons with HTML entities. The page becomes simple text. - sed -i "s//\>/g" ${f[$n]} - fi -done - -## Build the diff page. - -# Add an HTML header to the wdiff output, with style for visualizing the -# insertions and deletions, and write the title of the page. -cat > $diff_file << EOF - - - - - -${diff_file##*\/} - -
-EOF
-
-# Run wdiff with options to add the proper markup at the beginning and end of
-# deletions and insertions.
-wdiff --start-delete '' \
-      --end-delete '' \
-      --start-insert '' \
-      --end-insert '' \
-      ${f[0]} ${f[1]} >> $diff_file || true
-
-# Add the closing tags.
-echo '
' >> ${diff_file} - -echo -e "\n The diff file is $diff_file." -close_term 0 diff --git a/zh-hans/kitchen/footer.html b/zh-hans/kitchen/footer.html deleted file mode 100644 index 0a973122..00000000 --- a/zh-hans/kitchen/footer.html +++ /dev/null @@ -1,44 +0,0 @@ - - diff --git a/zh-hans/kitchen/head.html b/zh-hans/kitchen/head.html deleted file mode 100644 index 082cd412..00000000 --- a/zh-hans/kitchen/head.html +++ /dev/null @@ -1,22 +0,0 @@ - - - - - -Autodéfense courriel - un guide pour contrer la surveillance en -chiffrant avec GnuPG - - - - - - - - - - - - - - - diff --git a/zh-hans/kitchen/index.t.html b/zh-hans/kitchen/index.t.html deleted file mode 100644 index ac4578c8..00000000 --- a/zh-hans/kitchen/index.t.html +++ /dev/null @@ -1,654 +0,0 @@ - - - - - - -
- - -
- -

#1 Get the pieces

- - -

This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This makes it safer from surveillance than proprietary software (like Windows). Learn more about free software at fsf.org.

- -

Most GNU/Linux operating systems come with GnuPG installed on them, so you don't have to download it. Before configuring GnuPG though, you'll need a desktop email program installed on your computer. Most GNU/Linux distributions have a free software version of the Thunderbird email program available to install. This guide will work with them, in addition to Thunderbird itself. Email programs are another way to access the same email accounts you can access in a browser (like Gmail), but provide extra features.

- - -

This guide relies on software which is freely licensed; it's completely transparent and anyone can copy it or make their own version. This makes it safer from surveillance than proprietary software (like Mac OS). To defend your freedom as well as protect yourself from surveillance, we recommend you switch to a free software operating system like GNU/Linux. Learn more about free software at fsf.org.

- -

To get started, you'll need a desktop email program installed on your computer. This guide works with free software versions of the Thunderbird email program, and with Thunderbird itself. Email programs are another way to access the same email accounts you can access in a browser (like Gmail), but provide extra features.

- - -

If you already have an email program, you can skip to Step 1.b.

- -
- - -
-
- -

- -
-
- -

Step 1.a Setup your email program with your email account

- -

Open your email program and follow the wizard (step-by-step walkthrough) that sets it up with your email account.

- - -
- -

Troubleshooting

- -
-
The wizard doesn't launch
- -
You can launch the wizard yourself, but the menu option for doing so is named differently in each email programs. The button to launch it will be in the program's main menu, under "New" or something similar, titled something like "Add account" or "New/Existing email account."
- -
The wizard can't find my account or isn't downloading my mail
- -
Before searching the Web, we recommend you start by asking other people who use your email system, to figure out the correct settings.
- - - - -
- -
-
-
- - - -
-
- -

Step 1.b Get GnuPG by downloading GPGTools

- -

GPGTools is a software package that includes GnuPG. Download and install it, choosing default options whenever asked. After it's installed, you can close any windows that it creates.

- -
-
- - - -
-
- -

Step 1.b Get GnuPG by downloading GPG4Win

- -

GPG4Win is a software package that includes GnuPG. Download and install it, choosing default options whenever asked. After it's installed, you can close any windows that it creates.

- -
-
- - - -
-
-
    -
    • -
    • -
    • -
- -
-
- -

Step 1.b Install the Enigmail plugin for your email program

- - - - -
-
-
    -
    • -
    • -
    • -
- -
-
- -

Step 1.c Install the Enigmail plugin for your email program

- - -

In your email program's menu, select Add-ons (it may be in the Tools section). Make sure Extensions is selected on the left. Do you see Enigmail? If so, skip this step.

- -

If not, search "Enigmail" with the search bar in the upper right. You can take it from here. Restart your email program when you're done.

- - -
- -

Troubleshooting

- -
-
I can't find the menu.
- -
In many new email programs, the main menu is represented by an image of three stacked horizontal bars.
- - - - -
- -
-
-
-
- - -
- - -
- -

#2 Make your keys

- -

To use the GnuPG system, you'll need a public key and a private key (known together as a keypair). Each is a long string of randomly generated numbers and letters that are unique to you. Your public and private keys are linked together by a special mathematical function.

- -

Your public key isn't like a physical key, because it's stored in the open in an online directory called a keyserver. People download it and use it, along with GnuPG, to encrypt emails they send to you. You can think of the keyserver as phonebook, where people who want to send you an encrypted email look up your public key.

- -

Your private key is more like a physical key, because you keep it to yourself (on your computer). You use GnuPG and your private key to decode encrypted emails other people send to you.

- -
- - -
-
- -

- -
-
- -

Step 2.a Make a keypair

- -

The Enigmail Setup wizard may start automatically. If it doesn't, select Enigmail → Setup Wizard from your email program's menu. You don't need to read the text in the window that pops up unless you'd like to, but it's good to read the text on the later screens of the wizard. Click Next with the default options selected, except in these instances:

- -
    -
  • On the second screen, titled "Encryption," select "Encrypt all of my messages by default, because privacy is critical to me."
    • -
  • On the third screen, titled "Signing," select "Don't sign my messages by default."
    • -
  • On the fourth screen, titled "Key Selection," select "I want to create a new key pair for signing and encryption my email."
    • -
  • On the screen titled "Create Key," pick a strong password! Your password should be at least 12 characters and include at least one lower case and upper case letter and at least one number or punctuation symbol. Don't forget the password, or all this work will be wasted!
    • -
- -

The program will take a little while to finish the next step, the "Key Creation" screen. While you wait, do something else with your computer, like watching a movie or browsing the Web. The more you use the computer at this point, the faster the key creation will go.

- -

When the "Key Generation Completed" screen pops up, select Generate Certificate and choose to save it in a safe place on your computer (we recommend making a folder called "Revocation Certificate" in your home folder and keeping it there). You'll learn more about the revocation certificate in Section 5.

- - -
- -

Troubleshooting

- -
-
I can't find the Enigmail menu.
- -
In many new email programs, the main menu is represented by an image of three stacked horizontal bars. Enigmail may be inside a section called Tools.
- - -
The wizard says that it cannot find GnuPG.
- -
Open whatever program you usually use for installing software, and search for GnuPG, then install it. Then restart the Enigmail setup wizard by going to Enigmail → Setup Wizard.
- - - - - -
- -
-
-
- - -
-
- -

Step 2.b Upload your public key to a keyserver

- -

In your email program's menu, select Enigmail → Key Management.

- -

Right click on your key and select Upload Public Keys to Keyserver. Use the default keyserver in the popup.

- -

Now someone who wants to send you an encrypted message can download your public key from the Internet. There are multiple keyservers that you can select from the menu when you upload, but they are all copies of each other, so it doesn't matter which one you use. However, it sometimes takes a few hours for them to match each other when a new key is uploaded.

- - -
- -

Troubleshooting

- -
-
The progress bar never finishes.
- -
Close the upload popup, make sure you are connected to the Internet, and try again. If that doesn't work, try again, selecting a different keyserver.
- -
My key doesnt appear in the list
- -
Try checking "Display All Keys by Default."
- - - - -
- -
-
-
- - -
-
- -

GnuPG, OpenPGP, what?

- -

In general, the terms GnuPG, GPG, GNU Privacy Guard, OpenPGP and PGP are used interchangeably. Technically, OpenPGP (Pretty Good Privacy) is the encryption standard, and GNU Privacy Guard (often shortened to GPG or GnuPG) is the program that implements the standard. Enigmail is a plug-in program for your email program that provides an interface for GnuPG.

- -
-
-
- - -
- - -
- -

#3 Try it out!

- -

Now you'll try a test correspondence with a computer program named Edward, which knows how to use encryption. Except where noted, these are the same steps you'd follow when corresponding with a real, live person.

- -
- - -
-
- -

- -
-
- -

Step 3.a Send Edward your public key

- -

This is a special step that you won't have to do when corresponding with real people. In your email program's menu, go to Enigmail → Key Management. You should see your key in the list that pops up. Right click on your key and select Send Public Keys by Email. This will create a new draft message, as if you had just hit the Write button.

- -

Address the message to edward-en@fsf.org. Put at least one word (whatever you want) in the subject and body of the email. Then hit send.

- -

There should be an icon of a yellow key in the bottom right of the composition window. This means that encryption is on, however, we want this first special message to Edward to be unencrypted. Click the key icon once to turn encryption off. The key should become grey, with a blue dot on it (to alert you that the setting has been changed from the default). Once encryption is off, hit Send.

- -

It may take two or three minutes for Edward to respond. In the meantime, you might want to skip ahead and check out the Use it Well section of this guide. Once he's responded, head to the next step. From here on, you'll be doing just the same thing as when corresponding with a real person.

- -

When you open Edward's reply, Enigmail may prompt you for your password before using your private key to decrypt it.

- -
-
- - -
-
- -

Step 3.b Send a test encrypted email

- -

Write a new email in your email program, addressed to edward-en@fsf.org. Make the subject "Encryption test" or something similar and write something in the body.

- -

They key in the bottom right of the window should be yellow, meaning encryption is on. This will be your default from now on.

- -

Next to the key, you'll notice an icon of a pencil. Clicking this tells Enigmail to add a special, unique signature to your message, generated using your private key. This is a separate feature from encryption, and you don't have to use it for this guide.

- -

Click Send. Enigmail will pop up a window that says "Recipients not valid, not trusted or not found."

- -

To encrypt an email to Edward, you need his public key, so now you'll have Enigmail download it from a keyserver. Click Download Missing Keys and use the default in the pop-up that asks you to choose a keyserver. Once it finds keys, check the first one (Key ID starting with C), then select ok. Select ok in the next pop-up.

- -

Now you are back at the "Recipients not valid, not trusted or not found" screen. Check the box in front of Edward's key and click Send.

- -

Since you encrypted this email with Edward's public key, Edward's private key is required to decrypt it. Edward is the only one with his private key, so no one except him — not even you — can decrypt it.

- - -
- -

Troubleshooting

- -
-
Enigmail can't find Edward's key
- -
Close the pop-ups that have appeared since you clicked Send. Make sure you are connected to the Internet and try again. If that doesn't work, repeat the process, choosing a different keyserver when it asks you to pick one.
- - - - -
- -
-
-
- - -
-
- -

Important: Security tips

- -

Even if you encrypted your email, the subject line is not encrypted, so don't put private information there. The sending and receiving addresses aren't encrypted either, so they could be read by a surveillance system. When you send attachments, Enigmail will give you an option of whether you want to encrypt them.

- -
-
- - -
-
- -

Step 3.c Receive a response

- -

When Edward receives your email, he will use his private key to decrypt it, then use your public key (which you sent him in Step 3.A) to encrypt his reply to you.

- -

It may take two or three minutes for Edward to respond. In the meantime, you might want to skip ahead and check out the Use it Well section of this guide.

- -

When you receive Edward's email and open it, Enigmail will automatically detect that it is encrypted with your public key, and then it will use your private key to decrypt it.

- -

Notice the bar that Enigmail shows you above the message, with information about the status of Edward's key.

- -
-
- - -
- - -
- - -
- -

#4 Learn the Web of Trust

- -

Email encryption is a powerful technology, but it has a weakness; it requires a way to verify that a person's public key is actually theirs. Otherwise, there would be no way to stop an attacker from making an email address with your friend's name, creating keys to go with it and impersonating your friend. That's why the free software programmers that developed email encryption created keysigning and the Web of Trust.

- -

When you sign someone's key, you are publicly saying that you trust that it does belong to them and not an impostor. People who use your public key can see the number of signatures it has. Once you've used GnuPG for a long time, you may have hundreds of signatures. The Web of Trust is the constellation of all GnuPG users, connected to each other by chains of trust expressed through signatures, forming a giant network. The more signatures a key has, and the more signatures its signers' keys have, the more trustworthy that key is.

- -

People's public keys are usually identified by their key fingerprint, which is a string of digits like F357AA1A5B1FA42CFD9FE52A9FF2194CC09A61E8 (for Edward's key). You can see the fingerprint for your public key, and other public keys saved on your computer, by going to Enigmail → Key Management in your email program's menu, then right clicking on the key and choosing Key Properties. It's good practice to share your fingerprint wherever you share your email address, so that people can double-check that they have the correct public key when they download yours from a keyserver.

- -

You may also see public keys referred to by their key ID, which is simply the last 8 digits of the fingerprint, like C09A61E8 for Edward. The key ID is visible directly from the Key Management window. This key ID is like a person's first name (it is a useful shorthand but may not be unique to a given key), whereas the fingerprint actually identifies the key uniquely without the possibility of confusion. If you only have the key ID, you can still look up the key (as well as its fingerprint), like you did in Step 3, but if multiple options appear, you'll need the fingerprint of the person to whom are trying to communicate to verify which one to use.

- -
- - -
-
- -

- -
-
- -

Step 4.a Sign a key

- -

In your email program's menu, go to Enigmail → Key Management.

- -

Right click on Edward's public key and select Sign Key from the context menu.

- -

In the window that pops up, select "I will not answer" and click ok.

- -

Now you should be back at the Key Management menu. Select Keyserver → Upload Public Keys and hit ok.

- -

You've just effectively said "I trust that Edward's public key actually belongs to Edward." This doesn't mean much because Edward isn't a real person, but it's good practice.

- - -
-
- - -
-
- -

Important: check people's identification before signing their keys

- -

Before signing a real person's key, always make sure it actually belongs to them, and that they are who they say they are. Ask them to show you their ID (unless you trust them very highly) and their public key fingerprint -- not just the shorter public key ID, which could refer to another key as well. In Enigmail, answer honestly in the window that pops up and asks "How carefully have you verified that the key you are about to sign actually belongs to the person(s) named above?".

- -
-
-
- - -
- - -
- -

#5 Use it well

- -

Everyone uses GnuPG a little differently, but it's important to follow some basic practices to keep your email secure. Not following them, you risk the privacy of the people you communicate with, as well as your own, and damage the Web of Trust.

- -
- - -
-
- -

- -
-
- -

When should I encrypt?

- -

The more you can encrypt your messages, the better. If you only encrypt emails occasionally, each encrypted message could raise a red flag for surveillance systems. If all or most of your email is encrypted, people doing surveillance won't know where to start.

- -

That's not to say that only encrypting some of your email isn't helpful -- it's a great start and it makes bulk surveillance more difficult.

- -
-
- - -
-
- -

- -
-
- -

Important: Be wary of invalid keys

- -

GnuPG makes email safer, but it's still important to watch out for invalid keys, which might have fallen into the wrong hands. Email encrypted with invalid keys might be readable by surveillance programs.

- -

In your email program, go back to the second email that Edward sent you. Because Edward encrypted it with your public key, it will have a message from Enigmail at the top, which most likely says "Enigmail: Part of this message encrypted."

- -

When using GnuPG, make a habit of glancing at that bar. The program will warn you there if you get an email encrypted with a key that can't be trusted.

- -
-
- - -
-
- -

Copy your revocation certificate to somewhere safe

- -

Remember when you created your keys and saved the revocation certificate that GnuPG made? It's time to copy that certificate onto the safest digital storage that you have -- the ideal thing is a flash drive, disk, or hard drive stored in a safe place in your home.

- -

If your private key ever gets lost or stolen, you'll need this certificate file to let people know that you are no longer using that keypair.

- -
-
- - -
-
- -

Important: act swiftly if someone gets your private key

- -

If you lose your private key or someone else gets ahold of it (say, by stealing or cracking your computer), it's important to revoke it immediately before someone else uses it to read your encrypted email. This guide doesn't cover how to revoke a key, but you can follow the instructions on the GnuPG site. After you're done revoking, send an email to everyone with whom you usually use your key to make sure they know.

- -
-
- - -
- - -
- -
- - - - - - - diff --git a/zh-hans/kitchen/javascript.html b/zh-hans/kitchen/javascript.html deleted file mode 100644 index 1ffcab5b..00000000 --- a/zh-hans/kitchen/javascript.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - diff --git a/zh-hans/kitchen/next_steps.t.html b/zh-hans/kitchen/next_steps.t.html deleted file mode 100644 index 7abab66f..00000000 --- a/zh-hans/kitchen/next_steps.t.html +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - -
- - -
- -

#6 Next steps

- -

You've now completed the basics of email encryption with GnuPG, taking action against -bulk surveillance. A pat on the back to you! These next steps will help make the most of -the work you did today.

- -
- - -
-
- -

- -
-
- -

Join the movement

- -

You've just taken a huge step towards protecting your privacy online. But each of us -acting alone isn't enough. To topple bulk surveillance, we need to build a movement for the -autonomy and freedom of all computer users. Join the Free Software Foundation's community -to meet like-minded people and work together for change.

- -

- GNU Social |  - Pump.io |  Twitter

- -

Read why GNU Social and Pump.io are better -than Twitter.

- -
-
-
- - -
-
- -

Get your friends involved

- -

This is the single biggest thing you can do to promote email -encryption.

- -

Before you close this guide, use our sharing page to compose a message to a few friends -and ask them to join you in using encrypted email. Remember to include your GnuPG public key ID so they can easily download your key.

- -

It's also great to add your public key fingerprint to your email signature so that -people you are corresponding with know you accept encrypted email.

- -

We recommend you even go a step further and add it to your social media -profiles, blog, Website, or business card. (At the Free Software Foundation, we put ours -on our staff page.) We need to get our culture -to the point that we feel like something is missing when we see an email address without -a public key fingerprint.

- -
-
- - -
-
- -

Protect more of your digital life

- -

Learn surveillance-resistant technologies for instant messages, hard drive storage, online -sharing, and more at -the Free Software Directory's Privacy Pack and prism-break.org.

- - - -

If you are using Windows, Mac OS or any other proprietary operating system, we recommend -you switch to a free software operating system like GNU/Linux. This will make it much -harder for attackers to enter your computer through hidden back doors. Check out the Free -Software Foundation's endorsed -versions of GNU/Linux.

- -
-
- - -
-
- -

- -
- -

← Return to the -guide

- -
-
- -

Make Email Self-Defense tools even better

- -

Leave feedback and -suggest improvements to this guide. We welcome translations, but we ask that you -contact us at campaigns@fsf.org before you start, -so that we can connect you with other translators working in your language.

- -

If you like programming, you can contribute code -to GnuPG or Enigmail.

- -

To go the extra mile, support the Free Software Foundation so we can keep improving -Email Self-Defense, and make more tools like it.

- -

- -
-
-
- - -
- - - - - - - diff --git a/zh-hans/kitchen/reformat-html b/zh-hans/kitchen/reformat-html deleted file mode 100644 index 1d344b99..00000000 --- a/zh-hans/kitchen/reformat-html +++ /dev/null @@ -1,147 +0,0 @@ -#!/bin/bash - -# NAME -# reformat-html - reformat HTML files from emailselfdefense.fsf.org - -# SYNOPSIS -# reformat-html /PATH/TO/NAME.html - -# GRAPHIC INTERFACE HOWTO -# * Launch the script by double-clicking on it; a terminal will open. -# * At the prompt, drag and drop the input file into the terminal. -# -# Alternatively (in Gnome, KDE, XFCE, etc.) -# * create a launcher for the application menu; -# * launch the script from the contextual menu of the HTML file. -# -# The reformatted file is created in the directory where the input file -# resides, and its name is NAME-r.html. - -#============================================================================== - -set -e - -# Test whether the script is called from color-wdiff -p=$(pidof -x color-wdiff) || true -test "$p" == "$PPID" && called_from_color_wdiff=1 - -function close_or_exit () { -# turns off interactivity and lets the terminal close normally if the script -# is called from color-wdiff. - -if test "$called_from_color_wdiff" == "1"; then - exit $1 -else - if test "$1" == "1"; then - echo -e 1>&2 "\n!!! $input doesn't exist or is not an HTML." - fi - echo -e '\n*** Close the terminal window or press Return.'; read OK - test -z "$OK" && exit $1 -fi -} - -# Get a valid HTML as input. -input=$1 -if test ! -f "$input" -o ! -s "$input"; then - echo -e "\n*** reformat-html - Please enter the HTML file." - read input - input=${input%\'}; input=${input#\'} - test -f "$input" -a "${input%.html}" != "$input" || close_or_exit 1 -fi - -# Define the output file. -if test "$called_from_color_wdiff" == "1"; then - output=$2 -else - output=${input%.html}-r.html -fi - -tmp=$(mktemp -t ref.XXXXXX) || close_or_exit 1 -trap "rm -f $tmp" EXIT - -cp $input $tmp - -# Remove javascript, which shouldn't be reformatted, leading and trailing -# spaces/tabs, multiple spaces, LF after and
  • . -sed -i -e '/jquery-1.11.0.min.js/,$d' \ - -e 's,\t, ,g' \ - -e 's,^ *,,' \ - -e 's, *, ,g' \ - -e 's, *$,,' $tmp -sed -i -e '/<\/a>$/ {N; s,<\/a>\n<,<\/a> <,}' $tmp -sed -i -e '/^
  • \n ]*>$/ {N; s,\\n, ,}" $tmp -done -for tag in a strong; do - sed -i "/<\\/$tag>$/ {N; s,\\n, ,}" $tmp -done -# This command may need to be repeated. Adjust the number of repeats. This -# could be done by looping back to a sed marker, but a while loop seems -# quicker. -i=0 -while (( i < 2 )); do - sed -i '/[^<>]$/ {N; s,\([^<>]\)\n,\1 ,}' $tmp - let i=i+1 -done -sed -i -e '/ \/>$/ {N; s,\( \/>\)\n,\1 ,}' \ - -e '/ ]*>$/ {N; s,\(]*>\)\n\([^<]\),\1 \2,}' $tmp - -# Make sure there is only one paragraph per string. This command may need to -# be repeated. Adjust the number of repeats. -i=0 -while (( i < 2 )); do - sed -i 's,

    \(.\+\)$,

    \n\1,' $tmp - let i=i+1 -done - -# Single out the tags which include p (will also work for pre). -sed -i 's,\(.\) <$tag,>\n<$tag," $tmp -done - -# Remove leading and trailing spaces, double spaces and blank lines. -# Fuse comment with

    ; separate truncated "~~~" comment from fused tag. -sed -i -e 's,^ *,,' \ - -e 's, *$,,' \ - -e 's, , ,g' \ - -e '/^$/d' \ - -e '/<\/p>$/ {N;s,\n\( -     -- 2.25.1